diff options
-rw-r--r-- | examples/example017.scad | 6 | ||||
-rw-r--r-- | parser.y | 13 |
2 files changed, 11 insertions, 8 deletions
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(); @@ -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> expr |