Ticket #132: ticket132-number-fractional-lit.patch

Source/CobraParser.cobra

@@ -220 +220 @@
         _tokens = nil
         if _tokenizer is nil
             _tokenizer = CobraTokenizer(tokVerbosity)
+        _tokenizer.typeProvider = .typeProvider 
+            
         tokenizer = _tokenizer
         try
             tokens = tokenizer.startSource(_fileName, source).allTokens

Source/CobraTokenizer.cobra

@@ -54 +54 @@
     var _inSubstStringDouble = false
     var _inDocString = false
     var _inCommentBlock = 0
-
+    set typeProvider from var as ITypeProvider?
+    
     def init
         base.init
 
@@ -498 +499 @@
     def onFRACTIONAL_LIT(tok as IToken) as IToken?
         s = tok.text.replace('_', '')
         try
-            tok.value = decimal.parse(s, Utils.cultureInfoForNumbers)
+            numTypeStr = 'decimal'
+            assert _typeProvider
+            numberType = _typeProvider.numberType
+            # parse literal to same type as numberType
+            if numberType inherits DecimalType
+                tok.value = decimal.parse(s, Utils.cultureInfoForNumbers)
+            else
+                numTypeStr = 'float'
+                tok.value = float.parse(s, Utils.cultureInfoForNumbers)
+                tok.which = 'FLOAT_LIT'
+                tok.info = if(numberType == _typeProvider.floatType(32), 32, 64)
         catch FormatException
             assert false, 'not expecting to get here given regex'
         catch OverflowException
-            assert false, 'TODO: FRACTIONAL_LIT Overflow'
+            .throwError('[numTypeStr] Overflow in parse of Fractional Literal [tok.text]')
         return tok
 
     def onINTEGER_LIT(tok as IToken) as IToken?

Tests/820-errors/600-other/130-number-lit-decimal.cobra

@@ +1 @@
+class NumbFloat
+    def main is shared
+        a as number = 79_228_162_514_264_337_593_543_950_33.4
+        assert a.getType is Single
+        # literal > max decimal
+        b as number = 80_228_162_514_264_337_593_543_950_335.1 #.error. decimal overflow in parse
+        assert b.getType is Single
+
+        c = 85_228_162_514_264_337_593_543_950_335.1  # .error. decimal overflow in parse
+        assert c.getType is Single

Tests/200-misc/300-number-type/110-number-lit-float.cobra

@@ +1 @@
+# .args. -number:float
+class NumbFloat
+    def main is shared
+        # < max Decimal
+        a as number = 79_228_162_514_264_337_593_543_950_33.4
+        # literal > max decimal
+        b as number =  80_228_162_514_264_337_593_543_950_335.1
+        assert a.getType is Double
+        assert b.getType is Double
+
+        c = 85_228_162_514_264_337_593_543_950_335.1
+        assert c.getType is Double

Tests/200-misc/300-number-type/112-number-lit-float32.cobra

@@ +1 @@
+# .args. -number:float32
+class NumbFloat
+    def main is shared
+        # < max Decimal
+        a as number = 79_228_162_514_264_337_593_543_950_33.4
+        assert a.getType is Single
+        # literal > max decimal
+        b as number =  80_228_162_514_264_337_593_543_950_335.1
+        assert b.getType is Single
+
+        c = 85_228_162_514_264_337_593_543_950_335.1
+        assert c.getType is Single

Developer/IntermediateReleaseNotes.text

@@ -295 +295 @@
 * Fixed: Cannot qualify an attribute. ticket:121
 
 * Fixed: Cannot read nested classes in binary libraries in some circumstances. ticket:127
+
+* Fixed: Fractional Literals dont parse to non Decimal -number setting. ticket:132