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

Merge pull request #1846 from openscad/lexer-typo

Browse source 
Fixed a long-standing typo in the lexer
This commit is contained in:
Marius Kintel 2016-11-06 15:52:08 -05:00 committed by GitHub
commit 962d924f6e
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lexer.l
View file

@ -123,7 +123,7 @@ UNICODE {U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U}
%%
include[ \t\r\n>]*"<" { BEGIN(cond_include); filepath = filename = ""; }
include[ \t\r\n]*"<" { BEGIN(cond_include); filepath = filename = ""; }
<cond_include>{
[^\t\r\n>]*"/" { filepath = yytext; }
[^\t\r\n>/]+ { filename = yytext; }
@ -131,7 +131,7 @@ include[ \t\r\n>]*"<" { BEGIN(cond_include); filepath = filename = ""; }
}
use[ \t\r\n>]*"<" { BEGIN(cond_use); }
use[ \t\r\n]*"<" { BEGIN(cond_use); }
<cond_use>{
[^\t\r\n>]+ { filename = yytext; }
">" {

3
testdata/scad/templates/include-tests-template.scad vendored
View file

@ -13,9 +13,6 @@ include <include-test5.scad>
//Test without preceding space
include<include-test5.scad>
//Test with other strange character that is allowed
include>>>>><include-test5.scad>
//Test that filenames with spaces work
include <include test6.scad>

3
testdata/scad/templates/use-tests-template.scad vendored
View file

@ -13,9 +13,6 @@ use <use-test5.scad>
//Test without preceding space
use<use-test5.scad>
//Test with other strange character that is allowed
use>>>>><use-test5.scad>
//Test that filenames with spaces work
use <use test6.scad>