X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=rpcgen_scan.l;fp=rpcgen_scan.l;h=4ab278d3e2bd3fda2f80f95e8527871b01414cec;hb=1b9cc11ece64ac12f63e6c96e32b404b32fb0f32;hp=061dbbfa8df680f0ba14f05959ac79f852ad9106;hpb=e9558f1dd242f2eb6a528c5509f1f8911fffe5d7;p=portablexdr.git diff --git a/rpcgen_scan.l b/rpcgen_scan.l index 061dbbf..4ab278d 100644 --- a/rpcgen_scan.l +++ b/rpcgen_scan.l @@ -29,7 +29,8 @@ HEXLIT "0x"[0-9a-fA-F]+ DECLIT 0|[1-9][0-9]* -INTLIT {HEXLIT}|{DECLIT} +OCTLIT 0[0-7]+ +INTLIT {HEXLIT}|{DECLIT}|{OCTLIT} IDENT [a-zA-Z_][a-zA-Z_0-9]* WS [[:space:]]+ @@ -51,7 +52,7 @@ WS [[:space:]]+ if (filename == NULL) perrorf ("malloc"); if (sscanf (yytext+2, "%d \"%[^\"]\"", &lineno, filename) == 2) { - yylineno = lineno - 1; + yylineno = lineno; free (input_filename); input_filename = filename; } @@ -136,6 +137,7 @@ hyper return HYPER; double return DOUBLE; string return STRING; opaque return OPAQUE; +bool return BOOL; void return VOID;