Refactor XEngine parser as per suggestions from mikem

1 files changed, 14 insertions, 14 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index fefcada..4e2766c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -124,7 +124,7 @@ state another_state
             string expected =
                 "\n        public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
                 "\n        {" +
-                "\n            LSL_Types.LSLInteger x = 0;" +
+                "\n            LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(0);" +
                 "\n        }\n";
 
             CSCodeGenerator cg = new CSCodeGenerator();
@@ -148,7 +148,7 @@ state another_state
             string expected =
                 "\n        public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
                 "\n        {" +
-                "\n            LSL_Types.LSLString y = \"\";" +
+                "\n            LSL_Types.LSLString y = new LSL_Types.LSLString(\"\");" +
                 "\n            LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(14);" +
                 "\n            y = new LSL_Types.LSLString(\"Hello\");" +
                 "\n        }\n";
@@ -235,7 +235,7 @@ state another_state
             string expected =
                 "\n        public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
                 "\n        {" +
-                "\n            LSL_Types.LSLInteger y = 0;" +
+                "\n            LSL_Types.LSLInteger y = new LSL_Types.LSLInteger(0);" +
                 "\n            LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(14) + new LSL_Types.LSLInteger(6);" +
                 "\n            y = new LSL_Types.LSLInteger(12) - new LSL_Types.LSLInteger(3);" +
                 "\n            y = new LSL_Types.LSLInteger(12) * new LSL_Types.LSLInteger(3);" +
@@ -440,7 +440,7 @@ default
 }
 ";
             string expected =
-                "\n        LSL_Types.LSLString globalString = \"\";" +
+                "\n        LSL_Types.LSLString globalString = new LSL_Types.LSLString(\"\");" +
                 "\n        LSL_Types.LSLInteger globalInt = new LSL_Types.LSLInteger(14);" +
                 "\n        LSL_Types.LSLInteger anotherGlobal = new LSL_Types.LSLInteger(20) * globalInt;" +
                 "\n        LSL_Types.LSLString onefunc()" +
@@ -495,7 +495,7 @@ default
 }
 ";
             string expected =
-                "\n        LSL_Types.LSLString globalString = \"\";" +
+                "\n        LSL_Types.LSLString globalString = new LSL_Types.LSLString(\"\");" +
                 "\n        LSL_Types.LSLInteger globalInt = new LSL_Types.LSLInteger(14);" +
                 "\n        LSL_Types.LSLString onefunc(LSL_Types.LSLString addition)" +
                 "\n        {" +
@@ -1251,19 +1251,19 @@ default
             string expected =
                 "\n        public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
                 "\n        {" +
-                "\n            LSL_Types.LSLInteger i = 0;" +
+                "\n            LSL_Types.LSLInteger i = new LSL_Types.LSLInteger(0);" +
                 "\n            LSL_Types.LSLInteger j = new LSL_Types.LSLInteger(14);" +
-                "\n            LSL_Types.LSLFloat f = 0.0;" +
+                "\n            LSL_Types.LSLFloat f = new LSL_Types.LSLFloat(0.0);" +
                 "\n            LSL_Types.LSLFloat g = new LSL_Types.LSLFloat(14.0);" +
-                "\n            LSL_Types.LSLString s = \"\";" +
+                "\n            LSL_Types.LSLString s = new LSL_Types.LSLString(\"\");" +
                 "\n            LSL_Types.LSLString t = new LSL_Types.LSLString(\"Hi there\");" +
                 "\n            LSL_Types.list l = new LSL_Types.list();" +
                 "\n            LSL_Types.list m = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger(2), new LSL_Types.LSLInteger(3));" +
-                "\n            LSL_Types.Vector3 v = new LSL_Types.Vector3(0.0, 0.0, 0.0);" +
+                "\n            LSL_Types.Vector3 v = new LSL_Types.Vector3(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
                 "\n            LSL_Types.Vector3 w = new LSL_Types.Vector3(new LSL_Types.LSLFloat(1.0), new LSL_Types.LSLFloat(0.1), new LSL_Types.LSLFloat(0.5));" +
-                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(0.0, 0.0, 0.0, 0.0);" +
+                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
                 "\n            LSL_Types.Quaternion u = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.8), new LSL_Types.LSLFloat(0.7), new LSL_Types.LSLFloat(0.6), llSomeFunc());" +
-                "\n            LSL_Types.LSLString k = \"\";" +
+                "\n            LSL_Types.LSLString k = new LSL_Types.LSLString(\"\");" +
                 "\n            LSL_Types.LSLString n = new LSL_Types.LSLString(\"ping\");" +
                 "\n        }\n";
 
@@ -1292,8 +1292,8 @@ default
             string expected =
                 "\n        public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" +
                 "\n        {" +
-                "\n            LSL_Types.LSLInteger x = 0;" +
-                "\n            LSL_Types.LSLInteger y = 0;" +
+                "\n            LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(0);" +
+                "\n            LSL_Types.LSLInteger y = new LSL_Types.LSLInteger(0);" +
                 "\n            x = y = new LSL_Types.LSLInteger(5);" +
                 "\n            x += y -= new LSL_Types.LSLInteger(5);" +
                 "\n            llOwnerSay(new LSL_Types.LSLString(\"x is: \") + (LSL_Types.LSLString) (x) + new LSL_Types.LSLString(\", y is: \") + (LSL_Types.LSLString) (y));" +
@@ -1504,7 +1504,7 @@ default
             string expected =
                 "\n        public void default_event_state_entry()" +
                 "\n        {" +
-                "\n            LSL_Types.LSLInteger x = 0;" +
+                "\n            LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(0);" +
                 "\n            while (x = new LSL_Types.LSLInteger(14))" +
                 "\n                llOwnerSay(new LSL_Types.LSLString(\"x is: \") + (LSL_Types.LSLString) (x));" +
                 "\n            if (x = new LSL_Types.LSLInteger(24))" +