Changeset 1572

Timestamp:

08/11/08 06:44:56 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Added support for /# inline #/ comments.

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/CobraTokenizer.cobra (modified) (2 diffs)
• Tests/110-basics-two/160-lines-and-comments/300-inline-comment.cobra (added)
• Tests/110-basics-two/160-lines-and-comments/302-inline-comment-error.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 new comment markers /# ... #/ which can be used for block comments and inline comments. Block comments must start at the beginning of a line and can be used to comment out multiple lines of source. They can be nested. Inline comments also start with /# and end with #/, but within the same line. They can be used to comment out a portion of a line. Regular end of line comments are still available and still the norm.
+.code
+        class Example
+        
+                def main is shared
+                        # an end-of-line comment
+                        t = [1, 2, 3]  # a list of numbers
+
+                        # an inline comment
+                        print t, /#t[0],#/ t.count
+
+                        # a block comment
+        /#
+                def foo
+                        print 'bar'
+        #/
 
 * Added support for a Cobra compiler directive to specify the type for `number`

cobra/trunk/Source/CobraTokenizer.cobra

@@ -86 +86 @@
                         r'NO_INDENT                             ^(?=[^\t\n#\/])',
                         r'EOL                                   \n',
+                        r'INLINE_COMMENT                \/\#.*\#/',
                         r'COMMENT_BLOCK_START   ^\/\#.*$',  
                         r'SINGLE_LINE_COMMENT   \#.*',
+                        r'AMBIGUOUS_COMMENT             \/\#.*',
                         r'SPACE                                 [ \t]+',
 
@@ -509 +511 @@
                 return nil
 
+        def onINLINE_COMMENT(tok as IToken) as IToken?
+                # eat these
+                return nil
+
+        def onAMBIGUOUS_COMMENT(tok as IToken) as IToken?
+                .throwError('Ambiguous comment at /#. For an end-of-line comment, put a space between / and #. For an inline comment, end it with #/. For a block comment, put /# at the beginning of a line.')
+                return nil
+
         def onSPACE(tok as IToken) as IToken?
                 # eat these