|
21 | 21 | * - L_ means a lexeme, which has useful associated text, e.g. an integer. |
22 | 22 | */ |
23 | 23 |
|
24 | | -cgpm(empty) ::= . |
25 | | -cgpm(schema) ::= schema(s). |
| 24 | +cgpm(empty) ::= . |
| 25 | +cgpm(schema) ::= schema(s). |
26 | 26 |
|
27 | | -schema(one) ::= clause(c). |
28 | | -schema(some) ::= schema(s) T_COMMA clause_opt(c). |
| 27 | +schema(one) ::= clause(c). |
| 28 | +schema(some) ::= schema(s) T_COMMA clause_opt(c). |
29 | 29 |
|
30 | | -clause_opt(none) ::= . |
31 | | -clause_opt(some) ::= clause(c). |
| 30 | +clause_opt(none) ::= . |
| 31 | +clause_opt(some) ::= clause(c). |
32 | 32 |
|
33 | | -clause(basic) ::= var(var) dist(dist) param_opt(params). |
34 | | -clause(foreign) ::= K_MODEL vars(outputs) given_opt(inputs) |
35 | | - K_USING foreign(name) param_opt(params). |
36 | | -clause(subsamp) ::= K_SUBSAMPLE L_NUMBER(n). |
37 | | -clause(latent) ::= K_LATENT var(var) stattype(st). |
| 33 | +clause(basic) ::= var(var) dist(dist) param_opt(params). |
| 34 | +clause(foreign) ::= K_MODEL vars(outputs) given_opt(inputs) |
| 35 | + K_USING foreign(name) param_opt(params). |
| 36 | +clause(subsamp) ::= K_SUBSAMPLE L_NUMBER(n). |
| 37 | +clause(latent) ::= K_LATENT var(var) stattype(st). |
38 | 38 |
|
39 | | -dist(name) ::= L_NAME(dist). |
40 | | -foreign(name) ::= L_NAME(foreign). |
| 39 | +dist(name) ::= L_NAME(dist). |
| 40 | +foreign(name) ::= L_NAME(foreign). |
41 | 41 |
|
42 | | -given_opt(none) ::= . |
43 | | -given_opt(some) ::= K_GIVEN vars(vars). |
| 42 | +given_opt(none) ::= . |
| 43 | +given_opt(some) ::= K_GIVEN vars(vars). |
44 | 44 |
|
45 | | -vars(one) ::= var(var). |
46 | | -vars(many) ::= vars(vars) T_COMMA var(var). |
47 | | -var(name) ::= L_NAME(var). |
| 45 | +vars(one) ::= var(var). |
| 46 | +vars(many) ::= vars(vars) T_COMMA var(var). |
| 47 | +var(name) ::= L_NAME(var). |
48 | 48 |
|
49 | | -stattype(s) ::= L_NAME(st). |
| 49 | +stattype(s) ::= L_NAME(st). |
50 | 50 |
|
51 | | -param_opt(none) ::= . |
52 | | -param_opt(some) ::= T_LROUND params(ps) T_RROUND. |
53 | | -params(one) ::= param(param). |
54 | | -params(many) ::= params(params) T_COMMA param(param). |
| 51 | +param_opt(none) ::= . |
| 52 | +param_opt(some) ::= T_LROUND params(ps) T_RROUND. |
| 53 | +params(one) ::= param(param). |
| 54 | +params(many) ::= params(params) T_COMMA param(param). |
55 | 55 |
|
56 | | -param(num) ::= L_NAME(p) T_EQ L_NUMBER(num). |
57 | | -param(nam) ::= L_NAME(p) T_EQ L_NAME(nam). |
| 56 | +param(num) ::= L_NAME(p) T_EQ L_NUMBER(num). |
| 57 | +param(nam) ::= L_NAME(p) T_EQ L_NAME(nam). |
0 commit comments