...

ToDo.txt → ToDo 2017.txt

@@ -1,68 +1,3 @@
-2019 Work Plan
-
-1) Reorg file tree (Kudzu)
-  -ARM space
-2) Colorizer - based on existing parser.
-3) Get Each .asm emitting same as Gen1 
-  -Swap out G1 for G2 in Cosmos.
-
--Finalize and complete all emitters
-  -Emit DS for input to Cosmos via Gen2
--Directories
-  -XSharp.Build -> Common\Build (Cosmos.Common.Build NS)
-  -XSharp
-    -XSharp
-    -XSC
-  -VS
--.xs Colorizing
-  -Use same parser as we have now
-
--X#/ARM, X#/86
-
--Kill Gen1
-  -Integerate G2 for Cosmos and IL2CPU
-
--Tree for source
-  -ie XSharp stuff in an XSharp folder, spruce, etc.
-  -Tree:
-    Common - Need a name... Build stuff shared with Cosmos and other
-      -Currently XSharp.Build - keep this or something else?
-
-    Spruce
-    XSharp
-    VS - Stuff specific for VS 2019
-
--Implement "X# Projects"
-  -No real need for .xsproj given how VS Code works?
-  -Task that when F5 is used, can build and package ISO like Cosmos and boot it.
-  -Share code from Cosmos
-    -Where does the common code belong?
-    -new Common subdir in source? Named what?
-
-===========================================
-
-VS Code
--.xs formatting
-
--DebugStub
-  -Share with IL2CPU and Cosmos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-======================================================================================
 XSharp.x86
 "EAX" -> Reg
 types then map to compile

ToDo 2019.txt

@@ -0,0 +1,48 @@
+2019 Work Plan
+
+1) Reorg file tree (Kudzu)
+  -ARM space
+2) Colorizer - based on existing parser.
+3) Get Each .asm emitting same as Gen1 
+  -Swap out G1 for G2 in Cosmos.
+
+-Finalize and complete all emitters
+  -Emit DS for input to Cosmos via Gen2
+-Directories
+  -XSharp.Build -> Common\Build (Cosmos.Common.Build NS)
+  -XSharp
+    -XSharp
+    -XSC
+  -VS
+-.xs Colorizing
+  -Use same parser as we have now
+
+-X#/ARM, X#/86
+
+-Kill Gen1
+  -Integerate G2 for Cosmos and IL2CPU
+
+-Tree for source
+  -ie XSharp stuff in an XSharp folder, spruce, etc.
+  -Tree:
+    Common - Need a name... Build stuff shared with Cosmos and other
+      -Currently XSharp.Build - keep this or something else?
+
+    Spruce
+    XSharp
+    VS - Stuff specific for VS 2019
+
+-Implement "X# Projects"
+  -No real need for .xsproj given how VS Code works?
+  -Task that when F5 is used, can build and package ISO like Cosmos and boot it.
+  -Share code from Cosmos
+    -Where does the common code belong?
+    -new Common subdir in source? Named what?
+
+===========================================
+
+VS Code
+-.xs formatting
+
+-DebugStub
+  -Share with IL2CPU and Cosmos

source/XSharp.Compiler/XSharp.Compiler.csproj

@@ -25,7 +25,7 @@
         <ProjectReference Include="..\XSharp.Assembler\XSharp.Assembler.csproj" />
         <ProjectReference Include="..\XSharp.Build\XSharp.Build.csproj" />
         <ProjectReference Include="..\XSharp.Compiler.Tasks\XSharp.Compiler.Tasks.csproj" Pack="True" PackagePath="" />
-        <ProjectReference Include="..\XSharp\XSharp.csproj" />
+        <ProjectReference Include="..\XSharp\XSharp\XSharp.csproj" />
     </ItemGroup>
 
 </Project>

source/XSharp/Tokens/Operators.cs → source/XSharp/XSharp/Tokens/Operators.cs

@@ -1,69 +1,69 @@
-using Spruce.Tokens;
-
-namespace XSharp.Tokens
-{
-    public class OpComment : StringList
-    {
-        // Comments require a space after. Prevents future conflicts with 3 char ones like Literal
-        public OpComment() : base(@"//")
-        {
-        }
-    }
-
-    public class OpLiteral : StringList
-    {
-        public OpLiteral() : base(@"//!")
-        {
-        }
-    }
-
-    public class OpCompare : StringList
-    {
-        public OpCompare() : base("< > = <= >= !=".Split(' '))
-        {
-        }
-    }
-
-    public class OpMath : StringList
-    {
-        public OpMath() : base("+= -= *= /= %=".Split(' '))
-        {
-        }
-    }
-
-    // Only used for bitwise ops with two parameters
-    public class OpBitwise : StringList
-    {
-        public OpBitwise() : base("& | ^".Split(' '))
-        {
-        }
-    }
-
-    public class OpIncDec : StringList
-    {
-        public OpIncDec() : base("++ --".Split(' '))
-        {
-        }
-    }
-
-    public class OpShift : StringList
-    {
-        public OpShift() : base("<< >>".Split(' '))
-        {
-        }
-    }
-
-    public class OpRotate : StringList
-    {
-        public OpRotate() : base("~> <~".Split(' '))
-        {
-        }
-    }
-
-    public class OpPureComparators : StringList
-    {
-        public OpPureComparators() : base("=0 !0 0 > < >= <= = !".Split(' '))
-        {
-        }
-    }
-}
+using Spruce.Tokens;
+
+namespace XSharp.Tokens
+{
+    public class OpComment : StringList
+    {
+        // Comments require a space after. Prevents future conflicts with 3 char ones like Literal
+        public OpComment() : base(@"//")
+        {
+        }
+    }
+
+    public class OpLiteral : StringList
+    {
+        public OpLiteral() : base(@"//!")
+        {
+        }
+    }
+
+    public class OpCompare : StringList
+    {
+        public OpCompare() : base("< > = <= >= !=".Split(' '))
+        {
+        }
+    }
+
+    public class OpMath : StringList
+    {
+        public OpMath() : base("+= -= *= /= %=".Split(' '))
+        {
+        }
+    }
+
+    // Only used for bitwise ops with two parameters
+    public class OpBitwise : StringList
+    {
+        public OpBitwise() : base("& | ^".Split(' '))
+        {
+        }
+    }
+
+    public class OpIncDec : StringList
+    {
+        public OpIncDec() : base("++ --".Split(' '))
+        {
+        }
+    }
+
+    public class OpShift : StringList
+    {
+        public OpShift() : base("<< >>".Split(' '))
+        {
+        }
+    }
+
+    public class OpRotate : StringList
+    {
+        public OpRotate() : base("~> <~".Split(' '))
+        {
+        }
+    }
+
+    public class OpPureComparators : StringList
+    {
+        public OpPureComparators() : base("=0 !0 0 > < >= <= = !".Split(' '))
+        {
+        }
+    }
+}

source/XSharp/Tokens/Variable.cs → source/XSharp/XSharp/Tokens/Variable.cs

@@ -1,53 +1,53 @@
-using XSharp.x86.Params;
-
-namespace XSharp.Tokens
-{
-    public class Variable : Identifier
-    {
-        public Variable()
-        {
-            mFirstChars = ".";
-        }
-
-        protected override bool CheckChar(int aLocalPos, char aChar)
-        {
-            // The name of the variable must start with a alphabet
-            if (aLocalPos == 1)
-            {
-                return Chars.Alpha.IndexOf(aChar) > -1;
-            }
-            return base.CheckChar(aLocalPos, aChar);
-        }
-
-        protected override object Transform(string aText)
-        {
-            return new Address(aText.Substring(1));
-        }
-    }
-
-    public class VariableAddress : Identifier
-    {
-        public VariableAddress()
-        {
-            mFirstChars = "@";
-        }
-
-        protected override bool CheckChar(int aLocalPos, char aChar)
-        {
-            switch (aLocalPos)
-            {
-                case 1:
-                    return aChar == '.';
-
-                case 2:
-                    return Chars.Alpha.IndexOf(aChar) > -1;
-            }
-            return base.CheckChar(aLocalPos, aChar);
-        }
-
-        protected override object Transform(string aText)
-        {
-            return aText.Substring(2);
-        }
-    }
-}
+using XSharp.x86.Params;
+
+namespace XSharp.Tokens
+{
+    public class Variable : Identifier
+    {
+        public Variable()
+        {
+            mFirstChars = ".";
+        }
+
+        protected override bool CheckChar(int aLocalPos, char aChar)
+        {
+            // The name of the variable must start with a alphabet
+            if (aLocalPos == 1)
+            {
+                return Chars.Alpha.IndexOf(aChar) > -1;
+            }
+            return base.CheckChar(aLocalPos, aChar);
+        }
+
+        protected override object Transform(string aText)
+        {
+            return new Address(aText.Substring(1));
+        }
+    }
+
+    public class VariableAddress : Identifier
+    {
+        public VariableAddress()
+        {
+            mFirstChars = "@";
+        }
+
+        protected override bool CheckChar(int aLocalPos, char aChar)
+        {
+            switch (aLocalPos)
+            {
+                case 1:
+                    return aChar == '.';
+
+                case 2:
+                    return Chars.Alpha.IndexOf(aChar) > -1;
+            }
+            return base.CheckChar(aLocalPos, aChar);
+        }
+
+        protected override object Transform(string aText)
+        {
+            return aText.Substring(2);
+        }
+    }
+}

source/XSharp/XSharp.csproj → source/XSharp/XSharp/XSharp.csproj

@@ -7,9 +7,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\XSharp.x86\XSharp.x86.csproj" />
-        <ProjectReference Include="..\Spruce\Spruce.csproj" />
-        <ProjectReference Include="..\XSharp.Assembler\XSharp.Assembler.csproj" />
+        <ProjectReference Include="..\..\XSharp.x86\XSharp.x86.csproj" />
+        <ProjectReference Include="..\..\Spruce\Spruce.csproj" />
+        <ProjectReference Include="..\..\XSharp.Assembler\XSharp.Assembler.csproj" />
     </ItemGroup>
 
 </Project>