X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tools%2Fminiswig%2Flexer.ll;h=954138b07fed3e9510061edefcd091c9a3a3e62f;hb=1f5ff04e5283398473b4ac033258b17af0ed08f0;hp=8a2e9a69cf8eb0d6405e30f3972a59579ad95997;hpb=1f0faf6a86dbece62970f10bc4aa9c297097c476;p=supertux.git

diff --git a/tools/miniswig/lexer.ll b/tools/miniswig/lexer.ll
index 8a2e9a69c..954138b07 100644
--- a/tools/miniswig/lexer.ll
+++ b/tools/miniswig/lexer.ll
@@ -1,12 +1,19 @@
 %{
+#include <config.h>
+  
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
-#include "tree.h"
+#include "tree.hpp"
 #include "parser.hpp"
-#include "globals.h"
+#include "globals.hpp"
 
+// there seems to be a bug in flex that adds some ECHO directives
+// in some rules, we don't need debug output
+#define ECHO  {}
+
+#define YY_NEVER_INTERACTIVE 1
 #define YY_DECL int yylex(YYSTYPE* yylval)
 
 #define YY_INPUT(buf, result, max_size)                     \
@@ -18,6 +25,7 @@
 std::string last_docucomment;
 std::string original_file;
 std::string current_file;
+std::string comm;
 int offset_lnum;
 
 int getCurrentLine()
@@ -31,6 +39,7 @@ int getCurrentLine()
 %option yylineno
 /* %option never-interactive */
 
+%x comment
 %%
 
 #[ \t]+[0-9]+[ \t]+.*                         {
@@ -47,9 +56,24 @@ int getCurrentLine()
 }
 #.*                                     /* ignore preprocessor directives */
 [[:space:]]+                            /* eat spaces */
-\/\*.*\*\/                              {
-    if(yytext[2] == '*' && yytext[3] != '/') { // It's a docu comment...
-        last_docucomment = std::string(yytext+3, strlen(yytext)-5);
+"/*"                                    { BEGIN(comment); comm = ""; }
+<comment>[^*\n]*                        { comm += yytext; }
+<comment>"*"+[^*/]*                     { comm += yytext; }
+<comment>"*/"                    {
+    BEGIN(INITIAL);
+    if(comm[0] == '*') { // It's a docu comment...
+        last_docucomment = "";
+        bool linestart = true;
+        for(size_t i = 1; i < comm.size(); ++i) {
+            if(linestart && (comm[i] == '*' || isspace(comm[i]))) {
+                continue;
+            } else if(comm[i] == '\n') {
+                linestart = true;
+            } else {
+                linestart = false;
+            }
+            last_docucomment += comm[i];
+        }
     }
 }
 \/\/[^\n]*\n                            {
@@ -60,7 +84,7 @@ int getCurrentLine()
 class                                   { return T_CLASS; }
 struct                                  { return T_STRUCT; }
 static                                  { return T_STATIC; }
-virtual                                 { return T_VIRTUAL; }
+virtual                                 { }
 const                                   { return T_CONST; }
 unsigned                                { return T_UNSIGNED; }
 signed                                  { return T_SIGNED; }
@@ -76,14 +100,17 @@ public                                  { return T_PUBLIC; }
 protected                               { return T_PROTECTED; }
 private                                 { return T_PRIVATE; }
 namespace                               { return T_NAMESPACE; }
+__suspend                               { return T_SUSPEND; }
+__custom                                { return T_CUSTOM; }
 [a-zA-Z_][a-zA-Z_0-9]*                  {
         Namespace* ns = search_namespace;
         if(ns == 0)
             ns = current_namespace;          
         // is it a type?
         yylval->atomic_type = ns->_findType(yytext, search_down);
-        if(yylval->atomic_type)
+        if(yylval->atomic_type) {
             return T_ATOMIC_TYPE;
+        }
         // or a namespace? (hack for now...)
         yylval->_namespace = ns->_findNamespace(yytext, search_down);
         if(yylval->_namespace) {
@@ -94,18 +121,18 @@ namespace                               { return T_NAMESPACE; }
         return T_ID;
 }
 \:\:                                    { return T_DDCOL; }
-[0-9]+                                  { 
-                                            yylval->ival = atoi(yytext);
-                                            return T_INT;
-                                        }
-[0-9]*\.[0-9]+(e[0-9]+)?                { 
-                                            yylval->fval = atof(yytext);
-                                            return T_FLOAT;
-                                        }
-\".*\"                                  {
-                                            yylval->str = strdup(yytext);
-                                            return T_STRING;
-                                        }
+(0x)?[0-9]+ {
+        sscanf(yytext, "%i", &(yylval->ival));
+        return T_INT;
+}
+[0-9]*\.[0-9]+(e[0-9]+)? { 
+        sscanf(yytext, "%f", &(yylval->fval));
+        return T_FLOAT;
+}
+\".*\" {
+        yylval->str = strdup(yytext);
+        return T_STRING;
+}
 .                                       { return yytext[0]; }
 
 %%