From 4eafcadda1a568192cd431f88bcb44f8a90d950f Mon Sep 17 00:00:00 2001 From: clifford Date: Sat, 9 Jan 2010 17:25:35 +0000 Subject: Clifford Wolf: Fixed operator bindings (oops) git-svn-id: http://svn.clifford.at/openscad/trunk@251 b57f626f-c46c-0410-a088-ec61d464b74c diff --git a/examples/example017.scad b/examples/example017.scad index 01cf491..1464128 100644 --- a/examples/example017.scad +++ b/examples/example017.scad @@ -91,7 +91,7 @@ module parts() shape_outer_disc(); for (s = [ [1,1], [-1,1], [1,-1] ]) - render() scale(s) translate([ tripod_x_off, -tripod_y_off ]) shape_tripod(); + scale(s) translate([ tripod_x_off, -tripod_y_off ]) shape_tripod(); } module exploded() @@ -139,6 +139,6 @@ module assembled() % translate([ 0, 0, thickness*2]) bottle(); } -// parts(); +parts(); // exploded(); -assembled(); +// assembled(); diff --git a/parser.y b/parser.y index f1c103c..c4cd3d4 100644 --- a/parser.y +++ b/parser.y @@ -71,14 +71,17 @@ public: %token LE GE EQ NE AND OR -%left '[' ']' +%left OR +%left AND + +%left '<' LE GE '>' +%left EQ NE + %left '!' '+' '-' %left '*' '/' '%' +%left '[' ']' %left '.' -%left '<' LE GE '>' -%left EQ NE -%left AND -%left OR + %right '?' ':' %type expr -- cgit v0.10.1