Changeset 1579

Timestamp:

08/14/08 07:36:30 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Code cleanup/fix: Make comment-directive checking take place on lines with only a comment (no code).

Files:

• cobra/trunk/Source/CobraTokenizer.cobra (modified) (3 diffs)

cobra/trunk/Source/CobraTokenizer.cobra

@@ -390 +390 @@
         def onWHITESPACE_COMMENT_1(tok as IToken) as IToken?
                 #print '<> onWHITESPACE_COMMENT_1'
+                .checkForCommentDirective(tok)
                 return nil
 
         def onWHITESPACE_COMMENT_2(tok as IToken) as IToken?
                 #print '<> onWHITESPACE_COMMENT_2'
+                .checkForCommentDirective(tok)
                 return nil
         
@@ -510 +512 @@
                 return tok
 
-        var _directiveRE = Regex(r'#\s?\.([\w\-]+)\.($|\s)', RegexOptions.Compiled)
-
         def onSINGLE_LINE_COMMENT(tok as IToken) as IToken?
                 # eat these
-                
-                # check for .no-warnings.
-                reMatch = _directiveRE.match(tok.text)
-                if reMatch.success
-                        name = reMatch.groups[1].value
-                        branch name
-                                on 'no-warnings', .addNoWarning(tok)
-                                # for testify
-                                on 'args', pass  # TODO: actually this could be worth implementing outside of testify
-                                on 'compile-only', pass
-                                on 'error', pass
-                                on 'multi', pass
-                                on 'multipart', pass
-                                on 'skip', pass
-                                on 'warning', pass
-                                else, .throwError('Unrecognized compiler directive "[name]".')
-
+                .checkForCommentDirective(tok)
                 return nil
 
@@ -935 +919 @@
 
         ##
+        ## Self util
+        ##
+
+        var _directiveRE = Regex(r'#\s?\.([\w\-]+)\.($|\s)', RegexOptions.Compiled)
+
+        def checkForCommentDirective(tok as IToken)
+                # check for .no-warnings.
+                reMatch = _directiveRE.match(tok.text)
+                if reMatch.success
+                        name = reMatch.groups[1].value
+                        branch name
+                                on 'no-warnings', .addNoWarning(tok)
+                                # for testify
+                                on 'args', pass  # TODO: actually this could be worth implementing outside of testify
+                                on 'compile-only', pass
+                                on 'error', pass
+                                on 'multi', pass
+                                on 'multipart', pass
+                                on 'skip', pass
+                                on 'warning', pass
+                                else, .throwError('Unrecognized compiler directive "[name]".')
+
+
+        ##
         ## Deprecated
         ##