Attachment 42916 Details for Bug 143912 – proposed changes for JSPTokenizer

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] proposed changes for JSPTokenizer

143912.patch (text/plain), 4.91 KB, created by Nitin Dahyabhai

on 2006-05-29 22:31:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nitin Dahyabhai

Created: 2006-05-29 22:31:09 EDT

Size: 4.91 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.jsp.core
>Index: src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java
>===================================================================
>RCS file: /cvsroot/webtools/jst/components/jsp/plugins/org.eclipse.jst.jsp.core/src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java,v
>retrieving revision 1.14
>diff -u -r1.14 JSPTokenizer.java
>--- src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java	10 May 2006 02:58:50 -0000	1.14
>+++ src/org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.java	30 May 2006 02:28:46 -0000
>@@ -1,4 +1,4 @@
>-/* The following code was generated by JFlex 1.2.2 on 5/9/06 8:02 PM */
>+/* The following code was generated by JFlex 1.2.2 on 5/29/06 10:16 PM */
> 
> /*******************************************************************************
>  * Copyright (c) 2004, 2006 IBM Corporation and others.
>@@ -37,7 +37,7 @@
> /**
>  * This class is a scanner generated by 
>  * <a href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex</a> 1.2.2
>- * on 5/9/06 8:02 PM from the specification file
>+ * on 5/29/06 10:16 PM from the specification file
>  * <tt>file:/D:/eclipse.wtp/workspace/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex</tt>
>  */
> public class JSPTokenizer implements BlockTokenizer, DOMJSPRegionContexts {
>@@ -2239,8 +2239,7 @@
> 		return PROXY_CONTEXT;
> 	}
> 	// finished sanity checks
>-	fStateStack.push(yystate());
>-	if(fStateStack.peek()==YYINITIAL) {
>+	if(yystate()==YYINITIAL) {
> 		// the simple case, just a regular scriptlet out in content
> 		if(Debug.debugTokenizer)
> 			dump("\nJSP comment start");//$NON-NLS-1$
>@@ -3601,7 +3600,6 @@
> 			return BLOCK_TEXT;
> 		}
> 		// required help for successive embedded regions
>-		// required help for successive embedded regions, mark this one as white-space (it's a server-side comment) so it will be otherwise ignored
> 		if(yystate() == ST_XML_TAG_NAME) {
> 			fEmbeddedHint = XML_TAG_NAME;
> 			fEmbeddedPostState = ST_XML_ATTRIBUTE_NAME;
>#P org.eclipse.wst.sse.core
>Index: DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex,v
>retrieving revision 1.5
>diff -u -r1.5 JSPTokenizer.jflex
>--- DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex	10 May 2006 02:59:15 -0000	1.5
>+++ DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex	30 May 2006 02:28:52 -0000
>@@ -1878,8 +1878,7 @@
> 		return PROXY_CONTEXT;
> 	}
> 	// finished sanity checks
>-	fStateStack.push(yystate());
>-	if(fStateStack.peek()==YYINITIAL) {
>+	if(yystate()==YYINITIAL) {
> 		// the simple case, just a regular scriptlet out in content
> 		if(Debug.debugTokenizer)
> 			dump("\nJSP comment start");//$NON-NLS-1$
>Index: DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.java
>===================================================================
>RCS file: /cvsroot/webtools/wst/components/sse/plugins/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.java,v
>retrieving revision 1.5
>diff -u -r1.5 JSPTokenizer.java
>--- DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.java	10 May 2006 02:59:15 -0000	1.5
>+++ DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.java	30 May 2006 02:28:51 -0000
>@@ -1,4 +1,4 @@
>-/* The following code was generated by JFlex 1.2.2 on 5/9/06 8:02 PM */
>+/* The following code was generated by JFlex 1.2.2 on 5/29/06 10:16 PM */
> 
> /*******************************************************************************
>  * Copyright (c) 2004, 2006 IBM Corporation and others.
>@@ -37,7 +37,7 @@
> /**
>  * This class is a scanner generated by 
>  * <a href="http://www.informatik.tu-muenchen.de/~kleing/jflex/">JFlex</a> 1.2.2
>- * on 5/9/06 8:02 PM from the specification file
>+ * on 5/29/06 10:16 PM from the specification file
>  * <tt>file:/D:/eclipse.wtp/workspace/org.eclipse.wst.sse.core/DevTimeSupport/SedModel/HTMLTokenizer/devel/JSPTokenizer.jflex</tt>
>  */
> public class JSPTokenizer implements BlockTokenizer, DOMJSPRegionContexts {
>@@ -2239,8 +2239,7 @@
> 		return PROXY_CONTEXT;
> 	}
> 	// finished sanity checks
>-	fStateStack.push(yystate());
>-	if(fStateStack.peek()==YYINITIAL) {
>+	if(yystate()==YYINITIAL) {
> 		// the simple case, just a regular scriptlet out in content
> 		if(Debug.debugTokenizer)
> 			dump("\nJSP comment start");//$NON-NLS-1$
>@@ -3601,7 +3600,6 @@
> 			return BLOCK_TEXT;
> 		}
> 		// required help for successive embedded regions
>-		// required help for successive embedded regions, mark this one as white-space (it's a server-side comment) so it will be otherwise ignored
> 		if(yystate() == ST_XML_TAG_NAME) {
> 			fEmbeddedHint = XML_TAG_NAME;
> 			fEmbeddedPostState = ST_XML_ATTRIBUTE_NAME;

Actions: View | Diff

Attachments on bug 143912: 42854 | 42915 | 42916 | 43416