Ticket #21: numberDirective1.patch

Source/Compiler.cobra

@@ -515 +515 @@
                 on 'float64', _numberType = .floatType(64)
                 else, throw FallThroughException(.options['number'])
         return _numberType to !
+
+    # set _numberType from a string rep
+    set numberTypeFmStr as String
+        branch value
+            on 'decimal', _numberType = .decimalType
+            on 'float',   _numberType = .floatType
+            on 'float32', _numberType = .floatType(32)
+            on 'float64', _numberType = .floatType(64)
+            else, throw FallThroughException(value)
         
     get passThroughType as PassThroughType
         if _passThroughType is nil

Source/CobraParser.cobra

@@ -521 +521 @@
                     else
                         isGood = false
                 if not isGood
-                    sugg = Compiler.suggestionFor(tok.text)
+                    sugg = nil
+                    if tok.text.length
+                        sugg = Compiler.suggestionFor(tok.text)
                     sugg = if(sugg, ' Try "[sugg]".', '')
                     .throwError('Expecting use, assembly, namespace, class, interface or enum, but got [tok].[sugg]')
                 if what
@@ -542 +544 @@
                 .expect('EOL')
                 # TODO: throw AssertException(SourceSite sourceSite, object[] expressions, object thiss, object info)
                 assert false, IdentifierExpr(token, 'throw')
+            # number  'decimal' | 'float' | 'float32' | 'float64'
+            on 'number'
+                typeId = .grab #.typeId  # or subset thereof
+                if typeId.text not in ['decimal', 'float', 'float32', 'float64']
+                    .throwError("Compiler directive 'number': unrecognised arg '[typeId.text]'. Must be one of  'decimal' | 'float' | 'float32' | 'float64'.")
+                .expect('EOL')
+                cc = .typeProvider to Compiler?
+                if cc
+                    cc.numberTypeFmStr = typeId.text
             else
                 .throwError('Unknown compiler directive.')
 

Tests/200-misc/900-number-directive.cobra

@@ +1 @@
+# test the new number compiler directive
+#%% number float32 | decimal | float | float32 | float64
+%% number float32
+
+class CompDir
+    def main is shared
+        n as number = 44
+        #print '[n.getType] n=[n]'
+        assert n.getType is Single
+        m as number = 45
+        #print '[m.getType] m=[m]'
+        assert m.getType is Single
+        
+        CDDec.x
+        CDF.x
+        CDF32.x
+        CDF64.x
+        #print 'end'
+        
+        
+%% number decimal
+class CDDec
+    def x is shared
+        m as number = 46
+        #print '[m.getType] m=[m]'
+        assert m.getType is Decimal
+        
+%% number float
+class CDF
+    def x is shared
+        m as number = 47
+        #print '[m.getType] m=[m]'
+        assert m.getType is Double
+    
+%% number float32
+class CDF32
+    def x is shared
+        m as number = 48
+        #print '[m.getType] m=[m]'
+        assert m.getType is Single
+    
+%% number float64
+class CDF64
+    def x is shared
+        m as number = 49
+        #print '[m.getType] m=[m]'
+        assert m.getType is Double
+        

Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
 
+* Add support for a cobra compiler Directive specifying default numeric 
+    type of number and integer literals same as command line -number option
+    %% number  'decimal' | 'float' | 'float32' | 'float64'
+    
 * Added a new built-in doc tool accessible via "cobra -doc ...". The documentation is generated to local HTML files using your declarations, doc strings, contracts, etc.
 
 * Add support for specifying unsigned integers as Hex literals