Ticket #106: tkt106.patch
File tkt106.patch, 2.7 KB (added by hopscc, 16 years ago) |
---|
-
Source/CobraTokenizer.cobra
81 81 r'WHITESPACE_LINE ^[\t ]+$', 82 82 r'WHITESPACE_COMMENT_1 ^[\t]+[ ]*\#.*$', 83 83 r'WHITESPACE_COMMENT_2 ^[ ]+[\t]*\#.*$', 84 r'COMMENT_BLOCK_START ^[ \t]*\/\#.*$', 84 85 r'INDENT_MIXED_TSNS ^[\t]+[ ]+(?=[^\t ])', 85 86 r'INDENT_MIXED_TS ^[\t]+[ ]+', 86 87 r'INDENT_MIXED_ST ^[ ]+[\t]+', … … 89 90 r'NO_INDENT ^(?=[^\t\n#\/])', 90 91 r'EOL \n', 91 92 r'INLINE_COMMENT \/\#.*\#/', 92 r'COMMENT_BLOCK_START ^\/\#.*$',93 93 r'SINGLE_LINE_COMMENT \#.*', 94 94 r'AMBIGUOUS_COMMENT \/\#.*', 95 95 r'SPACE [ \t]+', … … 317 317 # CC: _commentBlockDefs = List<of TokenDef>[_commentBlockStop, _commentBlockLine] # instead of the next 5 lines 318 318 defs = List<of TokenDef>() 319 319 defs.add(.tokenDefsByWhich['COMMENT_BLOCK_START']) 320 defs.add(TokenRegexDef('COMMENT_BLOCK_STOP', r'[^# \t]?\#\/.*$'))320 defs.add(TokenRegexDef('COMMENT_BLOCK_STOP', r'[^#]*\#\/.*$')) 321 321 defs.add(TokenRegexDef('COMMENT_BLOCK_LINE', '.*\n')) 322 322 _commentBlockDefs = defs 323 323 .pushTokenDefs(_commentBlockDefs to !) -
Tests/110-basics-two/160-lines-and-comments/220-multiline-comment-indented.cobra
1 # Testing multiline/block block end anywhere on line - leading text/whitespc 2 namespace Test 3 /# 1 4 This section won't compile if uncommented 5 a comment line 6 another comment line 7 x=55 + 2 8 } #/ 9 10 class Test 11 /# 2 12 _foo as int = 9 is shared 13 _bar as String is shared 14 #/ 15 var foo1 as int = 9 16 is shared, private 17 18 /# 3 19 %error die 20 #/ 21 /# 4 sdkksdksd sdjs dfdkjkdjfdf sdjhjsdjsdj # / 22 asd asdjasdasdasd asd asd 23 #/ 24 def main is shared 25 /# 5 fiddley dee dee 26 #/ 27 pass -
Developer/IntermediateReleaseNotes.text
314 314 * Fixed: Better error message for multiple modifiers sans commas. ticket:87 315 315 316 316 * Fixed: An unterminated doc string gives an internal error instead of a friendly error message. 317 318 * Fixed: Allow /# and /# (block comment start/end) to be indented. ticket: 106