Release 2.0.4

[gob-dx.git] / src / lexer.l

diff --git a/src/lexer.l b/src/lexer.l
index aa9b6d28d3bde86b015f1f593699ba70cc68716e..e70d3a2fd1adcd16b116e7a3f22be18ec3221589 100644 (file)
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -230,7 +230,7 @@ REJECT;
                        BEGIN(CLASS_CODE_I);
                        add_gtk_doc_func();
                }
-<GTK_DOC>^[ \t]*\*\    {
+<GTK_DOC>^[ \t]*\*[ \t]        {
                        fflush(stdout);
                        add_to_cbuf(" * ");
                        BEGIN(GTK_DOC_LINE);
@@ -532,6 +532,15 @@ flags              { return FLAGS; }
                        yylval.id = g_strdup(yytext);
                        return NUMBER;
                }
+<CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(::[A-Za-z0-9_]*)+        {
+                       /* This is cpp kind of token thingie */
+                       if (for_cpp) {
+                               yylval.id = g_strdup(yytext);
+                               return TOKEN;
+                       } else {
+                               REJECT;
+                       }
+               }
 <CLASS_CODE,CLASS_CODE_I,PROPERTY_CODE,PROPERTY_CODE_I,INITIAL>[A-Za-z_][A-Za-z0-9_]*(:[A-Za-z0-9_]*)+ {
                        /* this one is for a classname with a namespace */
                        yylval.id = g_strdup(yytext);