Salvador Abreu / PaCCS

Download as
Browse Code ยป

Commit 2330bbc25788b2253a626f85c741b083b8071f9d

Authored by Salvador Abreu
1 parent 7a9d1324
Exists in master

build increment

Showing 3 changed files with 18 additions and 13 deletions   Show diff stats
fzn-parser/examples/aust.ast.old
  Diff comments   View file @2330bbc
@@ -7,7 +7,7 @@ _T > [[]|_T]. @@ -7,7 +7,7 @@ _T > [[]|_T].
7 _T > [int:lit(1)|_T]. 7 _T > [int:lit(1)|_T].
8 _T > [int:lit(-1)|_T]. 8 _T > [int:lit(-1)|_T].
9 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 9 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
10 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 10 +[Es|_T] > [array(_):alit(Es)|_T].
11 [H,T|_T] > [[H|T]|_T]. 11 [H,T|_T] > [[H|T]|_T].
12 _T > [int(1,3)|_T]. 12 _T > [int(1,3)|_T].
13 _T > [_:id('output_var')|_T]. 13 _T > [_:id('output_var')|_T].
@@ -50,7 +50,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -50,7 +50,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
50 _T > [_:id('wa')|_T]. 50 _T > [_:id('wa')|_T].
51 _T > [_:id('nt')|_T]. 51 _T > [_:id('nt')|_T].
52 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 52 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
53 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 53 +[Es|_T] > [array(_):alit(Es)|_T].
54 _T > [int:lit(0)|_T]. 54 _T > [int:lit(0)|_T].
55 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 55 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
56 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 56 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -61,7 +61,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -61,7 +61,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
61 _T > [_:id('wa')|_T]. 61 _T > [_:id('wa')|_T].
62 _T > [_:id('sa')|_T]. 62 _T > [_:id('sa')|_T].
63 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 63 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
64 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 64 +[Es|_T] > [array(_):alit(Es)|_T].
65 _T > [int:lit(0)|_T]. 65 _T > [int:lit(0)|_T].
66 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 66 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
67 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 67 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -72,7 +72,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -72,7 +72,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
72 _T > [_:id('nt')|_T]. 72 _T > [_:id('nt')|_T].
73 _T > [_:id('sa')|_T]. 73 _T > [_:id('sa')|_T].
74 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 74 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
75 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 75 +[Es|_T] > [array(_):alit(Es)|_T].
76 _T > [int:lit(0)|_T]. 76 _T > [int:lit(0)|_T].
77 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 77 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
78 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 78 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -83,7 +83,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -83,7 +83,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
83 _T > [_:id('nt')|_T]. 83 _T > [_:id('nt')|_T].
84 _T > [_:id('q')|_T]. 84 _T > [_:id('q')|_T].
85 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 85 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
86 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 86 +[Es|_T] > [array(_):alit(Es)|_T].
87 _T > [int:lit(0)|_T]. 87 _T > [int:lit(0)|_T].
88 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 88 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
89 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 89 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -94,7 +94,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -94,7 +94,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
94 _T > [_:id('sa')|_T]. 94 _T > [_:id('sa')|_T].
95 _T > [_:id('q')|_T]. 95 _T > [_:id('q')|_T].
96 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 96 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
97 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 97 +[Es|_T] > [array(_):alit(Es)|_T].
98 _T > [int:lit(0)|_T]. 98 _T > [int:lit(0)|_T].
99 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 99 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
100 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 100 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -105,7 +105,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -105,7 +105,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
105 _T > [_:id('sa')|_T]. 105 _T > [_:id('sa')|_T].
106 _T > [_:id('nsw')|_T]. 106 _T > [_:id('nsw')|_T].
107 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 107 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
108 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 108 +[Es|_T] > [array(_):alit(Es)|_T].
109 _T > [int:lit(0)|_T]. 109 _T > [int:lit(0)|_T].
110 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 110 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
111 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 111 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -116,7 +116,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -116,7 +116,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
116 _T > [_:id('sa')|_T]. 116 _T > [_:id('sa')|_T].
117 _T > [_:id('v')|_T]. 117 _T > [_:id('v')|_T].
118 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 118 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
119 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 119 +[Es|_T] > [array(_):alit(Es)|_T].
120 _T > [int:lit(0)|_T]. 120 _T > [int:lit(0)|_T].
121 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 121 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
122 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 122 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -127,7 +127,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -127,7 +127,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
127 _T > [_:id('q')|_T]. 127 _T > [_:id('q')|_T].
128 _T > [_:id('nsw')|_T]. 128 _T > [_:id('nsw')|_T].
129 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 129 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
130 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 130 +[Es|_T] > [array(_):alit(Es)|_T].
131 _T > [int:lit(0)|_T]. 131 _T > [int:lit(0)|_T].
132 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 132 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
133 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 133 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
@@ -138,7 +138,7 @@ _T > [_:id('X_INTRODUCED_0')|_T]. @@ -138,7 +138,7 @@ _T > [_:id('X_INTRODUCED_0')|_T].
138 _T > [_:id('nsw')|_T]. 138 _T > [_:id('nsw')|_T].
139 _T > [_:id('v')|_T]. 139 _T > [_:id('v')|_T].
140 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 140 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
141 -[Es|_T] > [array(_,[_]):alit(Es)|_T]. 141 +[Es|_T] > [array(_):alit(Es)|_T].
142 _T > [int:lit(0)|_T]. 142 _T > [int:lit(0)|_T].
143 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 143 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
144 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T]. 144 [T2:E2,T1:E1|_T] > [(T1,T2):(E1,E2)|_T].
fzn-parser/flatzinc.y
  Diff comments   View file @2330bbc
@@ -119,6 +119,7 @@ pred_decl_item: @@ -119,6 +119,7 @@ pred_decl_item:
119 119
120 var_decl_item: 120 var_decl_item:
121 VAR non_array_ti_expr_tail ':' ident_anns var_decl_item2 121 VAR non_array_ti_expr_tail ':' ident_anns var_decl_item2
  122 + { AST ("ID,T")
122 | non_array_ti_expr_tail ':' ident_anns '=' expr 123 | non_array_ti_expr_tail ':' ident_anns '=' expr
123 | ARRAY '[' INT_LITERAL DOTDOT INT_LITERAL ']' OF array_decl_tail 124 | ARRAY '[' INT_LITERAL DOTDOT INT_LITERAL ']' OF array_decl_tail
124 125
@@ -135,8 +136,8 @@ array_decl_tail2: @@ -135,8 +136,8 @@ array_decl_tail2:
135 | /*empty*/ 136 | /*empty*/
136 137
137 ident_anns: 138 ident_anns:
138 - IDENT annotations  
139 - | UNDERSCORE_IDENT annotations 139 + IDENT { PUSH (("id('%s')", $1)); } annotations
  140 + | UNDERSCORE_IDENT { PUSH (("id('%s')", $1)); } annotations
140 141
141 constraint_item: 142 constraint_item:
142 CONSTRAINT constraint_elem annotations 143 CONSTRAINT constraint_elem annotations
fzn-parser/fznslurp.pl
  Diff comments   View file @2330bbc
@@ -4,6 +4,10 @@ load_ast(AST) :- load_ast(_>[], [], AST). @@ -4,6 +4,10 @@ load_ast(AST) :- load_ast(_>[], [], AST).
4 4
5 load_ast(end_of_file, AST, AST). 5 load_ast(end_of_file, AST, AST).
6 load_ast(IN > INT, IN, OUT) :- read(OP), !, 6 load_ast(IN > INT, IN, OUT) :- read(OP), !,
7 - write(OP), nl, 7 + ( g_read(ast_debug, true) ->
  8 + write(OP), nl
  9 + ; true ),
8 load_ast(OP, INT, OUT). 10 load_ast(OP, INT, OUT).
9 11
  12 +slurp(FILE, AST) :- see(FILE), load_ast(AST), !, seen.
  13 +slurp(_, end_of_file) :- seen.