Commit Graph

30 Commits (d4af7fb04e7ce0ec9656aebbb7d3b2933dbc8bf2)

Author SHA1 Message Date
Marius Kintel fdce8d15fc Merge branch 'master' into boost_filesystem
Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt
2012-01-04 23:07:32 +01:00
Marius Kintel ba8aa515d1 Disabled the old include syntax; i.e. without the include keyword 2012-01-04 19:03:33 +01:00
Marius Kintel bafbc89aa0 Ported lexer code from QFile to boost filesystem 2011-12-24 23:08:38 +01:00
Marius Kintel 0ab51d2d23 Extracted librarydir initialization to separate function 2011-12-24 22:02:37 +01:00
Marius Kintel 4251775d3b bugfix: Make include also search librarydir 2011-12-12 21:53:21 +01:00
Marius Kintel 04bc3ed890 Added support for parsing numbers in scientific notation, e.g. to allow roundtripping of written csg files as well as parsing of externally generated scad files 2011-11-05 16:22:48 +01:00
Marius Kintel e6ec07a08d bugfix: filenames with spaces caused a syntax error with the use keyword (fixes #31) 2011-10-31 21:36:55 +01:00
Don Bright 5f58255bcf integrate Brad Pitcher's cross compile linux->win32-mingw qmake stuff 2011-10-25 19:10:28 -05:00
Marius Kintel b087e68e54 Don't leave files open on parse errors 2011-09-11 01:53:25 +02:00
Marius Kintel 821c7df1fe Extracted handle_dep() to separate source file 2011-09-04 00:03:16 +02:00
Marius Kintel 2af5648eda Merge branch 'master' into visitor
Conflicts:
	src/OpenCSGRenderer.cc
	src/csgops.cc
	src/mainwin.cc
	src/polyset.cc
	src/projection.cc
2011-08-04 04:02:42 +02:00
don bright 8937beb0d5 prevent linker error LNK1120 in windows 2011-07-20 21:06:18 -05:00
Marius Kintel f90e60fadb Bugfix: Include of absolute paths to files in the root path weren't parsed correctly; caused a '/' character to be written to stdout 2011-04-30 11:12:06 -04:00
meta 4ac3af2f92 compile fixes for parser and lexer under MSVC 2011-01-24 23:58:19 +01:00
Marius Kintel 91c640fb5e Copyright updates 2011-01-21 02:21:09 +01:00
Giles Bathgate 052f8bc620 Fix for when the included file doesn't exist. Needed because we will never get an EOF, and so never pop the stack. 2010-12-11 12:41:23 +00:00
Giles Bathgate d98e398ec1 Removed some unneeded cruft. 2010-12-09 12:18:24 +00:00
Giles Bathgate 5ef31011f3 Added support for nested includes. 2010-12-03 17:43:00 +00:00
Giles Bathgate ff249dfefb Improvement to lexing of strings don't use QString.replace, use the power of flex instead. 2010-11-30 20:44:05 +00:00
Giles Bathgate e2ae2a714d This adds support for escape sequences in strings e.g \t \n \r \" \\ 2010-11-17 21:27:10 +00:00
kintel 7f0551e538 TOK_NUMBER lexer improvement by Steven Dick
git-svn-id: http://svn.clifford.at/openscad/trunk@579 b57f626f-c46c-0410-a088-ec61d464b74c
2010-11-02 14:17:03 +00:00
kintel ae97a22883 Tag deprecation as such
git-svn-id: http://svn.clifford.at/openscad/trunk@578 b57f626f-c46c-0410-a088-ec61d464b74c
2010-11-02 11:13:44 +00:00
clifford 496d236903 Clifford Wolf:
Some fixes regarding 'use <filename>'



git-svn-id: http://svn.clifford.at/openscad/trunk@460 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-28 13:59:43 +00:00
clifford d3329838b4 Clifford Wolf:
Implemented 'use' statement



git-svn-id: http://svn.clifford.at/openscad/trunk@459 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-28 13:48:04 +00:00
clifford 955de4aa1b Clifford Wolf:
Added include<...> statement
	Prepared use<...> statement



git-svn-id: http://svn.clifford.at/openscad/trunk@457 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-27 22:30:36 +00:00
kintel 5726317461 Support for if-else statements
git-svn-id: http://svn.clifford.at/openscad/trunk@436 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-12 13:20:15 +00:00
kintel b1fc6c2d6d Look for includes in <openscaddir>/libraries/
git-svn-id: http://svn.clifford.at/openscad/trunk@414 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-03 04:15:34 +00:00
clifford 07bc7dbecd Clifford Wolf:
Added CGAL exception to all copyright notes, as it is suggested on:
	http://www.cgal.org/license.html
	http://www.fsf.org/licensing/licenses/index_html



git-svn-id: http://svn.clifford.at/openscad/trunk@405 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-01 09:34:18 +00:00
kintel 76f0b1119f bugfix: In MDI mode, the parser must know which file it compiles, not just the contents, for inluded files to be found. Made the parser Qt-dependant - oh well...
git-svn-id: http://svn.clifford.at/openscad/trunk@395 b57f626f-c46c-0410-a088-ec61d464b74c
2010-02-01 03:11:29 +00:00
kintel 191dc4857c header file reorg
git-svn-id: http://svn.clifford.at/openscad/trunk@365 b57f626f-c46c-0410-a088-ec61d464b74c
2010-01-30 04:26:05 +00:00