Create decimal literals through decimal constructor (sq#871).

iskiselev · Oct 16, 2015 · 5fdc4fc · 5fdc4fc
1 parent 46ac870
commit 5fdc4fc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/JSIL/AST/JSLiteralTypes.cs b/JSIL/AST/JSLiteralTypes.cs
@@ -244,6 +244,20 @@ select em
         }
     }
 
+    public class JSDecimalLiteral : JSLiteralBase<Decimal>
+    {
+        public JSDecimalLiteral(decimal value)
+            : base(value)
+        {
+        }
+
+        public override TypeReference GetActualType(TypeSystem typeSystem)
+        {
+            return new TypeReference(typeSystem.Double.Namespace, "Decimal", typeSystem.Double.Module,
+                typeSystem.Double.Scope, true);
+        }
+    }
+
     public class JSNumberLiteral : JSLiteralBase<double> {
         public readonly Type OriginalType;
 
@@ -260,8 +274,6 @@ public override TypeReference GetActualType (TypeSystem typeSystem) {
                         return typeSystem.Single;
                     case "System.Double":
                         return typeSystem.Double;
-                    case "System.Decimal":
-                        return new TypeReference(typeSystem.Double.Namespace, "Decimal", typeSystem.Double.Module, typeSystem.Double.Scope, true);
                     default:
                         throw new NotImplementedException(String.Format(
                             "Unsupported number literal type: {0}",

diff --git a/JSIL/AST/JSNodeTypes.cs b/JSIL/AST/JSNodeTypes.cs
@@ -494,8 +494,8 @@ public static JSNumberLiteral New (double value) {
             return new JSNumberLiteral(value, typeof(double));
         }
 
-        public static JSNumberLiteral New (decimal value) {
-            return new JSNumberLiteral((double)value, typeof(decimal));
+        public static JSDecimalLiteral New (decimal value) {
+            return new JSDecimalLiteral(value);
         }
 
         public static JSDefaultValueLiteral DefaultValue (TypeReference type) {

diff --git a/JSIL/JavascriptAstEmitter.cs b/JSIL/JavascriptAstEmitter.cs
@@ -992,6 +992,11 @@ public void VisitNode (JSNumberLiteral number) {
             }
         }
 
+        public void VisitNode(JSDecimalLiteral number)
+        {
+            VisitNode(new JSNewExpression(number.GetActualType(TypeSystem), null, null, JSLiteral.New((double) number.Value)));
+        }
+
         public void VisitNode (JSBooleanLiteral b) {
             Output.Value(b.Value);
         }