Commit graph

6356 commits

Author SHA1 Message Date
Marius Kintel
56e7d346f1 Merge pull request #1856 from openscad/assign-echo-parser-fix
Fix parser issue with assert and echo by adding them as separate tokens
2016-11-06 18:13:02 -05:00
Marius Kintel
0237838cfb Bugfix: Columns and lineno wasn't correctly handled inside comments and strings. Fixes #1852 2016-11-06 18:07:59 -05:00
Marius Kintel
fb95128e5d Make travis less spammy on IRC 2016-11-06 16:36:04 -05:00
Marius Kintel
962d924f6e Merge pull request #1846 from openscad/lexer-typo
Fixed a long-standing typo in the lexer
2016-11-06 15:52:08 -05:00
Marius Kintel
fbbb5a3697 Merge pull request #1855 from openscad/el-capitan
Build tweaks to not depend on DYLD_LIBRARY_PATH during building
2016-11-06 12:32:52 -05:00
Marius Kintel
ac1629e213 Merge pull request #1842 from dmopalmer/mac-qt-patch
Successfully make QT5 fix for #1838
2016-11-05 15:22:59 -04:00
Marius Kintel
3774689a7a Merge pull request #1847 from openscad/qscintilla-xcode8
Patch to allow building QScintilla with Xcode 8
2016-11-05 15:08:14 -04:00
Marius Kintel
48a2ff63bf Fix parser issue with assert and echo by adding them as separate tokens 2016-11-05 14:57:47 -04:00
Marius Kintel
ba2c259f97 bugfix: Only print echo and assert expression if it exists 2016-11-05 14:56:50 -04:00
Marius Kintel
b1131d045b Updated expected test results 2016-11-05 14:50:27 -04:00
Marius Kintel
899429aba6 Updated expected test results 2016-11-05 14:44:14 -04:00
Marius Kintel
e5a368ab83 Build tweaks to not depend on DYLD_LIBRARY_PATH during building 2016-11-05 11:38:43 -04:00
Marius Kintel
752c6177c6 Fix: We no longer accept absolute library names 2016-11-05 11:32:55 -04:00
amarjeet
87aa36ab29 Stops parsing at first non-assignment basically '{' 2016-11-05 13:43:13 +05:30
Marius Kintel
3a417f3569 Patch to allow building QScintilla with Xcode 8 2016-10-30 15:11:46 -04:00
Marius Kintel
6b0a7dacd4 Fixed a long-standing typo in the lexer allowing a weird use/include syntax; include>>><file.scad> 2016-10-30 15:07:09 -04:00
Marius Kintel
9e4da33eee #1827 dumptest_assert-tests wasn't tagged as experimental 2016-10-30 00:57:19 -04:00
Marius Kintel
8fe9f51cf8 #1839 Added echo test 2016-10-29 23:17:05 -04:00
Marius Kintel
007b87d780 Merge pull request #1830 from openscad/echo-expression
Add echo() expression.
2016-10-29 23:15:44 -04:00
Marius Kintel
b3f3ed2701 Moved functional echo test to functions 2016-10-29 23:15:10 -04:00
Marius Kintel
fa94df5a0e Merge remote-tracking branch 'origin/master' into echo-expression 2016-10-29 23:09:55 -04:00
David M. Palmer
b26d7e8cfe Successfully make QT5 2016-10-29 20:05:10 -06:00
Marius Kintel
38f107f6d5 Merge remote-tracking branch 'origin/master' into gsoc2016-refactored 2016-10-29 18:50:57 -04:00
Marius Kintel
b2b9b708fc #1839 more assert() tests 2016-10-29 18:04:47 -04:00
Marius Kintel
87a532d704 #1839 Added let() test causing a crash 2016-10-29 17:55:23 -04:00
Marius Kintel
1ba0180b94 #1839 Added failing tests 2016-10-29 17:47:18 -04:00
Marius Kintel
84b0435a47 #1830 Updated tests to fit current implementation 2016-10-29 17:27:21 -04:00
Marius Kintel
37b0367e93 Merge pull request #1835 from openscad/travis
Travis-CI optimization tests
2016-10-29 17:14:49 -04:00
Marius Kintel
723eeadd0d Merge branch 'echo-expression' of github.com:openscad/openscad into echo-expression 2016-10-29 16:57:15 -04:00
Marius Kintel
9b16df9945 Merge remote-tracking branch 'origin/master' into echo-expression 2016-10-29 12:02:14 -04:00
Marius Kintel
ce3a6f75b6 forgot libzip 2016-10-29 12:00:15 -04:00
Torsten Paul
135ae47363 Print only parameters before evaluating the expression. 2016-10-29 17:42:44 +02:00
Marius Kintel
fa2ec3a49b Keep it simple 2016-10-29 00:22:46 -04:00
Marius Kintel
8609ebb5af output cosmetics 2016-10-29 00:11:32 -04:00
Torsten Paul
72acc2807b Show homebrew installation progress. 2016-10-29 00:00:38 -04:00
Marius Kintel
9c226831fc #1834 Added libzip to build script 2016-10-28 22:51:37 -04:00
Marius Kintel
52ec3d540f #1833 Don't try to dereference an intersection between two empty objects 2016-10-27 22:09:36 -04:00
Torsten Paul
c536c1ade1 Add echo() expression. 2016-10-27 21:27:56 +02:00
amarjeet
914053bd92 Show parameter file and parameter set options in usage 2016-10-27 04:53:00 +05:30
Marius Kintel
0c47b23c59 Merge pull request #836 from openscad/amf-import
AMF Import
2016-10-24 21:58:31 -04:00
Marius Kintel
ea893bd3df Merge remote-tracking branch 'origin/master' into gsoc2016-refactored 2016-10-23 23:10:13 -04:00
Marius Kintel
b7683c2b09 Improved error reporting 2016-10-23 22:56:01 -04:00
Marius Kintel
0388153f41 Added trivial AMF export/import test 2016-10-23 21:32:07 -04:00
Marius Kintel
3a9b12723f Merge remote-tracking branch 'origin/master' into amf-import 2016-10-23 21:27:44 -04:00
Marius Kintel
cfd46eaa3a #1822 - trivial export/import test for all bidirectionally supported file formats 2016-10-23 21:21:05 -04:00
Marius Kintel
b0f567ccd2 Merge branch 'master' of github.com:openscad/openscad 2016-10-23 20:36:19 -04:00
Marius Kintel
40e0db27d8 qscintilla 2.9.3 2016-10-23 20:36:11 -04:00
Marius Kintel
cc2f80c093 Merge pull request #1827 from openscad/assert-feature
Assert feature
2016-10-23 20:15:24 -04:00
Torsten Paul
9df3a9f198 Add test cases. 2016-10-23 02:17:01 +02:00
Torsten Paul
87adbd4363 Add assert() expression and statement. 2016-10-23 02:17:01 +02:00