Changeset 1571

Timestamp:

08/06/08 23:14:44 (4 months ago)

Author:

Chuck.Esterbrook

Message:

Support nested block comments.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/CobraTokenizer.cobra (modified) (3 diffs)
• Source/Tokenizer.cobra (modified) (1 diff)
• Tests/110-basics-two/160-lines-and-comments (added)
• Tests/110-basics-two/160-lines-and-comments/200-multiline-comment.cobra (added)
• Tests/110-basics-two/160-lines-and-comments/210-multiline-comment-nested.cobra (added)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -1 +1 @@
 Post 0.8
+
+* Add support for commenting full blocks of lines using /# and #/. Block comments can be nested.
+        '/#' block comment start and  '#/' block comment end as initial chars on line
 
 * Added support for a Cobra compiler directive to specify the type for `number`
     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.
 

cobra/trunk/Source/CobraTokenizer.cobra

@@ -51 +51 @@
         var _inSubstStringDouble = false
         var _inDocString = false
-        var _inCommentBlock = false
+        var _inCommentBlock = 0
 
         def init
@@ -341 +341 @@
                 # _tokenDefsByWhich['STRING_PART_SINGLE'].isActiveCall = def(tokenizer)=tokenizer.inSubstStringSingle
                 # _tokenDefsByWhich['STRING_STOP_SINGLE'].isActiveCall = def(tokenizer)=tokenizer.inSubstStringSingle
-                for which in @[
-                                'RBRACKET_SPECIAL' ,
-                                'STRING_PART_SINGLE', 'STRING_STOP_SINGLE',
-                                'STRING_PART_DOUBLE', 'STRING_STOP_DOUBLE',
-                                'STRING_PART_FORMAT',
-                                ]
-                                        _tokenDefsByWhich[which].isActive = false
+
+                # recover from multiline comments
+                while _tokenDefsByWhich.containsKey('COMMENT_BLOCK_LINE')
+                        .popTokenDefs
+                _inCommentBlock = 0
+
+                inactivate = [
+                        'RBRACKET_SPECIAL' ,
+                        'STRING_PART_SINGLE', 'STRING_STOP_SINGLE',
+                        'STRING_PART_DOUBLE', 'STRING_STOP_DOUBLE',
+                        'STRING_PART_FORMAT',
+                ]
+                for which in inactivate
+                        _tokenDefsByWhich[which].isActive = false
 
         def isActiveCall(tok as TokenDef) as bool is override
@@ -387 +394 @@
         ## Comment out block
         ##
-        
-        var _commentBlockStop as TokenRegexDef?
-        var _commentBlockLine as TokenRegexDef?
+
+        var _commentBlockDefs as List<of TokenDef>?     
 
         def onCOMMENT_BLOCK_START(tok as IToken) as IToken?
                 #print '<> onCOMMENT_BLOCK_START', tok
-                assert not _inCommentBlock
+                assert _inCommentBlock >= 0, tok
                 # narrow the tokenizer's token defs to a new shorter set
-                if _commentBlockStop is nil
-                        _commentBlockStop = TokenRegexDef('COMMENT_BLOCK_STOP', r'[^# \t]?\#\/.*$')
-                        _commentBlockLine = TokenRegexDef('COMMENT_BLOCK_LINE', '.*\n')
-                t = List<of TokenDef>()
-                t.add(_commentBlockStop)
-                t.add(_commentBlockLine)
-                .pushTokenDefs(t)
-                _inCommentBlock = true
+                if _inCommentBlock == 0
+                        if _commentBlockDefs is nil
+                                # CC: _commentBlockDefs = List<of TokenDef>[_commentBlockStop, _commentBlockLine] # instead of the next 5 lines
+                                defs = List<of TokenDef>()
+                                defs.add(.tokenDefsByWhich['COMMENT_BLOCK_START'])
+                                defs.add(TokenRegexDef('COMMENT_BLOCK_STOP', r'[^# \t]?\#\/.*$'))
+                                defs.add(TokenRegexDef('COMMENT_BLOCK_LINE', '.*\n'))
+                                _commentBlockDefs = defs
+                        .pushTokenDefs(_commentBlockDefs to !)
+                _inCommentBlock += 1
                 return nil
                 
         def onCOMMENT_BLOCK_LINE(tok as IToken) as IToken?
                 #print '<> onCOMMENT_BLOCK_LINE', tok.lineNum 
-                assert _inCommentBlock, tok
+                assert _inCommentBlock > 0, tok
                 return nil
                 
         def onCOMMENT_BLOCK_STOP(tok as IToken) as IToken?
                 #print '<> onCOMMENT_BLOCK_STOP', tok.lineNum
-                assert _inCommentBlock, tok
-                _inCommentBlock = false
-                .popTokenDefs
+                assert _inCommentBlock > 0, tok
+                _inCommentBlock -= 1
+                if _inCommentBlock == 0
+                        .popTokenDefs
                 return nil
 

cobra/trunk/Source/Tokenizer.cobra

@@ -365 +365 @@
         get errors from var
 
+        get tokenDefsInOrder from _tokenDefs
+
+        get tokenDefsByWhich from var
+        
 
         ## Other