Changeset 2315

Timestamp:

03/12/10 09:25:11 (2 years ago)

Author:

Chuck.Esterbrook

Message:

An above error about numeric types indicates that you may want to set the default numeric type with "@number [expectedType]" in a source file or "cobra -number:[expectedType]" at the command line.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/BackEndClr/SharpGenerator.cobra (modified) (1 diff)
• Source/CobraTokenizer.cobra (modified) (1 diff)
• Source/Compiler.cobra (modified) (7 diffs)
• Source/files-to-compile.text (modified) (1 diff)
• Source/Misc.cobra (modified) (2 diffs)
• Source/Phases/Phase.cobra (modified) (2 diffs)
• Source/Phases/SuggestDefaultNumberPhase.cobra (added)
• Source/TestifyRunner.cobra (modified) (4 diffs)
• Tests/800-warnings/500-suggest-numeric-type (added)
• Tests/800-warnings/500-suggest-numeric-type/100-suggest-numeric-type.cobra (added)
• Tests/800-warnings/500-suggest-numeric-type/110-suggest-numeric-type.cobra (added)
• Tests/800-warnings/500-suggest-numeric-type/120-suggest-numeric-type.cobra (added)
• Tests/800-warnings/500-suggest-numeric-type/130-suggest-numeric-type.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -54 +54 @@
 
 * Added support for chain comparisons such as `0 <= i < 9`.
+
+* Cobra's use of `decimal` has advantages around accuracy, but can also cause confusion when using libraries that are centered around `float`. The compiler now detects this situation and suggests, via warning:
+
+    An above error about numeric types indicates that you may want to set the default numeric type with "@number [expectedType]" in a source file or "cobra -number:[expectedType]" at the command line.
 
 

cobra/trunk/Source/BackEndClr/SharpGenerator.cobra

@@ -232 +232 @@
                 _compileSharpWithProcessCSC(optChar, .joinOptions(backEndOptions), sharpFileNameList)
             else
-                print 'Unknown -native-compiler:[nativeCompiler]'
-                _exitFromErrors
-
-            if .errors.count
-                _exitFromErrors
+                .recordError(SourceException('Unknown -native-compiler:[nativeCompiler]'))
 
             _deleteIntermediateFiles

cobra/trunk/Source/CobraTokenizer.cobra

@@ -880 +880 @@
                 on 'skip', pass
                 on 'warning', pass
+                on 'warning-lax', pass
                 else, .throwError('Unrecognized compiler directive "[name]".')
             return true

cobra/trunk/Source/Compiler.cobra

@@ -286 +286 @@
             BindImplementationPhase,
             IdentifyMainPhase,
+            SuggestDefaultNumberPhase,
         ]
 
@@ -297 +298 @@
         if .options.boolValue('timeit')
             phases.add(CountNodesPhase(this))
+        for i, phase in phases.numbered, phase.stableOrder = i
+        phases.sort  # see Phase.order and .compareTo
         return phases
 
-    def runPhase(phaseType as Type)
+    def runPhase(phaseType as Type) as bool
         require phaseType.isSubclassOf(Phase)
-        .runPhase(phaseType(this) to Phase)
-
-    def runPhase(phase as Phase)
+        ensure result implies .errors.count > old .errors.count
+        return .runPhase(phaseType(this) to Phase)
+
+    def runPhase(phase as Phase) as bool
         require
             phase.compiler is this
@@ -311 +315 @@
             not phase.isRunning
             .lastPhase is phase
+            result implies .errors.count > old .errors.count
         body
             oldErrorCount = .errors.count
@@ -317 +322 @@
                 phase.run
                 .writeSourceCodeCorrections
+                return .errors.count > oldErrorCount
             finally
                 _curPhase = nil
                 _lastPhase = phase
-            if .errors.count > oldErrorCount, _exitFromErrors
 
 
@@ -372 +377 @@
         .willWriteTestInvocation = writeTestInvocation
         _pathsToCompile = paths
+        # now, essentially, do this:
+        #     for phase in .makePhases, runPhase(phase)
+        # but pay attention to things like errors and stopCompilation
+        hasErrors = false
         for phase in .makePhases
             if stopCompilation and stopCompilation(this), break
-            .runPhase(phase)
-    
+            if not hasErrors or phase.willRunWithErrors
+                if .runPhase(phase), hasErrors = true
+        if hasErrors, _exitFromErrors
+
     def testifyFilesNamed(fileNames as IList<of String>, options as OptionValues, resultsWriter as IndentedWriter, verbose as bool)
         """
@@ -387 +398 @@
         .defaultOutName = if(.options.buildStandardLibrary, 'Cobra.Lang.dll', fileNames[0])
         _pathsToCompile = fileNames
+        hasErrors = false
         for phase in .makePhases
             if verbose, print 'Testify phase:', phase.description
-            .runPhase(phase)
+            if not hasErrors or phase.willRunWithErrors
+                if .runPhase(phase), hasErrors = true
             if verbose
                 .dumpModulesForTestify(resultsWriter, 'Modules after: [phase.description]')
                 print bar
+        if hasErrors, throw StopCompilation(this)  # testify runner wants this
         # TODO: to display the intermediate source:
         #   for module in .modules
@@ -999 +1013 @@
 
     def _exitFromErrors
-        # TODO 2009-12 Having problems with this in same cases. Not important to enforce right now.
+        # TODO 2009-12 Having problems with this requirement in same cases. Not important to enforce right now.
         # require .errors.count
+        """
+        This method should not be invoked from partial classes found in phases or back-ends. Some
+        phases want to run even when there are errors from previous phases. This is managed by
+        the compiler's execution of the phases.
+        """
         .printMessages
         _deleteIntermediateFiles

cobra/trunk/Source/files-to-compile.text

@@ -47 +47 @@
 Phases/BindImplementationPhase.cobra
 Phases/CountNodesPhase.cobra
+Phases/SuggestDefaultNumberPhase.cobra
 
 BackEndCommon/CurlyWriter

cobra/trunk/Source/Misc.cobra

@@ -12 +12 @@
     
     var _fileName as String?
+    var _lineNum as int?
     var _token as IToken?
 
     cue init(message as String?)
         .init(nil, nil, message)
+
+    cue init(fileName as String, lineNum as int, message as String)
+        base.init(message)
+        _fileName, _lineNum = fileName, lineNum
 
     cue init(fileName as String?, token as IToken?, message as String)
@@ -31 +36 @@
         
     get hasSourceSite as bool is override
-        return _token is not nil
+        return _token or (_fileName and _lineNum)
 
     get fileName as String is override
-        return _token.fileName
+        return _fileName ? _token.fileName
         
     get lineNum as int is override
-        return _token.lineNum
+        return _lineNum ? _token.lineNum
 
 

cobra/trunk/Source/Phases/Phase.cobra

@@ -1 @@
-class Phase is abstract
+class Phase implements IComparable<of Phase> is abstract
     """
     A phase of the compiler.
@@ -22 +22 @@
         return .compiler.options
 
+    get order as int
+        """
+        Subclasses can override to change their order with respect to other phases.
+        Consecutive phases in the initial list of phases are kept in sequence with a "stable sort".
+        Default is 100.
+        """
+        return 100
+
+    pro stableOrder from var as int
+        """
+        Used to implement a "stable sort".
+        """
+
+    get willRunWithErrors as bool
+        """
+        Returns true if the phase will run correctly even if previously run phases produced errors.
+        Typically, phases will not want to run with errors because the AST nodes will in an
+        incomplete state that the phase cannot rely on. Hence, the default is false.
+        However, subclasses may override to return true if appropriate.
+        """
+        return false
+
     get verbosity as int
         return .compiler.verbosity
 
+    def compareTo(other as Phase) as int
+        diff = .order - other.order
+        if diff == 0, diff = .stableOrder - other.stableOrder
+        return diff
+        
     var _didSucceed as bool
 

cobra/trunk/Source/TestifyRunner.cobra

@@ -419 +419 @@
             index = firstLine.indexOf('.warning.')
             warning = firstLine.substring(index+9).trim.toLower
-            return _testifyHeadWarning(warning, compilerVerbosity, fileNames, options, verbose) 
+            return _testifyHeadWarning(warning, false, compilerVerbosity, fileNames, options, verbose) 
+
+        if firstLineInsensitive.startsWith('#.warning-lax.')
+            # deprecated: put warnings on the lines where they occur. the "hasInlineMessages" code above will detect them.
+            index = firstLine.indexOf('.warning-lax.')
+            warning = firstLine.substring(index+13).trim.toLower
+            return _testifyHeadWarning(warning, true, compilerVerbosity, fileNames, options, verbose) 
 
         return _testifyStd(compilerVerbosity, fileNames, options, verbose)
@@ -509 +515 @@
                 return 0
                 
-            if firstLineInsensitive.startsWith('#.error.') or firstLineInsensitive.startsWith('#.warning.')
+            if firstLineInsensitive.startsWith('#.error.') or firstLineInsensitive.startsWith('#.warning.') or firstLineInsensitive.startsWith('#.warning-lax.')
                 # these are handled below
                 break
@@ -639 +645 @@
         return 1
 
-    def _testifyHeadWarning(warning as String, compilerVerbosity as int, fileNames as IList<of String>,
+    def _testifyHeadWarning(warning as String, lax as bool, compilerVerbosity as int, fileNames as IList<of String>,
                             options as OptionValues, verbose as bool) as int 
         # TODO: the following code both checks for warnings to be thrown as well as going through a list of warnings. Seems like it should just need to do one or the other.
@@ -646 +652 @@
             c.testifyFilesNamed(fileNames, options, _resultsWriter to !, verbose)
         catch StopCompilation
-            print 'Expecting warning substring: "[warning]"'
-            print 'But got errors.'
-            .failed
-            return 0
+            if not lax
+                print 'Expecting warning substring: "[warning]"'
+                print 'But got errors.'
+                .failed
+                return 0
         catch exc as Exception
             print 'Internal exception: [exc]'