Do that last commit slightly differently - this way results in no
shift-reduce conflicts. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk@256 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
parent
b3828e962b
commit
5d7000ba8a
|
@ -116,10 +116,13 @@ static int parse_cmdbits(OPCODE * op);
|
||||||
%token TKN_STRING
|
%token TKN_STRING
|
||||||
%token TKN_ID
|
%token TKN_ID
|
||||||
|
|
||||||
%start config
|
%start configuration
|
||||||
|
|
||||||
%%
|
%%
|
||||||
|
|
||||||
|
configuration :
|
||||||
|
/* empty */ | config
|
||||||
|
;
|
||||||
|
|
||||||
config :
|
config :
|
||||||
def |
|
def |
|
||||||
|
@ -148,9 +151,7 @@ def :
|
||||||
strncpy(default_serial, $3->value.string, PATH_MAX);
|
strncpy(default_serial, $3->value.string, PATH_MAX);
|
||||||
default_serial[PATH_MAX-1] = 0;
|
default_serial[PATH_MAX-1] = 0;
|
||||||
free_token($3);
|
free_token($3);
|
||||||
} |
|
}
|
||||||
|
|
||||||
/* empty */
|
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue