#3 Add FieldDeclaration

NoobDevTv · Jan 9, 2018 · 7dccdd4 · 7dccdd4
1 parent dcf6c4e
commit 7dccdd4
Show file tree

Hide file tree

Showing 10 changed files with 99 additions and 7 deletions.
diff --git a/Arrow.Core/Arrow.Core.csproj b/Arrow.Core/Arrow.Core.csproj
@@ -46,6 +46,7 @@
     <Compile Include="ArrowCompiler.cs" />
     <Compile Include="Parsing\Definition\ClassDeclarationSyntax.cs" />
     <Compile Include="Parsing\Definition\ComplexTypeSyntax.cs" />
+    <Compile Include="Parsing\Definition\FieldDeclarationSyntax.cs" />
     <Compile Include="Parsing\Definition\IdentifierSyntax.cs" />
     <Compile Include="Parsing\Definition\IntegerSyntax.cs" />
     <Compile Include="Parsing\Definition\MethodDeclarationSyntax.cs" />

diff --git a/Arrow.Core/Parsing/Definition/FieldDeclarationSyntax.cs b/Arrow.Core/Parsing/Definition/FieldDeclarationSyntax.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Arrow.Core.Parsing.Definition
+{
+    [Syntax(SyntaxDefinitionType.FieldDeclaration)]
+    public class FieldDeclarationSyntax : VariableDeclarationSyntax
+    {
+        public FieldDeclarationSyntax() : base(nameof(FieldDeclarationSyntax))
+        {
+
+        }
+
+        public override bool TryParse(SyntaxStream stream, Scanner scanner)
+        {
+            for (int i = 0; i < stream.Count; i++)
+            {
+                if (stream[i].Name == "CodeLineEnd")
+                {
+                    var result = base.TryParse(stream.Take(i), scanner);
+                    Length += 1;
+                    return result;
+                }
+            }
+
+            return false;
+
+        }
+    }
+}
diff --git a/Arrow.Core/Parsing/Definition/VariableDeclarationSyntax.cs b/Arrow.Core/Parsing/Definition/VariableDeclarationSyntax.cs
@@ -11,16 +11,25 @@ namespace Arrow.Core.Parsing.Definition
     [Syntax(SyntaxDefinitionType.Variable)]
     public class VariableDeclarationSyntax : Syntax
     {
+        public Syntax Expression { get; protected set; }
+
+        public TypeDeclarationSyntax TypeDeclarationSyntax { get; set; }
+
         public VariableDeclarationSyntax() : base(nameof(VariableDeclarationSyntax))
         {
         }
-
-        public Syntax Expression { get; private set; }
+        protected VariableDeclarationSyntax(string name) : base(name)
+        {
 
+        }
+
         public override bool TryParse(SyntaxStream stream, Scanner scanner)
         {
             var result = false;
 
+            if (stream.Count < 2)
+                return false;
+
             if (stream[0].Name == "Var" && stream[1].Name == "Identifier")
             {
                 var identifierToken = (TokenSyntax)stream[1];
@@ -31,9 +40,15 @@ public override bool TryParse(SyntaxStream stream, Scanner scanner)
                 result = true;
             }
 
-            if ( stream.Count > 2 &&stream[2].Name == "AssignEquals")
+            if(stream.Count > Length && scanner.TryScan(stream.Skip(Length),out TypeDeclarationSyntax type))
+            {
+                TypeDeclarationSyntax = type;
+                Length += type.Length;
+            }
+
+            if ( stream.Count > Length &&stream[Length].Name == "AssignEquals")
             {
-                Expression = scanner.Scan(stream.Skip(3));
+                Expression = scanner.Scan(stream.Skip(Length + 1));
                 Length += 1 + Expression.Length;
             }
 

diff --git a/Arrow.Core/Parsing/SyntaxDefinitionType.cs b/Arrow.Core/Parsing/SyntaxDefinitionType.cs
@@ -18,8 +18,10 @@ public enum SyntaxDefinitionType
         Scope,
         Primitive,
         TypeDeclaration,
+        FieldDeclaration,
         MethodDeclaration,
         ClassDeclaration,
-        NamespaceDeclaration
+        NamespaceDeclaration,
+
     }
 }
diff --git a/Arrow.Core/Visitors/ClassScope.cs b/Arrow.Core/Visitors/ClassScope.cs
@@ -11,8 +11,11 @@ public class ClassScope : Scope
     {
         public readonly TypeBuilder TypeBuilder;
 
+        public Dictionary<string,FieldBuilder> Fields;
+
         public ClassScope(TypeBuilder typeBuilder)
         {
+            Fields = new Dictionary<string, FieldBuilder>();
             TypeBuilder = typeBuilder;
         }
     }

diff --git a/Arrow.Core/Visitors/ClassVisitor.cs b/Arrow.Core/Visitors/ClassVisitor.cs
@@ -21,6 +21,12 @@ public void Visit(ScopeSyntax syntax, ClassScope scope)
             }
         }
 
+        public void Visit(FieldDeclarationSyntax syntax, ClassScope scope)
+        {
+            var field = scope.TypeBuilder.DefineField(syntax.Name, syntax.TypeDeclarationSyntax.TypeSyntax.Type, System.Reflection.FieldAttributes.Private);
+            scope.Fields.Add(syntax.Name, field);
+        }
+
         public void Visit(MethodDeclarationSyntax syntax, ClassScope scope)
         {
             var parameterTypes = syntax.Signature?.Parameters.Select(p => p.TypeDeclaration.TypeSyntax.Type).ToArray();

diff --git a/CompilerTests/CompilerTests.csproj b/CompilerTests/CompilerTests.csproj
@@ -28,6 +28,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClassTests.cs" />
+    <Compile Include="FieldTests.cs" />
     <Compile Include="FileTests.cs" />
     <Compile Include="MethodTests.cs" />
     <Compile Include="NewLineTests.cs" />

diff --git a/CompilerTests/FieldTests.cs b/CompilerTests/FieldTests.cs
@@ -0,0 +1,30 @@
+using Arrow.Core;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CompilerTests
+{
+    [TestClass]
+    public class FieldTests
+    {
+        private ArrowCompiler compiler;
+
+        public FieldTests()
+        {
+            compiler = new ArrowCompiler();
+        }
+
+        [TestMethod]
+        public void SimpleFieldTest()
+        {
+            compiler.GetAssembly(
+               @"class test {
+                    var global : int;
+                  }");
+        }
+    }
+}
diff --git a/CompilerTests/FileTests.cs b/CompilerTests/FileTests.cs
@@ -22,8 +22,6 @@ public FileTests()
         [TestMethod]
         public void FileCompiling()
         {
-            //TODO: an die Zunft diesen Fehler bzw. Test bitte lösen Gruß Vergangenheits Lassi und Marcus
-
             compiler.GetAssembly(File.ReadAllText(@"D:\Projekte\Visual 2017\TheLanguage\CompilerTests\SimpleTest.arrow"));
         }
     }

diff --git a/CompilerTests/SimpleTest.arrow b/CompilerTests/SimpleTest.arrow
@@ -1,5 +1,7 @@
 class Math 
 {
+	var det : int;
+
 	def Add(base : int, value : int) : int
 	{
 		ret base + value;