dv-flow-mgr 1.0.0.14528489065a1__py3-none-any.whl → 1.5.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. dv_flow/mgr/__init__.py +4 -0
  2. dv_flow/mgr/cmds/cmd_run.py +6 -1
  3. dv_flow/mgr/cmds/cmd_show.py +3 -3
  4. dv_flow/mgr/config_def.py +1 -1
  5. dv_flow/mgr/expr_eval.py +24 -1
  6. dv_flow/mgr/expr_parser.py +26 -1
  7. dv_flow/mgr/package.py +13 -6
  8. dv_flow/mgr/package_def.py +3 -4
  9. dv_flow/mgr/package_loader.py +252 -120
  10. dv_flow/mgr/param_def.py +7 -2
  11. dv_flow/mgr/param_ref_eval.py +3 -0
  12. dv_flow/mgr/parser.out +258 -138
  13. dv_flow/mgr/parsetab.py +20 -17
  14. dv_flow/mgr/std/flow.dv +31 -53
  15. dv_flow/mgr/std/incdirs.py +18 -0
  16. dv_flow/mgr/task.py +1 -0
  17. dv_flow/mgr/task_def.py +5 -1
  18. dv_flow/mgr/task_graph_builder.py +265 -24
  19. dv_flow/mgr/task_graph_dot_writer.py +32 -3
  20. dv_flow/mgr/task_listener_log.py +46 -31
  21. dv_flow/mgr/task_node.py +3 -0
  22. dv_flow/mgr/task_node_compound.py +1 -0
  23. dv_flow/mgr/task_node_ctor_wrapper.py +3 -1
  24. dv_flow/mgr/task_node_ctxt.py +7 -0
  25. dv_flow/mgr/task_node_leaf.py +77 -54
  26. dv_flow/mgr/task_run_ctxt.py +18 -0
  27. dv_flow/mgr/task_runner.py +8 -5
  28. dv_flow/mgr/type.py +33 -0
  29. dv_flow/mgr/type_def.py +4 -2
  30. dv_flow/mgr/util/util.py +9 -0
  31. dv_flow/mgr/yaml_srcinfo_loader.py +1 -0
  32. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/METADATA +1 -1
  33. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/RECORD +37 -35
  34. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/WHEEL +1 -1
  35. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/entry_points.txt +0 -0
  36. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/licenses/LICENSE +0 -0
  37. {dv_flow_mgr-1.0.0.14528489065a1.dist-info → dv_flow_mgr-1.5.0.dist-info}/top_level.txt +0 -0
dv_flow/mgr/parser.out CHANGED
@@ -15,22 +15,26 @@ Rule 9 expression -> expression DIVIDE expression
15
15
  Rule 10 expression -> LPAREN expression RPAREN
16
16
  Rule 11 expression -> NUMBER
17
17
  Rule 12 expression -> ID
18
- Rule 13 expression -> STRING1
19
- Rule 14 expression -> STRING2
18
+ Rule 13 expression -> hier_id
19
+ Rule 14 hier_id -> ID DOT hier_id
20
+ Rule 15 hier_id -> ID
21
+ Rule 16 expression -> STRING1
22
+ Rule 17 expression -> STRING2
20
23
 
21
24
  Terminals, with rules where they appear
22
25
 
23
26
  COMMA : 4
24
27
  DIVIDE : 9
25
- ID : 1 2 12
28
+ DOT : 14
29
+ ID : 1 2 12 14 15
26
30
  LPAREN : 1 2 10
27
31
  MINUS : 6
28
32
  NUMBER : 11
29
33
  PIPE : 8
30
34
  PLUS : 5
31
35
  RPAREN : 1 2 10
32
- STRING1 : 13
33
- STRING2 : 14
36
+ STRING1 : 16
37
+ STRING2 : 17
34
38
  TIMES : 7
35
39
  error :
36
40
 
@@ -38,6 +42,7 @@ Nonterminals, with rules where they appear
38
42
 
39
43
  args : 2 4
40
44
  expression : 3 4 5 5 6 6 7 7 8 8 9 9 10 0
45
+ hier_id : 13 14
41
46
 
42
47
  Parsing method: LALR
43
48
 
@@ -54,16 +59,20 @@ state 0
54
59
  (10) expression -> . LPAREN expression RPAREN
55
60
  (11) expression -> . NUMBER
56
61
  (12) expression -> . ID
57
- (13) expression -> . STRING1
58
- (14) expression -> . STRING2
62
+ (13) expression -> . hier_id
63
+ (16) expression -> . STRING1
64
+ (17) expression -> . STRING2
65
+ (14) hier_id -> . ID DOT hier_id
66
+ (15) hier_id -> . ID
59
67
 
60
68
  ID shift and go to state 2
61
69
  LPAREN shift and go to state 3
62
70
  NUMBER shift and go to state 4
63
- STRING1 shift and go to state 5
64
- STRING2 shift and go to state 6
71
+ STRING1 shift and go to state 6
72
+ STRING2 shift and go to state 7
65
73
 
66
74
  expression shift and go to state 1
75
+ hier_id shift and go to state 5
67
76
 
68
77
  state 1
69
78
 
@@ -74,11 +83,11 @@ state 1
74
83
  (8) expression -> expression . PIPE expression
75
84
  (9) expression -> expression . DIVIDE expression
76
85
 
77
- PLUS shift and go to state 7
78
- MINUS shift and go to state 8
79
- TIMES shift and go to state 9
80
- PIPE shift and go to state 10
81
- DIVIDE shift and go to state 11
86
+ PLUS shift and go to state 8
87
+ MINUS shift and go to state 9
88
+ TIMES shift and go to state 10
89
+ PIPE shift and go to state 11
90
+ DIVIDE shift and go to state 12
82
91
 
83
92
 
84
93
  state 2
@@ -86,8 +95,18 @@ state 2
86
95
  (1) expression -> ID . LPAREN RPAREN
87
96
  (2) expression -> ID . LPAREN args RPAREN
88
97
  (12) expression -> ID .
89
-
90
- LPAREN shift and go to state 12
98
+ (14) hier_id -> ID . DOT hier_id
99
+ (15) hier_id -> ID .
100
+
101
+ ! reduce/reduce conflict for PLUS resolved using rule 12 (expression -> ID .)
102
+ ! reduce/reduce conflict for MINUS resolved using rule 12 (expression -> ID .)
103
+ ! reduce/reduce conflict for TIMES resolved using rule 12 (expression -> ID .)
104
+ ! reduce/reduce conflict for PIPE resolved using rule 12 (expression -> ID .)
105
+ ! reduce/reduce conflict for DIVIDE resolved using rule 12 (expression -> ID .)
106
+ ! reduce/reduce conflict for $end resolved using rule 12 (expression -> ID .)
107
+ ! reduce/reduce conflict for RPAREN resolved using rule 12 (expression -> ID .)
108
+ ! reduce/reduce conflict for COMMA resolved using rule 12 (expression -> ID .)
109
+ LPAREN shift and go to state 13
91
110
  PLUS reduce using rule 12 (expression -> ID .)
92
111
  MINUS reduce using rule 12 (expression -> ID .)
93
112
  TIMES reduce using rule 12 (expression -> ID .)
@@ -96,6 +115,16 @@ state 2
96
115
  $end reduce using rule 12 (expression -> ID .)
97
116
  RPAREN reduce using rule 12 (expression -> ID .)
98
117
  COMMA reduce using rule 12 (expression -> ID .)
118
+ DOT shift and go to state 14
119
+
120
+ ! PLUS [ reduce using rule 15 (hier_id -> ID .) ]
121
+ ! MINUS [ reduce using rule 15 (hier_id -> ID .) ]
122
+ ! TIMES [ reduce using rule 15 (hier_id -> ID .) ]
123
+ ! PIPE [ reduce using rule 15 (hier_id -> ID .) ]
124
+ ! DIVIDE [ reduce using rule 15 (hier_id -> ID .) ]
125
+ ! $end [ reduce using rule 15 (hier_id -> ID .) ]
126
+ ! RPAREN [ reduce using rule 15 (hier_id -> ID .) ]
127
+ ! COMMA [ reduce using rule 15 (hier_id -> ID .) ]
99
128
 
100
129
 
101
130
  state 3
@@ -111,16 +140,20 @@ state 3
111
140
  (10) expression -> . LPAREN expression RPAREN
112
141
  (11) expression -> . NUMBER
113
142
  (12) expression -> . ID
114
- (13) expression -> . STRING1
115
- (14) expression -> . STRING2
143
+ (13) expression -> . hier_id
144
+ (16) expression -> . STRING1
145
+ (17) expression -> . STRING2
146
+ (14) hier_id -> . ID DOT hier_id
147
+ (15) hier_id -> . ID
116
148
 
117
149
  ID shift and go to state 2
118
150
  LPAREN shift and go to state 3
119
151
  NUMBER shift and go to state 4
120
- STRING1 shift and go to state 5
121
- STRING2 shift and go to state 6
152
+ STRING1 shift and go to state 6
153
+ STRING2 shift and go to state 7
122
154
 
123
- expression shift and go to state 13
155
+ expression shift and go to state 15
156
+ hier_id shift and go to state 5
124
157
 
125
158
  state 4
126
159
 
@@ -138,34 +171,48 @@ state 4
138
171
 
139
172
  state 5
140
173
 
141
- (13) expression -> STRING1 .
174
+ (13) expression -> hier_id .
142
175
 
143
- PLUS reduce using rule 13 (expression -> STRING1 .)
144
- MINUS reduce using rule 13 (expression -> STRING1 .)
145
- TIMES reduce using rule 13 (expression -> STRING1 .)
146
- PIPE reduce using rule 13 (expression -> STRING1 .)
147
- DIVIDE reduce using rule 13 (expression -> STRING1 .)
148
- $end reduce using rule 13 (expression -> STRING1 .)
149
- RPAREN reduce using rule 13 (expression -> STRING1 .)
150
- COMMA reduce using rule 13 (expression -> STRING1 .)
176
+ PLUS reduce using rule 13 (expression -> hier_id .)
177
+ MINUS reduce using rule 13 (expression -> hier_id .)
178
+ TIMES reduce using rule 13 (expression -> hier_id .)
179
+ PIPE reduce using rule 13 (expression -> hier_id .)
180
+ DIVIDE reduce using rule 13 (expression -> hier_id .)
181
+ $end reduce using rule 13 (expression -> hier_id .)
182
+ RPAREN reduce using rule 13 (expression -> hier_id .)
183
+ COMMA reduce using rule 13 (expression -> hier_id .)
151
184
 
152
185
 
153
186
  state 6
154
187
 
155
- (14) expression -> STRING2 .
188
+ (16) expression -> STRING1 .
156
189
 
157
- PLUS reduce using rule 14 (expression -> STRING2 .)
158
- MINUS reduce using rule 14 (expression -> STRING2 .)
159
- TIMES reduce using rule 14 (expression -> STRING2 .)
160
- PIPE reduce using rule 14 (expression -> STRING2 .)
161
- DIVIDE reduce using rule 14 (expression -> STRING2 .)
162
- $end reduce using rule 14 (expression -> STRING2 .)
163
- RPAREN reduce using rule 14 (expression -> STRING2 .)
164
- COMMA reduce using rule 14 (expression -> STRING2 .)
190
+ PLUS reduce using rule 16 (expression -> STRING1 .)
191
+ MINUS reduce using rule 16 (expression -> STRING1 .)
192
+ TIMES reduce using rule 16 (expression -> STRING1 .)
193
+ PIPE reduce using rule 16 (expression -> STRING1 .)
194
+ DIVIDE reduce using rule 16 (expression -> STRING1 .)
195
+ $end reduce using rule 16 (expression -> STRING1 .)
196
+ RPAREN reduce using rule 16 (expression -> STRING1 .)
197
+ COMMA reduce using rule 16 (expression -> STRING1 .)
165
198
 
166
199
 
167
200
  state 7
168
201
 
202
+ (17) expression -> STRING2 .
203
+
204
+ PLUS reduce using rule 17 (expression -> STRING2 .)
205
+ MINUS reduce using rule 17 (expression -> STRING2 .)
206
+ TIMES reduce using rule 17 (expression -> STRING2 .)
207
+ PIPE reduce using rule 17 (expression -> STRING2 .)
208
+ DIVIDE reduce using rule 17 (expression -> STRING2 .)
209
+ $end reduce using rule 17 (expression -> STRING2 .)
210
+ RPAREN reduce using rule 17 (expression -> STRING2 .)
211
+ COMMA reduce using rule 17 (expression -> STRING2 .)
212
+
213
+
214
+ state 8
215
+
169
216
  (5) expression -> expression PLUS . expression
170
217
  (1) expression -> . ID LPAREN RPAREN
171
218
  (2) expression -> . ID LPAREN args RPAREN
@@ -177,18 +224,22 @@ state 7
177
224
  (10) expression -> . LPAREN expression RPAREN
178
225
  (11) expression -> . NUMBER
179
226
  (12) expression -> . ID
180
- (13) expression -> . STRING1
181
- (14) expression -> . STRING2
227
+ (13) expression -> . hier_id
228
+ (16) expression -> . STRING1
229
+ (17) expression -> . STRING2
230
+ (14) hier_id -> . ID DOT hier_id
231
+ (15) hier_id -> . ID
182
232
 
183
233
  ID shift and go to state 2
184
234
  LPAREN shift and go to state 3
185
235
  NUMBER shift and go to state 4
186
- STRING1 shift and go to state 5
187
- STRING2 shift and go to state 6
236
+ STRING1 shift and go to state 6
237
+ STRING2 shift and go to state 7
188
238
 
189
- expression shift and go to state 14
239
+ expression shift and go to state 16
240
+ hier_id shift and go to state 5
190
241
 
191
- state 8
242
+ state 9
192
243
 
193
244
  (6) expression -> expression MINUS . expression
194
245
  (1) expression -> . ID LPAREN RPAREN
@@ -201,18 +252,22 @@ state 8
201
252
  (10) expression -> . LPAREN expression RPAREN
202
253
  (11) expression -> . NUMBER
203
254
  (12) expression -> . ID
204
- (13) expression -> . STRING1
205
- (14) expression -> . STRING2
255
+ (13) expression -> . hier_id
256
+ (16) expression -> . STRING1
257
+ (17) expression -> . STRING2
258
+ (14) hier_id -> . ID DOT hier_id
259
+ (15) hier_id -> . ID
206
260
 
207
261
  ID shift and go to state 2
208
262
  LPAREN shift and go to state 3
209
263
  NUMBER shift and go to state 4
210
- STRING1 shift and go to state 5
211
- STRING2 shift and go to state 6
264
+ STRING1 shift and go to state 6
265
+ STRING2 shift and go to state 7
212
266
 
213
- expression shift and go to state 15
267
+ expression shift and go to state 17
268
+ hier_id shift and go to state 5
214
269
 
215
- state 9
270
+ state 10
216
271
 
217
272
  (7) expression -> expression TIMES . expression
218
273
  (1) expression -> . ID LPAREN RPAREN
@@ -225,18 +280,22 @@ state 9
225
280
  (10) expression -> . LPAREN expression RPAREN
226
281
  (11) expression -> . NUMBER
227
282
  (12) expression -> . ID
228
- (13) expression -> . STRING1
229
- (14) expression -> . STRING2
283
+ (13) expression -> . hier_id
284
+ (16) expression -> . STRING1
285
+ (17) expression -> . STRING2
286
+ (14) hier_id -> . ID DOT hier_id
287
+ (15) hier_id -> . ID
230
288
 
231
289
  ID shift and go to state 2
232
290
  LPAREN shift and go to state 3
233
291
  NUMBER shift and go to state 4
234
- STRING1 shift and go to state 5
235
- STRING2 shift and go to state 6
292
+ STRING1 shift and go to state 6
293
+ STRING2 shift and go to state 7
236
294
 
237
- expression shift and go to state 16
295
+ expression shift and go to state 18
296
+ hier_id shift and go to state 5
238
297
 
239
- state 10
298
+ state 11
240
299
 
241
300
  (8) expression -> expression PIPE . expression
242
301
  (1) expression -> . ID LPAREN RPAREN
@@ -249,18 +308,22 @@ state 10
249
308
  (10) expression -> . LPAREN expression RPAREN
250
309
  (11) expression -> . NUMBER
251
310
  (12) expression -> . ID
252
- (13) expression -> . STRING1
253
- (14) expression -> . STRING2
311
+ (13) expression -> . hier_id
312
+ (16) expression -> . STRING1
313
+ (17) expression -> . STRING2
314
+ (14) hier_id -> . ID DOT hier_id
315
+ (15) hier_id -> . ID
254
316
 
255
317
  ID shift and go to state 2
256
318
  LPAREN shift and go to state 3
257
319
  NUMBER shift and go to state 4
258
- STRING1 shift and go to state 5
259
- STRING2 shift and go to state 6
320
+ STRING1 shift and go to state 6
321
+ STRING2 shift and go to state 7
260
322
 
261
- expression shift and go to state 17
323
+ expression shift and go to state 19
324
+ hier_id shift and go to state 5
262
325
 
263
- state 11
326
+ state 12
264
327
 
265
328
  (9) expression -> expression DIVIDE . expression
266
329
  (1) expression -> . ID LPAREN RPAREN
@@ -273,18 +336,22 @@ state 11
273
336
  (10) expression -> . LPAREN expression RPAREN
274
337
  (11) expression -> . NUMBER
275
338
  (12) expression -> . ID
276
- (13) expression -> . STRING1
277
- (14) expression -> . STRING2
339
+ (13) expression -> . hier_id
340
+ (16) expression -> . STRING1
341
+ (17) expression -> . STRING2
342
+ (14) hier_id -> . ID DOT hier_id
343
+ (15) hier_id -> . ID
278
344
 
279
345
  ID shift and go to state 2
280
346
  LPAREN shift and go to state 3
281
347
  NUMBER shift and go to state 4
282
- STRING1 shift and go to state 5
283
- STRING2 shift and go to state 6
348
+ STRING1 shift and go to state 6
349
+ STRING2 shift and go to state 7
284
350
 
285
- expression shift and go to state 18
351
+ expression shift and go to state 20
352
+ hier_id shift and go to state 5
286
353
 
287
- state 12
354
+ state 13
288
355
 
289
356
  (1) expression -> ID LPAREN . RPAREN
290
357
  (2) expression -> ID LPAREN . args RPAREN
@@ -300,20 +367,34 @@ state 12
300
367
  (10) expression -> . LPAREN expression RPAREN
301
368
  (11) expression -> . NUMBER
302
369
  (12) expression -> . ID
303
- (13) expression -> . STRING1
304
- (14) expression -> . STRING2
370
+ (13) expression -> . hier_id
371
+ (16) expression -> . STRING1
372
+ (17) expression -> . STRING2
373
+ (14) hier_id -> . ID DOT hier_id
374
+ (15) hier_id -> . ID
305
375
 
306
- RPAREN shift and go to state 19
376
+ RPAREN shift and go to state 21
307
377
  ID shift and go to state 2
308
378
  LPAREN shift and go to state 3
309
379
  NUMBER shift and go to state 4
310
- STRING1 shift and go to state 5
311
- STRING2 shift and go to state 6
380
+ STRING1 shift and go to state 6
381
+ STRING2 shift and go to state 7
312
382
 
313
- args shift and go to state 20
314
- expression shift and go to state 21
383
+ args shift and go to state 22
384
+ expression shift and go to state 23
385
+ hier_id shift and go to state 5
315
386
 
316
- state 13
387
+ state 14
388
+
389
+ (14) hier_id -> ID DOT . hier_id
390
+ (14) hier_id -> . ID DOT hier_id
391
+ (15) hier_id -> . ID
392
+
393
+ ID shift and go to state 24
394
+
395
+ hier_id shift and go to state 25
396
+
397
+ state 15
317
398
 
318
399
  (10) expression -> LPAREN expression . RPAREN
319
400
  (5) expression -> expression . PLUS expression
@@ -322,15 +403,15 @@ state 13
322
403
  (8) expression -> expression . PIPE expression
323
404
  (9) expression -> expression . DIVIDE expression
324
405
 
325
- RPAREN shift and go to state 22
326
- PLUS shift and go to state 7
327
- MINUS shift and go to state 8
328
- TIMES shift and go to state 9
329
- PIPE shift and go to state 10
330
- DIVIDE shift and go to state 11
406
+ RPAREN shift and go to state 26
407
+ PLUS shift and go to state 8
408
+ MINUS shift and go to state 9
409
+ TIMES shift and go to state 10
410
+ PIPE shift and go to state 11
411
+ DIVIDE shift and go to state 12
331
412
 
332
413
 
333
- state 14
414
+ state 16
334
415
 
335
416
  (5) expression -> expression PLUS expression .
336
417
  (5) expression -> expression . PLUS expression
@@ -345,17 +426,17 @@ state 14
345
426
  $end reduce using rule 5 (expression -> expression PLUS expression .)
346
427
  RPAREN reduce using rule 5 (expression -> expression PLUS expression .)
347
428
  COMMA reduce using rule 5 (expression -> expression PLUS expression .)
348
- TIMES shift and go to state 9
349
- DIVIDE shift and go to state 11
429
+ TIMES shift and go to state 10
430
+ DIVIDE shift and go to state 12
350
431
 
351
432
  ! TIMES [ reduce using rule 5 (expression -> expression PLUS expression .) ]
352
433
  ! DIVIDE [ reduce using rule 5 (expression -> expression PLUS expression .) ]
353
- ! PLUS [ shift and go to state 7 ]
354
- ! MINUS [ shift and go to state 8 ]
355
- ! PIPE [ shift and go to state 10 ]
434
+ ! PLUS [ shift and go to state 8 ]
435
+ ! MINUS [ shift and go to state 9 ]
436
+ ! PIPE [ shift and go to state 11 ]
356
437
 
357
438
 
358
- state 15
439
+ state 17
359
440
 
360
441
  (6) expression -> expression MINUS expression .
361
442
  (5) expression -> expression . PLUS expression
@@ -370,17 +451,17 @@ state 15
370
451
  $end reduce using rule 6 (expression -> expression MINUS expression .)
371
452
  RPAREN reduce using rule 6 (expression -> expression MINUS expression .)
372
453
  COMMA reduce using rule 6 (expression -> expression MINUS expression .)
373
- TIMES shift and go to state 9
374
- DIVIDE shift and go to state 11
454
+ TIMES shift and go to state 10
455
+ DIVIDE shift and go to state 12
375
456
 
376
457
  ! TIMES [ reduce using rule 6 (expression -> expression MINUS expression .) ]
377
458
  ! DIVIDE [ reduce using rule 6 (expression -> expression MINUS expression .) ]
378
- ! PLUS [ shift and go to state 7 ]
379
- ! MINUS [ shift and go to state 8 ]
380
- ! PIPE [ shift and go to state 10 ]
459
+ ! PLUS [ shift and go to state 8 ]
460
+ ! MINUS [ shift and go to state 9 ]
461
+ ! PIPE [ shift and go to state 11 ]
381
462
 
382
463
 
383
- state 16
464
+ state 18
384
465
 
385
466
  (7) expression -> expression TIMES expression .
386
467
  (5) expression -> expression . PLUS expression
@@ -398,14 +479,14 @@ state 16
398
479
  RPAREN reduce using rule 7 (expression -> expression TIMES expression .)
399
480
  COMMA reduce using rule 7 (expression -> expression TIMES expression .)
400
481
 
401
- ! PLUS [ shift and go to state 7 ]
402
- ! MINUS [ shift and go to state 8 ]
403
- ! TIMES [ shift and go to state 9 ]
404
- ! PIPE [ shift and go to state 10 ]
405
- ! DIVIDE [ shift and go to state 11 ]
482
+ ! PLUS [ shift and go to state 8 ]
483
+ ! MINUS [ shift and go to state 9 ]
484
+ ! TIMES [ shift and go to state 10 ]
485
+ ! PIPE [ shift and go to state 11 ]
486
+ ! DIVIDE [ shift and go to state 12 ]
406
487
 
407
488
 
408
- state 17
489
+ state 19
409
490
 
410
491
  (8) expression -> expression PIPE expression .
411
492
  (5) expression -> expression . PLUS expression
@@ -420,17 +501,17 @@ state 17
420
501
  $end reduce using rule 8 (expression -> expression PIPE expression .)
421
502
  RPAREN reduce using rule 8 (expression -> expression PIPE expression .)
422
503
  COMMA reduce using rule 8 (expression -> expression PIPE expression .)
423
- TIMES shift and go to state 9
424
- DIVIDE shift and go to state 11
504
+ TIMES shift and go to state 10
505
+ DIVIDE shift and go to state 12
425
506
 
426
507
  ! TIMES [ reduce using rule 8 (expression -> expression PIPE expression .) ]
427
508
  ! DIVIDE [ reduce using rule 8 (expression -> expression PIPE expression .) ]
428
- ! PLUS [ shift and go to state 7 ]
429
- ! MINUS [ shift and go to state 8 ]
430
- ! PIPE [ shift and go to state 10 ]
509
+ ! PLUS [ shift and go to state 8 ]
510
+ ! MINUS [ shift and go to state 9 ]
511
+ ! PIPE [ shift and go to state 11 ]
431
512
 
432
513
 
433
- state 18
514
+ state 20
434
515
 
435
516
  (9) expression -> expression DIVIDE expression .
436
517
  (5) expression -> expression . PLUS expression
@@ -448,14 +529,14 @@ state 18
448
529
  RPAREN reduce using rule 9 (expression -> expression DIVIDE expression .)
449
530
  COMMA reduce using rule 9 (expression -> expression DIVIDE expression .)
450
531
 
451
- ! PLUS [ shift and go to state 7 ]
452
- ! MINUS [ shift and go to state 8 ]
453
- ! TIMES [ shift and go to state 9 ]
454
- ! PIPE [ shift and go to state 10 ]
455
- ! DIVIDE [ shift and go to state 11 ]
532
+ ! PLUS [ shift and go to state 8 ]
533
+ ! MINUS [ shift and go to state 9 ]
534
+ ! TIMES [ shift and go to state 10 ]
535
+ ! PIPE [ shift and go to state 11 ]
536
+ ! DIVIDE [ shift and go to state 12 ]
456
537
 
457
538
 
458
- state 19
539
+ state 21
459
540
 
460
541
  (1) expression -> ID LPAREN RPAREN .
461
542
 
@@ -469,16 +550,16 @@ state 19
469
550
  COMMA reduce using rule 1 (expression -> ID LPAREN RPAREN .)
470
551
 
471
552
 
472
- state 20
553
+ state 22
473
554
 
474
555
  (2) expression -> ID LPAREN args . RPAREN
475
556
  (4) args -> args . COMMA expression
476
557
 
477
- RPAREN shift and go to state 23
478
- COMMA shift and go to state 24
558
+ RPAREN shift and go to state 27
559
+ COMMA shift and go to state 28
479
560
 
480
561
 
481
- state 21
562
+ state 23
482
563
 
483
564
  (3) args -> expression .
484
565
  (5) expression -> expression . PLUS expression
@@ -489,14 +570,44 @@ state 21
489
570
 
490
571
  RPAREN reduce using rule 3 (args -> expression .)
491
572
  COMMA reduce using rule 3 (args -> expression .)
492
- PLUS shift and go to state 7
493
- MINUS shift and go to state 8
494
- TIMES shift and go to state 9
495
- PIPE shift and go to state 10
496
- DIVIDE shift and go to state 11
573
+ PLUS shift and go to state 8
574
+ MINUS shift and go to state 9
575
+ TIMES shift and go to state 10
576
+ PIPE shift and go to state 11
577
+ DIVIDE shift and go to state 12
497
578
 
498
579
 
499
- state 22
580
+ state 24
581
+
582
+ (14) hier_id -> ID . DOT hier_id
583
+ (15) hier_id -> ID .
584
+
585
+ DOT shift and go to state 14
586
+ PLUS reduce using rule 15 (hier_id -> ID .)
587
+ MINUS reduce using rule 15 (hier_id -> ID .)
588
+ TIMES reduce using rule 15 (hier_id -> ID .)
589
+ PIPE reduce using rule 15 (hier_id -> ID .)
590
+ DIVIDE reduce using rule 15 (hier_id -> ID .)
591
+ $end reduce using rule 15 (hier_id -> ID .)
592
+ RPAREN reduce using rule 15 (hier_id -> ID .)
593
+ COMMA reduce using rule 15 (hier_id -> ID .)
594
+
595
+
596
+ state 25
597
+
598
+ (14) hier_id -> ID DOT hier_id .
599
+
600
+ PLUS reduce using rule 14 (hier_id -> ID DOT hier_id .)
601
+ MINUS reduce using rule 14 (hier_id -> ID DOT hier_id .)
602
+ TIMES reduce using rule 14 (hier_id -> ID DOT hier_id .)
603
+ PIPE reduce using rule 14 (hier_id -> ID DOT hier_id .)
604
+ DIVIDE reduce using rule 14 (hier_id -> ID DOT hier_id .)
605
+ $end reduce using rule 14 (hier_id -> ID DOT hier_id .)
606
+ RPAREN reduce using rule 14 (hier_id -> ID DOT hier_id .)
607
+ COMMA reduce using rule 14 (hier_id -> ID DOT hier_id .)
608
+
609
+
610
+ state 26
500
611
 
501
612
  (10) expression -> LPAREN expression RPAREN .
502
613
 
@@ -510,7 +621,7 @@ state 22
510
621
  COMMA reduce using rule 10 (expression -> LPAREN expression RPAREN .)
511
622
 
512
623
 
513
- state 23
624
+ state 27
514
625
 
515
626
  (2) expression -> ID LPAREN args RPAREN .
516
627
 
@@ -524,7 +635,7 @@ state 23
524
635
  COMMA reduce using rule 2 (expression -> ID LPAREN args RPAREN .)
525
636
 
526
637
 
527
- state 24
638
+ state 28
528
639
 
529
640
  (4) args -> args COMMA . expression
530
641
  (1) expression -> . ID LPAREN RPAREN
@@ -537,18 +648,22 @@ state 24
537
648
  (10) expression -> . LPAREN expression RPAREN
538
649
  (11) expression -> . NUMBER
539
650
  (12) expression -> . ID
540
- (13) expression -> . STRING1
541
- (14) expression -> . STRING2
651
+ (13) expression -> . hier_id
652
+ (16) expression -> . STRING1
653
+ (17) expression -> . STRING2
654
+ (14) hier_id -> . ID DOT hier_id
655
+ (15) hier_id -> . ID
542
656
 
543
657
  ID shift and go to state 2
544
658
  LPAREN shift and go to state 3
545
659
  NUMBER shift and go to state 4
546
- STRING1 shift and go to state 5
547
- STRING2 shift and go to state 6
660
+ STRING1 shift and go to state 6
661
+ STRING2 shift and go to state 7
548
662
 
549
- expression shift and go to state 25
663
+ expression shift and go to state 29
664
+ hier_id shift and go to state 5
550
665
 
551
- state 25
666
+ state 29
552
667
 
553
668
  (4) args -> args COMMA expression .
554
669
  (5) expression -> expression . PLUS expression
@@ -559,9 +674,14 @@ state 25
559
674
 
560
675
  RPAREN reduce using rule 4 (args -> args COMMA expression .)
561
676
  COMMA reduce using rule 4 (args -> args COMMA expression .)
562
- PLUS shift and go to state 7
563
- MINUS shift and go to state 8
564
- TIMES shift and go to state 9
565
- PIPE shift and go to state 10
566
- DIVIDE shift and go to state 11
567
-
677
+ PLUS shift and go to state 8
678
+ MINUS shift and go to state 9
679
+ TIMES shift and go to state 10
680
+ PIPE shift and go to state 11
681
+ DIVIDE shift and go to state 12
682
+
683
+ WARNING:
684
+ WARNING: Conflicts:
685
+ WARNING:
686
+ WARNING: reduce/reduce conflict in state 2 resolved using rule (expression -> ID)
687
+ WARNING: rejected rule (hier_id -> ID) in state 2