Release 1.0.12

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

diff --git a/src/lexer.l b/src/lexer.l
index 95cbf52c0fd83b61bf479d9e44fb8cb69796d99c..37ec65a0ce0aac6b230d5c87cc605b456d7f9859 100644 (file)
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -23,6 +23,7 @@
 #include "config.h"
 #include <glib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "treefuncs.h"
 #include "parse.h"
@@ -46,6 +47,8 @@ GList *include_files = NULL;
 static int look_for_includes = 0;
 
 int line_no = 1;
+/* last filename parsed from a #line directive */
+char *hline_filename = NULL;
 
 static void
 clear_cbuf(void)
@@ -126,6 +129,44 @@ REJECT;
 }
 
 \/\/.*$                        { ; /*comment, ignore*/ }
+
+<*>^#[ \t]*line[ \t]+[0-9]+([ \t]\"[^\n\r\f\"]*\")? {
+       char *p;
+       char *number;
+       char *filename;
+       char *str=g_strdup(yytext);
+
+       /* find first digit of line number */
+       p=str;
+       while(*p&&!isdigit(*p)) p++;
+       number=p;
+  
+       /* find end of line number */
+       while(*p&&isdigit(*p)) p++;
+       if(*p) *p++=0;
+
+       /* find beginning of filename */
+       p=strchr(p,'"');
+       if(p) p++;
+       filename=p;
+
+       /* find end of filename */
+       if(p) p=strchr(p,'"');
+       if(p) *p=0;
+
+       /* stash number (minus one because we don't count this line) */  
+       if(number) line_no=atoi(number)-1;
+
+       /* stash filename */
+       if(filename) {
+               if(hline_filename) g_free(hline_filename);
+               hline_filename=g_strdup(filename);
+       }
+  
+       /* clean up */
+       g_free(str);
+}
+
 <C_CODE>^#[ \t]*include[ \t][<"][^\n">]*[>"] {
        if(look_for_includes==1) {
                char *p;
@@ -459,7 +500,7 @@ class               {
                                return '}';
                        }
 
-<CLASS_CODE,CLASS_CODE_I,INITIAL>[\t ] ;  /*ignore*/
+<CLASS_CODE,CLASS_CODE_I,INITIAL>[\f\t ]       ;  /*ignore*/
 
 <*>.           {
                        yylval.line = line_no;