Changeset 2315 for cobra/trunk/Source/Compiler.cobra

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.

Files:

• cobra/trunk/Source/Compiler.cobra (modified) (7 diffs)

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