Modified parse to allow overloading of variables in local blocks. Als…

…o did some minor cleanups while at it. Test cases missing

bison.pri

@@ -1,4 +1,4 @@
-win32 {
+{
   bison.name = Bison ${QMAKE_FILE_IN}
   bison.input = BISONSOURCES
   bison.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}_yacc.cpp

flex.pri

@@ -1,4 +1,4 @@
-win32 {
+{
   flex.name = Flex ${QMAKE_FILE_IN}
   flex.input = FLEXSOURCES
   flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp

openscad.pro

@@ -171,13 +171,8 @@ CONFIG(mingw-cross-env) {
   include(mingw-cross-env.pri)
 }
 
-win32 {
-  FLEXSOURCES = src/lexer.l
-  BISONSOURCES = src/parser.y
-} else {
-  LEXSOURCES += src/lexer.l
-  YACCSOURCES += src/parser.y
-}
+FLEXSOURCES = src/lexer.l
+BISONSOURCES = src/parser.y
 
 RESOURCES = openscad.qrc
 

src/expr.cc

@@ -38,6 +38,20 @@ Expression::Expression()
 {
 }
 
+Expression::Expression(const std::string &type, 
+											 Expression *left, Expression *right)
+	: type(type)
+{
+	this->children.push_back(left);
+	this->children.push_back(right);
+}
+
+Expression::Expression(const std::string &type, Expression *expr)
+	: type(type)
+{
+	this->children.push_back(expr);
+}
+
 Expression::Expression(const Value &val) : const_value(val), type("C")
 {
 }

src/expression.h

@@ -34,6 +34,8 @@ class Expression
 
 	Expression();
 	Expression(const Value &val);
+	Expression(const std::string &type, Expression *left, Expression *right);
+	Expression(const std::string &type, Expression *expr);
 	~Expression();
 
 	Value evaluate(const class Context *context) const;

src/localscope.cc

@@ -19,6 +19,12 @@ LocalScope::~LocalScope()
 	BOOST_FOREACH (AbstractModuleContainer::value_type &m, modules) delete m.second;
 }
 
+void LocalScope::addChild(ModuleInstantiation *ch) 
+{
+	assert(ch != NULL);
+	this->children.push_back(ch); 
+}
+
 std::string LocalScope::dump(const std::string &indent) const
 {
 	std::stringstream dump;

src/localscope.h

@@ -13,6 +13,7 @@ class LocalScope
 	size_t numElements() const { return assignments.size() + children.size(); }
 	std::string dump(const std::string &indent) const;
 	std::vector<class AbstractNode*> instantiateChildren(const class Context *evalctx, class FileContext *filectx = NULL) const;
+	void addChild(ModuleInstantiation *ch);
 
 	AssignmentList assignments;
   ModuleInstantiationList children;

src/module.cc

@@ -132,11 +132,6 @@ Module::~Module()
 {
 }
 
-void Module::addChild(ModuleInstantiation *ch) 
-{
-	this->scope.children.push_back(ch); 
-}
-
 AbstractNode *Module::instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx) const
 {
 	ModuleContext c(ctx, evalctx);

src/module.h

@@ -68,8 +68,6 @@ class Module : public AbstractModule
 	virtual AbstractNode *instantiate(const Context *ctx, const ModuleInstantiation *inst, const EvalContext *evalctx = NULL) const;
 	virtual std::string dump(const std::string &indent, const std::string &name) const;
 
-	void addChild(ModuleInstantiation *ch);
-
 	AssignmentList definition_arguments;
 
 	LocalScope scope;