[Cogkit-svn] SF.net SVN: cogkit: [1581] trunk/current/src/cog/modules/karajan

[<ha...@us...>]

Revision: 1581
          http://svn.sourceforge.net/cogkit/?rev=1581&view=rev
Author:   hategan
Date:     2007-02-14 10:50:00 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
fixed comments

Modified Paths:
--------------
    trunk/current/src/cog/modules/karajan/CHANGES.txt
    trunk/current/src/cog/modules/karajan/resources/karajan-language.gr
    trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/translator/atoms/MultiLineComment.java

Modified: trunk/current/src/cog/modules/karajan/CHANGES.txt
===================================================================
--- trunk/current/src/cog/modules/karajan/CHANGES.txt	2007-02-13 18:19:18 UTC (rev 1580)
+++ trunk/current/src/cog/modules/karajan/CHANGES.txt	2007-02-14 18:50:00 UTC (rev 1581)
@@ -1,3 +1,7 @@
+(02/14/2007)
+
+*** Fixed some issues with comments not being parsed correctly
+
 (02/05/2007)
 
 *** Added file resource throttling

Modified: trunk/current/src/cog/modules/karajan/resources/karajan-language.gr
===================================================================
--- trunk/current/src/cog/modules/karajan/resources/karajan-language.gr	2007-02-13 18:19:18 UTC (rev 1580)
+++ trunk/current/src/cog/modules/karajan/resources/karajan-language.gr	2007-02-14 18:50:00 UTC (rev 1581)
@@ -30,7 +30,7 @@
 separator := COMMASEP() | HVSPACES() ;
 		
 comment :=
-	LITERAL("//") SINGLELINECOMMENT() |
+	LITERAL("//") SINGLELINECOMMENT() HVSPACES() |
 	LITERAL("/*") MULTILINECOMMENT() HVSPACES() ;
 			
 list := LITERAL("[") IDENTIFIER("kernel:quotedlist") BEGINELEMENT() moreItems LITERAL("]") ENDELEMENT() ;

Modified: trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/translator/atoms/MultiLineComment.java
===================================================================
--- trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/translator/atoms/MultiLineComment.java	2007-02-13 18:19:18 UTC (rev 1580)
+++ trunk/current/src/cog/modules/karajan/src/org/globus/cog/karajan/translator/atoms/MultiLineComment.java	2007-02-14 18:50:00 UTC (rev 1581)
@@ -23,14 +23,14 @@
 				sb.append(c);
 			}
 			else if (context.tok.hasMoreTokens()) {
-				c = context.tok.nextChar();
+				c = context.tok.peekChar();
 				if (c == '/') {
+					context.tok.nextChar();
 					stack.push(new Eval(sb.toString()));
 					return true;
 				}
 				else {
 					sb.append('*');
-					sb.append(c);
 				}
 			}
 			else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.