Commit 7cd708d8 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

+ added support for fuzzy modifier in fieldspec, #10

+ added support for unassigned predefined function calls int2enum, #9
parent 6bc28865
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -423,7 +423,11 @@ AltstepInstance:
	ref=[AltstepDef|QualifiedIdentifier] LPAREN list=FunctionActualParList? RPAREN;

FunctionInstance:
	ref=[FunctionRef|QualifiedIdentifier] LPAREN params=FunctionActualParList? RPAREN;
	//TODO: this needs to be refined for control and not implemented as well
	//TODO: other places where predefined functions are used?
	(ref=[FunctionRef|QualifiedIdentifier] LPAREN params=FunctionActualParList? RPAREN)
	| pre=PreDefFunction
	;

	//TODO: check references
// scope fore something like this: foo.bar.func
@@ -912,7 +916,7 @@ FieldSpecList:
	LBRACKET spec+=FieldSpec (COMMA spec+=FieldSpec)* RBRACKET;

FieldSpec:
	ref=[FieldReference|IDENTIFIER] ASSIGNMENTCHAR (body=TemplateBody | MINUS);
	mod=FUZZY_MODIFIER? ref=[FieldReference|IDENTIFIER] ASSIGNMENTCHAR (body=TemplateBody | MINUS);

SimpleSpec:
	expr=SingleExpression (STRINGOP spec=SimpleTemplateSpec)? | spec=SimpleTemplateSpec;
@@ -2061,7 +2065,7 @@ PreDefFunction:
	Fsubstr | Freplace | Fencvalue | Fdecvalue | FencvalueUnichar | FdecvalueUnichar | Frnd | Ftestcasename;

Fint2char:
	'int2char' LPAREN e1=SingleExpression RPAREN;
	f='int2char' LPAREN e1=SingleExpression RPAREN;

Fint2unichar:
	'int2unichar' LPAREN e1=SingleExpression RPAREN;