- Made scanner error out in case an ambiguous /* is found.

diff --git a/CHANGELOG b/CHANGELOG
index e35248765b3c543fc39422fad3972ba9566b287f..9c4927f8803f19239a700770d4c6dd045b115b80 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 Version 0.10.0 (????-??-??)
 ---------------------------
+- Made scanner error out in case an ambiguous /* is found.
 - Fixed indendation of generated code.
 - Added support for DOS line endings.
 - Added experimental unicode support.
@@ -19,7 +20,7 @@ Version 0.9.11 (2005-12-18)
 
 Version 0.9.10 (2005-09-04)
 ---------------------------
-- Add -i switch to avoid generating #line information.
+- Added -i switch to avoid generating #line information.
 - Fixed bug #1251653 re2c generate some invalid #line on WIN32.
 
 Version 0.9.9 (2005-07-21)

diff --git a/scanner.re b/scanner.re
index 19ddd45166a9fd3b9746c0a99e3d0c4ad0dc9727..3b3bfb1937f5b3934ecddbfb8f53f8b22a7e3046 100644 (file)
--- a/scanner.re
+++ b/scanner.re
@@ -133,7 +133,8 @@ echo:
 }
 
 
-int Scanner::scan(){
+int Scanner::scan()
+{
     char *cursor = cur;
     uint depth;
 
@@ -252,7 +253,8 @@ comment:
                                    else
                                        goto comment; }
        "/*"                    { ++depth;
-                                 goto comment; }
+                                       fatal("ambiguous /* found");
+                                       goto comment; }
        "\n"                    { if(cursor == eof) RETURN(0);
                                  tok = pos = cursor; cline++;
                                  goto comment;