Single and multi line comment handling added to lexicon grammar

libwccl/lexicon/lexfilegrammar.g

@@ -28,7 +28,7 @@ options {
 // ----------------------------------------------------------------------------
 class ANTLRLexiconParser extends Parser;
 options {
-	k = 1;
+	k = 2;
 	buildAST = false;
 	exportVocab = ANTLRLexicons;
 	defaultErrorHandler = false;
@@ -113,3 +113,36 @@ NEWLINE
 		| '\n'
 		) { newline(); $setType(antlr::Token::SKIP); }
 ;
+
+COMMENT
+options {
+  paraphrase = "Single line comment";
+}
+  : "//" (~('\n'|'\r'))* { $setType(antlr::Token::SKIP);  }
+;
+
+ML_COMMENT
+options {
+  paraphrase = "Multi line comment";
+}
+  : "/*"
+  (     // TODO: test it and add reference to the site it's taken from!
+        /* This actually works OK despite the ambiguity that
+        '\r' '\n' can be matched in one alternative or by matching
+        '\r' in one iteration and '\n' in another.. But 
+        this is really matched just by one rule per (...)* 
+        loop iteration, so it's OK.
+        This is exactly how they do it all over the web - just
+        turn off the warning for this particular token.*/
+    options {
+      generateAmbigWarnings = false;
+    }
+      : { LA(2)!='/' }? '*'
+      | '\r' '\n' { newline(); }
+      | '\r' { newline(); }
+      | '\n' { newline(); }
+      | ~('*'|'\n'|'\r')
+    )*
+    "*/"
+    { $setType(antlr::Token::SKIP); }
+;

tests/data/indecl.lex

+/**
+ * ML COMMENT
+ */
+// Single line comment
 by	part
 och	interj
 ach	interj