From 196117c0da164c226e111cc72a6cc169634f91c5 Mon Sep 17 00:00:00 2001 From: GeonoTRON2000 Date: Fri, 2 May 2014 21:00:45 -0700 Subject: Fixed variable and array storage glitch, cleaned up array printing. --- .../src/org/archphantom/shenanigans/examples/AddIt.java | 9 ++------- .../src/org/archphantom/shenanigans/examples/Factorial.java | 9 ++------- .../src/org/archphantom/shenanigans/examples/FactorialZ.java | 9 ++------- .../src/org/archphantom/shenanigans/examples/ShiftIt.java | 11 +++++++---- 4 files changed, 13 insertions(+), 25 deletions(-) (limited to 'Shenanigans/src/org/archphantom/shenanigans/examples') diff --git a/Shenanigans/src/org/archphantom/shenanigans/examples/AddIt.java b/Shenanigans/src/org/archphantom/shenanigans/examples/AddIt.java index 158f9d4..d898bd4 100644 --- a/Shenanigans/src/org/archphantom/shenanigans/examples/AddIt.java +++ b/Shenanigans/src/org/archphantom/shenanigans/examples/AddIt.java @@ -8,9 +8,7 @@ import org.archphantom.shenanigans.elements.expressions.operations.Addition; import org.archphantom.shenanigans.elements.expressions.statements.Assignment; import org.archphantom.shenanigans.elements.expressions.statements.FunctionCall; import org.archphantom.shenanigans.elements.expressions.statements.Group; -import org.archphantom.shenanigans.elements.expressions.statements.Print; -import org.archphantom.shenanigans.elements.values.Array; -import org.archphantom.shenanigans.elements.values.CharValue; +import org.archphantom.shenanigans.elements.expressions.statements.PrintLn; import org.archphantom.shenanigans.elements.values.DecimalValue; import org.archphantom.shenanigans.elements.values.Function; import org.archphantom.shenanigans.elements.values.Namespace; @@ -24,10 +22,7 @@ public class AddIt { argnames.add("x"); argnames.add("y"); ArrayList addit_expr_body = new ArrayList(); - ArrayList to_print = new ArrayList(); - to_print.add(new Addition(new Variable("x"), new Variable("y"))); - to_print.add(new CharValue('\n')); - addit_expr_body.add(new Print(new Array(to_print))); + addit_expr_body.add(new PrintLn(new Addition(new Variable("x"), new Variable("y")))); Group addit_body = new Group(addit_expr_body); Function addit = new Function(argnames, addit_body); list.add(new Assignment("add_it", addit)); diff --git a/Shenanigans/src/org/archphantom/shenanigans/examples/Factorial.java b/Shenanigans/src/org/archphantom/shenanigans/examples/Factorial.java index 931438b..06bf9b4 100644 --- a/Shenanigans/src/org/archphantom/shenanigans/examples/Factorial.java +++ b/Shenanigans/src/org/archphantom/shenanigans/examples/Factorial.java @@ -11,9 +11,7 @@ import org.archphantom.shenanigans.elements.expressions.statements.Assignment; import org.archphantom.shenanigans.elements.expressions.statements.FunctionCall; import org.archphantom.shenanigans.elements.expressions.statements.Group; import org.archphantom.shenanigans.elements.expressions.statements.IfElse; -import org.archphantom.shenanigans.elements.expressions.statements.Print; -import org.archphantom.shenanigans.elements.values.Array; -import org.archphantom.shenanigans.elements.values.CharValue; +import org.archphantom.shenanigans.elements.expressions.statements.PrintLn; import org.archphantom.shenanigans.elements.values.Function; import org.archphantom.shenanigans.elements.values.IntValue; import org.archphantom.shenanigans.elements.values.Namespace; @@ -34,10 +32,7 @@ public class Factorial { list.add(new Assignment("factorial", factorial)); ArrayList arguments = new ArrayList(); arguments.add(new IntValue("10")); - ArrayList to_print = new ArrayList(); - to_print.add(new FunctionCall("factorial", arguments)); - to_print.add(new CharValue('\n')); - list.add(new Print(new Array(to_print))); + list.add(new PrintLn(new FunctionCall("factorial", arguments))); Group group = new Group(list); Namespace main = new Namespace("main", group, new VarTable()); Hashtable namespaces = new Hashtable(); diff --git a/Shenanigans/src/org/archphantom/shenanigans/examples/FactorialZ.java b/Shenanigans/src/org/archphantom/shenanigans/examples/FactorialZ.java index 158bfc0..f6ae70a 100644 --- a/Shenanigans/src/org/archphantom/shenanigans/examples/FactorialZ.java +++ b/Shenanigans/src/org/archphantom/shenanigans/examples/FactorialZ.java @@ -10,10 +10,8 @@ import org.archphantom.shenanigans.elements.expressions.operations.Subtraction; import org.archphantom.shenanigans.elements.expressions.statements.Assignment; import org.archphantom.shenanigans.elements.expressions.statements.FunctionCall; import org.archphantom.shenanigans.elements.expressions.statements.Group; -import org.archphantom.shenanigans.elements.expressions.statements.Print; +import org.archphantom.shenanigans.elements.expressions.statements.PrintLn; import org.archphantom.shenanigans.elements.expressions.statements.WhileLoop; -import org.archphantom.shenanigans.elements.values.Array; -import org.archphantom.shenanigans.elements.values.CharValue; import org.archphantom.shenanigans.elements.values.Function; import org.archphantom.shenanigans.elements.values.IntValue; import org.archphantom.shenanigans.elements.values.Namespace; @@ -37,10 +35,7 @@ public class FactorialZ { list.add(new Assignment("factorialz", factorialz)); ArrayList arguments = new ArrayList(); arguments.add(new IntValue("10")); - ArrayList to_print = new ArrayList(); - to_print.add(new FunctionCall("factorialz", arguments)); - to_print.add(new CharValue('\n')); - list.add(new Print(new Array(to_print))); + list.add(new PrintLn(new FunctionCall("factorialz", arguments))); Group group = new Group(list); Namespace main = new Namespace("main", group, new VarTable()); Hashtable namespaces = new Hashtable(); diff --git a/Shenanigans/src/org/archphantom/shenanigans/examples/ShiftIt.java b/Shenanigans/src/org/archphantom/shenanigans/examples/ShiftIt.java index 71c9e98..1d56397 100644 --- a/Shenanigans/src/org/archphantom/shenanigans/examples/ShiftIt.java +++ b/Shenanigans/src/org/archphantom/shenanigans/examples/ShiftIt.java @@ -14,12 +14,13 @@ import org.archphantom.shenanigans.elements.expressions.statements.Assignment; import org.archphantom.shenanigans.elements.expressions.statements.ForLoop; import org.archphantom.shenanigans.elements.expressions.statements.FunctionCall; import org.archphantom.shenanigans.elements.expressions.statements.Group; -import org.archphantom.shenanigans.elements.expressions.statements.Print; +import org.archphantom.shenanigans.elements.expressions.statements.PrintLn; import org.archphantom.shenanigans.elements.values.Array; import org.archphantom.shenanigans.elements.values.CharValue; import org.archphantom.shenanigans.elements.values.Function; import org.archphantom.shenanigans.elements.values.IntValue; import org.archphantom.shenanigans.elements.values.Namespace; +import org.archphantom.shenanigans.elements.values.Value; import org.archphantom.shenanigans.elements.variables.VarTable; public class ShiftIt { @@ -29,13 +30,15 @@ public class ShiftIt { ArrayList argnames = new ArrayList(); argnames.add("a"); ArrayList shiftit_expr_body = new ArrayList(3); - shiftit_expr_body.add(new ForLoop(new Assignment("l", new IntValue("0")), new BoolLess(new Variable("l"), new Subtraction(new Count(new Variable("a")), new IntValue("1"))), new Assignment("l", new Addition(new Variable("l"), new IntValue("1"))), new ArrayAssignment("a", new Variable("l"), new Addition(new ArrayVariable("a", new Variable("l")), new IntValue("1"))))); + shiftit_expr_body.add(new Assignment("tmp", new ArrayVariable("a", new IntValue("0")))); + shiftit_expr_body.add(new ForLoop(new Assignment("l", new IntValue("0")), new BoolLess(new Variable("l"), new Subtraction(new Count(new Variable("a")), new IntValue("1"))), new Assignment("l", new Addition(new Variable("l"), new IntValue("1"))), new ArrayAssignment("a", new Variable("l"), new ArrayVariable("a", new Addition(new Variable("l"), new IntValue("1")))))); + shiftit_expr_body.add(new ArrayAssignment("a", new Subtraction(new Count(new Variable("a")), new IntValue("1")), new Variable("tmp"))); shiftit_expr_body.add(new Variable("a")); Group shiftit_body = new Group(shiftit_expr_body); Function shiftit = new Function(argnames, shiftit_body); list.add(new Assignment("shiftit", shiftit)); ArrayList arguments = new ArrayList(1); - ArrayList elements = new ArrayList(4); + ArrayList elements = new ArrayList(4); elements.add(new IntValue("3")); elements.add(new IntValue("6")); elements.add(new IntValue("9")); @@ -44,7 +47,7 @@ public class ShiftIt { ArrayList to_print = new ArrayList(2); to_print.add(new FunctionCall("shiftit", arguments)); to_print.add(new CharValue('\n')); - list.add(new Print(new Array(to_print))); + list.add(new PrintLn(new FunctionCall("shiftit", arguments))); Group group = new Group(list); Namespace main = new Namespace("main", group, new VarTable()); Hashtable namespaces = new Hashtable(); -- cgit v1.2.3