Compiler updates... coming along slowly though...

Stevie-O · Dec 3, 2012 · dcff8df · dcff8df
1 parent b5c0be0
commit dcff8df
Show file tree

Hide file tree

Showing 5 changed files with 460 additions and 36 deletions.
diff --git a/SharpLua.NewCompilerTests/Program.cs b/SharpLua.NewCompilerTests/Program.cs
@@ -8,6 +8,7 @@
  */
 using System;
 using System.IO;
+using System.Text;
 using SharpLua.Ast;
 using SharpLua.LASM;
 
@@ -30,7 +31,10 @@ public static void Main(string[] args)
                     Console.WriteLine("compiled!");
                     FileStream fs = File.Open("out.sluac", FileMode.Create);
                     foreach (char ch in proto.Compile())
+                    {
+                        //Console.WriteLine(ch + " " + (int)ch);
                         fs.WriteByte((byte)ch);
+                    }
                     fs.Close();
                     Console.WriteLine("written to out.sluac!");
                 }

diff --git a/SharpLua/NewParser/Ast/BinaryOperator.cs b/SharpLua/NewParser/Ast/BinaryOperator.cs
@@ -32,4 +32,15 @@ public enum BinaryOperator
 
         NONE = -1,
     }
+
+    public enum UnaryOperator
+    {
+        Not, // !, not
+        Length, // #
+        BitNot, // ~
+        Negate, // -
+        UnNegate, // +
+
+        NONE = -1,
+    }
 }
diff --git a/SharpLua/NewParser/Ast/Expression/UnOpExpr.cs b/SharpLua/NewParser/Ast/Expression/UnOpExpr.cs
@@ -9,5 +9,21 @@ public class UnOpExpr : Expression
     {
         public Expression Rhs = null;
         public string Op = "";
+
+        public UnaryOperator GetOperator()
+        {
+            if (Op == "!" || Op == "not")
+                return UnaryOperator.Not;
+            else if (Op == "#")
+                return UnaryOperator.Length;
+            else if (Op == "~")
+                return UnaryOperator.BitNot;
+            else if (Op == "-")
+                return UnaryOperator.Negate;
+            else if (Op == "+")
+                return UnaryOperator.UnNegate;
+            else
+                return UnaryOperator.NONE;
+        }
     }
 }
diff --git a/SharpLua/NewParser/Compiler/Block.cs b/SharpLua/NewParser/Compiler/Block.cs
@@ -23,15 +23,18 @@ public Block()
         }
 
         public Block(Block parent)
-            : this()
         {
-            parent.PreviousBlock = this;
+            K = new K2Reg(this);
+            //parent.PreviousBlock = this;
+            this.PreviousBlock = parent;
             V = new Var2Reg(parent.V);
+            Chunk = parent.Chunk;
         }
 
         public int regnum = 0;
         public int getreg()
         {
+            //Console.WriteLine(regnum);
             return
                 /*++*/
                 regnum