interim commit

david-waltermire · May 21, 2024 · a96378a · a96378a
1 parent e398167
commit a96378a
Show file tree

Hide file tree

Showing 51 changed files with 1,448 additions and 466 deletions.
diff --git a/core/src/main/antlr4/Metapath10.g4 b/core/src/main/antlr4/Metapath10.g4
@@ -13,7 +13,7 @@ metapath : expr EOF ;
 // param : DOLLAR eqname typedeclaration? ;
 // functionbody : enclosedexpr ;
 // [5]
-// enclosedexpr : OC expr? CC ;
+enclosedexpr : OC expr? CC ;
 expr : exprsingle ( COMMA exprsingle)* ;
 exprsingle : forexpr | letexpr | quantifiedexpr  | ifexpr | orexpr ;
 forexpr : simpleforclause KW_RETURN exprsingle ;
@@ -70,19 +70,18 @@ abbrevreversestep : DD ;
 nodetest : nametest ;
 nametest : eqname | wildcard ;
 wildcard : STAR | NCName CS | SC NCName | BracedURILiteral STAR ;
-// postfixexpr : primaryexpr (predicate | argumentlist | lookup)* ;
-postfixexpr : primaryexpr (predicate)* ;
+postfixexpr : primaryexpr (predicate | argumentlist | lookup)* ;
 // [50]
 argumentlist : OP (argument ( COMMA argument)*)? CP ;
 predicatelist : predicate* ;
 predicate : OB expr CB ;
-// lookup : QM keyspecifier ;
-// keyspecifier : NCName | IntegerLiteral | parenthesizedexpr | STAR ;
+lookup : QM keyspecifier ;
+keyspecifier : NCName | IntegerLiteral | parenthesizedexpr | STAR ;
 // [55]
 //arrowfunctionspecifier : eqname | varref | parenthesizedexpr ;
 arrowfunctionspecifier : eqname;
 // primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall | functionitemexpr | mapconstructor | arrayconstructor | unarylookup ;
-primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall ;
+primaryexpr : literal | varref | parenthesizedexpr | contextitemexpr | functioncall | arrayconstructor | unarylookup;
 literal : numericliteral | StringLiteral ;
 numericliteral : IntegerLiteral | DecimalLiteral | DoubleLiteral ;
 varref : DOLLAR varname ;
@@ -103,11 +102,11 @@ argument : exprsingle ;
 // mapconstructorentry : mapkeyexpr COLON mapvalueexpr ;
 // mapkeyexpr : exprsingle ;
 // mapvalueexpr : exprsingle ;
-// arrayconstructor : squarearrayconstructor | curlyarrayconstructor ;
-// squarearrayconstructor : OB (exprsingle ( COMMA exprsingle)*)? CB ;
+arrayconstructor : squarearrayconstructor | curlyarrayconstructor ;
+squarearrayconstructor : OB (exprsingle ( COMMA exprsingle)*)? CB ;
 // [75]
-// curlyarrayconstructor : KW_ARRAY enclosedexpr ;
-// unarylookup : QM keyspecifier ;
+curlyarrayconstructor : KW_ARRAY enclosedexpr ;
+unarylookup : QM keyspecifier ;
 // singletype : simpletypename QM? ;
 // typedeclaration : KW_AS sequencetype ;
 // sequencetype : KW_EMPTY_SEQUENCE OP CP | itemtype occurrenceindicator? ;