- LS2IL version 0.8.20121026.1

- version is now kept in a const in Chunk - updated some of my new code to comply with Vendan's multifile Model changes
LaxLacks · Oct 26, 2012 · 8927bca · 8927bca
1 parent 9ff4eb9
commit 8927bca
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/ls2csc/DeclarationCollector.cs b/ls2csc/DeclarationCollector.cs
@@ -87,9 +87,9 @@ public override void VisitEnumDeclaration(EnumDeclarationSyntax node)
         {
             LS2IL.TypeExtraInfo.ClassMetadataGenerator wasClass = CurrentClass;
 
-            NamedTypeSymbol s = Chunk.Model.GetDeclaredSymbol(node);
+            NamedTypeSymbol s = Model.GetDeclaredSymbol(node);
 
-            TypeExtraInfo tei = Chunk.AddTypeExtraInfo(s);
+            TypeExtraInfo tei = Chunk.AddTypeExtraInfo(s, Model);
             CurrentClass = tei.MetadataGenerator;
 
             foreach (MemberDeclarationSyntax mds in node.Members)

diff --git a/ls2csc/LS2IL/Chunk.cs b/ls2csc/LS2IL/Chunk.cs
@@ -12,6 +12,8 @@ namespace LS2IL
 {
     class Chunk
     {
+        public const string LS2ILVersion = "0.8.20121026.1";
+
         public Chunk(Compilation compilation)
         {
             Compilation = compilation;
@@ -27,6 +29,7 @@ public Chunk(Compilation compilation)
             MetaValues.Add("Build Date", FlatValue.String(DateTime.UtcNow.ToString()+" UTC"));
             MetaValues.Add("Compiler", FlatValue.String("ls2csc"));
             MetaValues.Add("Language", FlatValue.String("C#"));
+            MetaValues.Add("Environment Version", FlatValue.String(LS2ILVersion));
         }
 
         public Compilation Compilation { get; private set; }

diff --git a/ls2csc/LS2IL/Function.cs b/ls2csc/LS2IL/Function.cs
@@ -1943,11 +1943,6 @@ public FlatOperand ResolveExpression(PostfixUnaryExpressionSyntax pues, TypeInfo
                         instructions.Add(FlatStatement.GETPROPERTY(fop_currentlvalue, fop_property, fop_subject));
                         instructions.Add(FlatStatement.DUPLICATE(into_lvalue, fop_currentvalue));
 
-
-                        instructions.Add(FlatStatement.GETPROPERTY(fop_result_lvalue, fop_property, fop_subject));
-
-                        instructions.Add(FlatStatement.DUPLICATE(into_lvalue, fop_result));
-
                         switch (pues.Kind)
                         {
                             case SyntaxKind.PostIncrementExpression:

diff --git a/ls2csc/Program.cs b/ls2csc/Program.cs
@@ -109,7 +109,7 @@ static void Main(string[] args)
             if (silence <= 0)
             {
                 System.Console.Error.WriteLine("C# Compiler for LavishScript 2.0 Virtual Machine");
-                System.Console.Error.WriteLine("- Building for LS2IL version 0.7.20121025.1");
+                System.Console.Error.WriteLine("- Building for LS2IL version " + LS2IL.Chunk.LS2ILVersion);
             }
 
             if (help)

diff --git a/ls2csc/TypeExtraInfo.cs b/ls2csc/TypeExtraInfo.cs
@@ -124,7 +124,7 @@ public void Add(EnumMemberDeclarationSyntax node)
                  */
                 // add field info
 
-                TypeExtraInfo tei = Chunk.AddTypeExtraInfo(this.Class);
+                TypeExtraInfo tei = Chunk.AddTypeExtraInfo(this.Class,Model);
                 tei.AddEnumMember(node.Identifier.ToString(), node.EqualsValue != null ? node.EqualsValue.Value : null);