jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'ast-refactor'

Browse source
This commit is contained in:
Marius Kintel 2016-06-24 12:10:22 -04:00
commit ae11be80d5
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/AST.h
View file

@ -26,7 +26,7 @@ public:
ASTNode(const Location &loc) : loc(loc) {}
virtual ~ASTNode() {}
Location location() const { return loc; }
const Location &location() const { return loc; }
protected:
Location loc;

18
src/lexer.l
View file

@ -77,6 +77,21 @@ extern FileModule *rootmodule;
} \
}
/*
Handle locations.
Note: Since flex doesn't handle column numbers, we deal with those manually.
The yycolumn is manually reset for each encountered newline.
*/
extern YYLTYPE parserlloc;
int yycolumn = 1;
#define YY_USER_ACTION { \
parserlloc.first_line = yylineno; \
parserlloc.first_column = yycolumn; \
yycolumn = yycolumn + yyleng; \
parserlloc.last_column = yycolumn; \
parserlloc.last_line = yylineno; \
}
void to_utf8(const char *, char *);
void includefile();
fs::path sourcefile();
@ -199,7 +214,8 @@ use[ \t\r\n>]*"<" { BEGIN(cond_use); }
return TOK_STRING; }
}
[\n\r\t ]
[\t ] /* whitespace */
[\n\r] { yycolumn = 1; }
\/\/ BEGIN(cond_lcomment);
<cond_lcomment>{