Changeset 1723

Timestamp:

11/02/08 23:33:20 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup.
Removed ArgsParser?._self global state.

Location:

cobra/trunk/Source

Files:

• CobraParser.cobra (modified) (4 diffs)
• CommandLine.cobra (modified) (4 diffs)
• Compiler.cobra (modified) (5 diffs)
• TestifyRunner.cobra (modified) (4 diffs)

cobra/trunk/Source/CobraParser.cobra

@@ -51 +51 @@
 
         """
+
+        sig ParseCommandLineArgsSig(args as IList<of String>, isAvailable as out bool) as String?
+/#
+CC: bug in Cobra parser where putting a doc string after a sig causes problems.
+                """
+                The delegate is used to implement the 'args' compiler directive.
+                It should set isAvailable.
+                If isAvailable, it should return nil on success, or an error message.
+                Otherwise, it should return nil.
+                """
+#/
 
         test
@@ -111 +122 @@
         var _typeProvider as ITypeProvider?
 
+        var _parseCommandLineArgs as ParseCommandLineArgsSig?
+
         # TODO: do this with a callback/delegate instead of this bullshit Java-style interface technique
         var _warningRecorder as IWarningRecorder?
@@ -126 +139 @@
 
         pro typeProvider from var
+
+        pro parseCommandLineArgs from var
+                """
+                The delegate is used to implement the 'args' compiler directive.
+                If none is provided and the 'args' directive is encountered, an error is generated.
+                See also: ParseCommandLineArgsSig
+                """
 
         pro globalNS as NameSpace
@@ -588 +608 @@
                                 if not args.count 
                                         .throwError('args directive needs at least one arg following.')
-                                        
-                                comp = .typeProvider to? Compiler
-                                # trace args
-                                if comp
-                                        options = ArgParser.parseToOptions(args)
-                                        comp.augmentOptions(options)
+
+                                isAvailable = false
+                                if .parseCommandLineArgs
+                                        # trace args
+                                        parseCommandLineArgs = .parseCommandLineArgs
+                                        # errorMsg = parseCommandLineArgs(args, out isAvailable) -- error: COBRA INTERNAL ERROR / NullReferenceException / Object reference not set to an instance of an object.
+                                        if true
+                                                errorMsg = '' to ?
+                                                sharp'errorMsg = parseCommandLineArgs(args, out isAvailable)'
+                                                CobraCore.noOp(parseCommandLineArgs)
+                                        if isAvailable, if errorMsg, .throwError(errorMsg)
+                                if not isAvailable
+                                        .throwError('Cannot set command line arguments from directive because no arguments parser is available.')
                         else
                                 .throwError('Unknown compiler directive.')

cobra/trunk/Source/CommandLine.cobra

@@ -435 +435 @@
 
         get options from var
+
+        get argParser from var
 
         get verboseLineSeparator as String
@@ -538 +540 @@
                         .error('No files to process.')
                 _compiler = c = Compiler(.verbosity)
+                c.commandLineArgParser = _argParser
                 c.options = _options
                 c.willPrintSuccessMsg = willPrintSuccessMsg
@@ -834 +837 @@
         """
 
-        var _self as ArgParser? is shared
         var _versionString as String
         var _verbosity = 0
@@ -865 +867 @@
                 _synList = List<of String>()
                 _initSynonyms
-                _self = this
-
-        def parseToOptions(args as IList<of String>) as OptionValues is shared
-                """
-                Reuse ArgParser to parse some additional string option args. Files are not allowed 
-                Can be used only after ArgParser has already been constructed providing CommandLineOptionSpecs
+
+        def parseToOptions(args as IList<of String>) as OptionValues
+                """
+                Reuse ArgParser to parse some additional string option args. Files are not allowed.
                 Return new set of Options from given args list
                 """
-                assert _self , 'ArgParser.init must have been called sometime before using ArgParse.parseToOptions()'
                 opts = OptionValues()
                 paths = List<of String>()
                 # TODO: mark which opts as unusable in this context and filter out
-                _self._optsOnly = true
-                _self.parseArgs(args, out opts, out paths)
-                if _self.verbosity or opts.getDefault('verbosity', 0) to int
+                _optsOnly = true
+                .parseArgs(args, out opts, out paths)
+                if .verbosity or opts.getDefault('verbosity', 0) to int
                         print 'parseToOptions Option Dictionary:'
                         opts.print

cobra/trunk/Source/Compiler.cobra

@@ -52 +52 @@
         var _verbosity as int
         var _options as OptionValues
+        var _commandLineArgParser as ArgParser?
         var _willPrintSuccessMsg = true
         var _htmlWriter as HtmlWriter?
@@ -154 +155 @@
         pro options from var
 
+        pro commandLineArgParser from var
+
         pro willPrintSuccessMsg from var
 
@@ -389 +392 @@
                                 extraSource = .options.getDefault('extra-source', '').trim to String
                                 if extraSource <> ''
+                                        # CC: parser = Parser(verbosity=_verbosity, typeProvider=this, warningRecorder=this, errorRecorder=this, globalNS=_globalNS, parseCommandLineArgs=ref .parseCommandLineArgsCallBack)
                                         parser = Parser(verbosity=_verbosity, typeProvider=this, warningRecorder=this, errorRecorder=this, globalNS=_globalNS)
+                                        parser.parseCommandLineArgs = ref .parseCommandLineArgsCallBack
                                         module = parser.parseSource('_ch_cobra-extra-source.cobra', extraSource)  # ch = compiler helper
                                         modules.add(module)
@@ -403 +408 @@
                                                 parser.warningRecorder = this
                                                 parser.errorRecorder = this
+                                                parser.parseCommandLineArgs = ref .parseCommandLineArgsCallBack
                                                 parser.globalNS = _globalNS
                                                 # @@ TODO: assert _globalNS is parser.nameSpaceStack[0]
@@ -422 +428 @@
                                 _parsedModules = nil
                         return modules
+
+        def parseCommandLineArgsCallBack(args as IList<of String>, isAvailable as out bool) as String?
+                """
+                This is the call back for implementing the `args` directive as encountered in the Parser.
+                """
+                if .commandLineArgParser
+                        isAvailable = true
+                        try
+                                .augmentOptions(.commandLineArgParser.parseToOptions(args))
+                        catch ape as ArgParseException
+                                return ape.message
+                else
+                        isAvailable = false
+                return nil
 
         def augmentOptions(opts as OptionValues)

cobra/trunk/Source/TestifyRunner.cobra

@@ -357 +357 @@
                 if hasInlineMessages
                         try
-                                c = Compiler(compilerVerbosity, _cachedTestifyModules)
+                                c = Compiler(compilerVerbosity, _cachedTestifyModules, commandLineArgParser=_cl.argParser)
                                 c.testifyFilesNamed([baseName], options, _resultsWriter to !, verbose)
                         catch StopCompilation
@@ -419 +419 @@
                         error = firstLine.substring(index+7).trim.toLower
                         try
-                                c = Compiler(compilerVerbosity, _cachedTestifyModules)
+                                c = Compiler(compilerVerbosity, _cachedTestifyModules, commandLineArgParser=_cl.argParser)
                                 c.testifyFilesNamed(fileNames, options, _resultsWriter to !, verbose)
                         catch StopCompilation
@@ -463 +463 @@
                         # 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.
                         try
-                                c = Compiler(compilerVerbosity, _cachedTestifyModules)
+                                c = Compiler(compilerVerbosity, _cachedTestifyModules, commandLineArgParser=_cl.argParser)
                                 c.testifyFilesNamed(fileNames, options, _resultsWriter to !, verbose)
                         catch StopCompilation
@@ -497 +497 @@
                         return 1
 
-                c = Compiler(compilerVerbosity, _cachedTestifyModules)
+                c = Compiler(compilerVerbosity, _cachedTestifyModules, commandLineArgParser=_cl.argParser)
 
                 try