continue AST completion

Salvador Abreu
1 parent f7de4bd3
Showing 2 changed files with 21 additions and 17 deletions Show diff stats
fzn-parser/examples/a.ast
fzn-parser/flatzinc.y
@@ -9,13 +9,13 @@ _T &gt; [int:lit(1)|_T].
 _T > [int:lit(-1)|_T].
 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
 [Es|_T] > [array(_):alit(Es)|_T].
-[VAL,AN,T|_T] > [var(array(T,1,2), VAL, AN)|_T].
+[VAL,AN,ID,T|_T] > [var(ID, array(T,1,2), VAL, AN)|_T].
 [H,T|_T] > [[H|T]|_T].
 _T > [int(1,3)|_T].
 _T > ['wa'|_T].
 _T > [_:id('output_var')|_T].
 _T > [[]|_T].
-[H,T|_T] > [[H|T]|_T].
+[As, E|_T] > [[E|As]|_T].
 _T > [[]|_T].
 [VAL,AN,ID,T|_T] > [var(ID, T, VAL, AN)|_T].
 [H,T|_T] > [[H|T]|_T].
@@ -23,7 +23,7 @@ _T &gt; [int(1,3)|_T].
 _T > ['nt'|_T].
 _T > [_:id('output_var')|_T].
 _T > [[]|_T].
-[H,T|_T] > [[H|T]|_T].
+[As, E|_T] > [[E|As]|_T].
 _T > [[]|_T].
 [VAL,AN,ID,T|_T] > [var(ID, T, VAL, AN)|_T].
 [H,T|_T] > [[H|T]|_T].
@@ -43,3 +43,4 @@ _T &gt; [[]|_T].
 [H,T|_T] > [[H|T]|_T].
 [X|_T] > [constrs(X)|_T].
 _T > [[]|_T].
+_T > [satisfy|_T].
@@ -114,21 +114,21 @@ var_decl_item:			/* -&gt; [ var(ID,TYPE,INIT,ANNOT) | _ ] */
   |        non_array_ti_expr_tail ':' ident_anns '=' expr
     { AST ("VAL,AN,ID,T", ("var(ID, T, VAL, AN)")); }
   | ARRAY '[' INT_LITERAL DOTDOT INT_LITERAL ']' OF array_decl_tail
-    { AST ("VAL,AN,T", ("var(array(T,%d,%d), VAL, AN)", $3, $5)); }
+    { AST ("VAL,AN,ID,T", ("var(ID, array(T,%d,%d), VAL, AN)", $3, $5)); }
-var_decl_item2:
+var_decl_item2:			/* -> [ VAL | _ ] */
     '=' expr                 { }
   | /*empty*/                { NIL (); }
-array_decl_tail:
+array_decl_tail:		/* -> [ TYPE,VAL,ANNOT,ID | _ ] */
         non_array_ti_expr_tail ':' ident_anns '=' array_literal
   | VAR non_array_ti_expr_tail ':' ident_anns array_decl_tail2
-array_decl_tail2:		/* -> [ DECLS | _ ] */
+array_decl_tail2:		/* -> [ VAL | _ ] */
     '=' array_literal        { }
   | /*empty*/                { NIL (); }
-ident_anns:			/* -> [ ANNOTATIONS, ID | _ ] */
+ident_anns:			/* -> [ ANNOT,ID | _ ] */
       IDENT { PUSH (("'%s'", $1)); } annotations
     | UNDERSCORE_IDENT { PUSH (("'%s'", $1)); } annotations
@@ -143,9 +143,9 @@ solve_item:
     SOLVE annotations solve_kind
 solve_kind:
-    SATISFY
-  | MINIMIZE expr
-  | MAXIMIZE expr
+    SATISFY                  { PUSH (("satisfy")); }
+  | MINIMIZE expr            { AST ("E", ("minimize(E)")); }
+  | MAXIMIZE expr            { AST ("E", ("maximize(E)")); }
 //---------------------------------------------------------------------------
 // Predicate parameters
@@ -157,16 +157,19 @@ pred_decl_args:
 pred_decl_arg:
      non_array_ti_expr_tail ':' IDENT
+       { AST ("T", ("T:'%s'", $3)); }
    | VAR non_array_ti_expr_tail ':' IDENT
+       { AST ("T", ("var(T):'%s'", $4)); }
    | ARRAY '[' pred_arg_array_index ']' OF  pred_arg_array_tail ':' IDENT
+       { AST ("T,U,L", ("var(array(T,L,U)):'%s'", $8)); }
 pred_arg_array_index:
-    INT
-  | INT_LITERAL DOTDOT INT_LITERAL
+    INT                             { PUSH (("_,1")); }
+  | INT_LITERAL DOTDOT INT_LITERAL  { PUSH (("%d,%d", $3, $1)); }
-pred_arg_array_tail:
-    non_array_ti_expr_tail
-  | VAR non_array_ti_expr_tail
+pred_arg_array_tail:		/* -> [ TYPE | _ ] */
+    non_array_ti_expr_tail          { }
+  | VAR non_array_ti_expr_tail      { AST ("T", ("var(T)")); }
 //---------------------------------------------------------------------------
 // Type-Inst Expression Tails
@@ -251,7 +254,7 @@ array_access_expr: IDENT &#39;[&#39; INT_LITERAL &#39;]&#39;
 //---------------------------------------------------------------------------
 annotations:
-    COLONCOLON expr annotations  { CONS (); }
+    COLONCOLON expr annotations  { AST ("As, E", ("[E|As]")); }
   | /* empty */                  { NIL (); }
 %%