Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tammo Jan Dijkema
dt_ctrl
Commits
f6fb5d2a
Commit
f6fb5d2a
authored
Jan 20, 2015
by
Daan Vreeken
Browse files
Resolve ambiguity in parser by adding separate 'empty' sequences.
modified: controller/controller_load_parser.y
parent
6109b567
Changes
1
Hide whitespace changes
Inline
Side-by-side
controller/controller/controller_load_parser.y
View file @
f6fb5d2a
...
...
@@ -141,11 +141,14 @@ import: IMPORTSYM stringvar
}
;
aliases: ALIASSYM BRACEOPENSYM aliaslist BRACECLOSESYM
aliases: ALIASSYM BRACEOPENSYM maybealiaslist BRACECLOSESYM
maybealiaslist : aliaslist
|
;
aliaslist: alias
| alias aliaslist
|
;
alias: BRACEOPENSYM
...
...
@@ -158,11 +161,14 @@ alias: BRACEOPENSYM
}
triggers: TRIGGERSYM BRACEOPENSYM triggerlist BRACECLOSESYM
triggers: TRIGGERSYM BRACEOPENSYM maybetriggerlist BRACECLOSESYM
maybetriggerlist : triggerlist
|
;
triggerlist: trigger
| trigger triggerlist
|
;
trigger : BRACEOPENSYM
...
...
@@ -188,13 +194,16 @@ blocks : BLOCKSSYM PARENTHESESOPENSYM doublevar COMMASYM doublevar
&frequency, &delay);
controller_time_param_set(frequency, delay);
}
PARENTHESESCLOSESYM BRACEOPENSYM blocklist BRACECLOSESYM
PARENTHESESCLOSESYM BRACEOPENSYM maybeblocklist BRACECLOSESYM
maybeblocklist: blocklist
|
;
blocklist: block
| module
| block blocklist
| module blocklist
|
;
block : BRACEOPENSYM
...
...
@@ -266,11 +275,14 @@ moduleoutput : BRACEOPENSYM
}
BRACECLOSESYM
params : PARAMSSYM BRACEOPENSYM paramlist BRACECLOSESYM
params : PARAMSSYM BRACEOPENSYM maybeparamlist BRACECLOSESYM
maybeparamlist : paramlist
|
;
paramlist: param
| param paramlist
|
;
param : BRACEOPENSYM
...
...
@@ -406,11 +418,14 @@ set: SETSYM VARIABLENAMESYM doublevar
{ controller_load_variable_string_set($2, $3); }
;
links : LINKSSYM BRACEOPENSYM linklist BRACECLOSESYM
links : LINKSSYM BRACEOPENSYM maybelinklist BRACECLOSESYM
maybelinklist : linklist
|
;
linklist: link
| link linklist
|
;
link : BRACEOPENSYM
...
...
@@ -480,11 +495,14 @@ link : BRACEOPENSYM
}
;
traces : TRACESSYM BRACEOPENSYM tracelist BRACECLOSESYM
traces : TRACESSYM BRACEOPENSYM maybetracelist BRACECLOSESYM
maybetracelist : tracelist
|
;
tracelist: trace
| trace tracelist
|
;
trace : BRACEOPENSYM
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment