[ jEdit-commits ] SF.net SVN: jedit:[22398] plugins/JavaSideKick/trunk/src/sidekick/property/ parser/property

[<dal...@us...>]

Revision: 22398
          http://jedit.svn.sourceforge.net/jedit/?rev=22398&view=rev
Author:   daleanson
Date:     2012-10-22 22:58:54 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Fix for tracker 3578769, continuation lines not handled properly.

Modified Paths:
--------------
    plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.java
    plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.jj
    plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParserTokenManager.java

Modified: plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.java
===================================================================
--- plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.java	2012-10-20 16:47:44 UTC (rev 22397)
+++ plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.java	2012-10-22 22:58:54 UTC (rev 22398)
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. PropertyParser.java */
+/* Generated By:JavaCC: Do not edit this line.  PropertyParser.java */
 package sidekick.property.parser.property;
 
 import java.util.*;

Modified: plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.jj
===================================================================
--- plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.jj	2012-10-20 16:47:44 UTC (rev 22397)
+++ plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParser.jj	2012-10-22 22:58:54 UTC (rev 22398)
@@ -192,7 +192,7 @@
     ends in \\, then it's an escaped \, not a continuation character, and should
     be part of the value.  I think this is a rare use case, so I'm not going
     to worry about it until someone complains. */
-    <VALUE: ((~["\r", "\n"])*(<CONTINUATION>)*)("\n"|"\r"|"\r\n")? > : DEFAULT
+    <VALUE: ((~["\r", "\n"])*(<CONTINUATION>)*)+("\n"|"\r"|"\r\n")? > : DEFAULT
 }
 
 

Modified: plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParserTokenManager.java
===================================================================
--- plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParserTokenManager.java	2012-10-20 16:47:44 UTC (rev 22397)
+++ plugins/JavaSideKick/trunk/src/sidekick/property/parser/property/PropertyParserTokenManager.java	2012-10-22 22:58:54 UTC (rev 22398)
@@ -313,7 +313,7 @@
                      break;
                   if (kind > 9)
                      kind = 9;
-                  jjCheckNAddStates(34, 36);
+                  jjCheckNAddStates(34, 37);
                   break;
                case 3:
                   if (curChar == 10 && kind > 9)
@@ -421,7 +421,7 @@
                   {
                      if (kind > 8)
                         kind = 8;
-                     jjCheckNAddStates(37, 41);
+                     jjCheckNAddStates(38, 42);
                   }
                   else if (curChar == 58)
                   {
@@ -503,7 +503,7 @@
 static final int[] jjnextStates = {
    11, 13, 14, 16, 18, 7, 8, 9, 1, 10, 11, 13, 15, 16, 18, 2, 
    3, 5, 10, 11, 13, 11, 13, 14, 15, 16, 18, 20, 12, 17, 0, 1, 
-   5, 4, 1, 4, 2, 3, 0, 4, 1, 5, 
+   5, 4, 0, 1, 4, 2, 3, 0, 4, 1, 5, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {

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