Fix: digit separator not followed by digit in fixed-point literal

positively-charged · Jan 31, 2017 · 00fb0cc · 00fb0cc
1 parent e1700a0
commit 00fb0cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/doc/grammar.txt b/doc/grammar.txt
@@ -796,22 +796,22 @@ number:
    <radix-number>
 
 binary-number:
-   0[bB][0-1]+([_]+[0-1]+)*
+   0[bB][0-1]+([_]?[0-1]+)*
 
 octal-number:
-   0[oO][0-7]+([_]+[0-7]+)*
+   0[oO][0-7]+([_]?[0-7]+)*
 
 decimal-number:
-   [0-9]+([_]+[0-9]+)*
+   [0-9]+([_]?[0-9]+)*
 
 hexadecimal-number:
-   0[xX][0-9a-fA-F]+([_]+[0-9a-fA-F]+)*
+   0[xX][0-9a-fA-F]+([_]?[0-9a-fA-F]+)*
 
 fixed-point-number:
-   [0-9]+([_]+[0-9]+)*[.][0-9]+([_]+[0-9]+)*
+   [0-9]+([_]?[0-9]+)*[.][0-9]+([_]?[0-9]+)*
 
 radix-number:
-   [0-9]+([_]+[0-9]+)*[rR][0-9a-zA-Z]+([_]+[0-9a-zA-Z]+)*
+   [0-9]+([_]?[0-9]+)*[rR][0-9a-zA-Z]+([_]?[0-9a-zA-Z]+)*
 
 string:
    "([^\\"]|\\")*"

diff --git a/src/parse/token/source.c b/src/parse/token/source.c
@@ -2335,6 +2335,14 @@ void read_token( struct parse* parse, struct token* token ) {
       }
       else if ( ch == '_' ) {
          ch = read_ch( parse );
+         if ( ! isdigit( ch ) ) {
+            struct pos pos;
+            t_init_pos( &pos, parse->source->file_entry_id,
+               parse->source->line, parse->source->column );
+            p_diag( parse, DIAG_POS_ERR, &pos,
+               "missing decimal digit after digit separator" );
+            p_bail( parse );
+         }
       }
       else if ( isalpha( ch ) ) {
          struct pos pos = { parse->source->line, parse->source->column,