You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/09/26 00:16:36 UTC
svn commit: r449838 - in
/incubator/activemq/branches/activemq-4.0/activemq-core/src/main: grammar/
java/org/apache/activemq/selector/
Author: chirino
Date: Mon Sep 25 15:16:35 2006
New Revision: 449838
URL: http://svn.apache.org/viewvc?view=rev&rev=449838
Log:
Regened the selectors again
Modified:
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/grammar/SelectorParser.jj
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/grammar/SelectorParser.jj
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/grammar/SelectorParser.jj?view=diff&rev=449838&r1=449837&r2=449838
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/grammar/SelectorParser.jj (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/grammar/SelectorParser.jj Mon Sep 25 15:16:35 2006
@@ -33,6 +33,23 @@
// ----------------------------------------------------------------------------
PARSER_BEGIN(SelectorParser)
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.activemq.selector;
@@ -568,4 +585,4 @@
{
return left;
}
-}
\ No newline at end of file
+}
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java?view=diff&rev=449838&r1=449837&r2=449838
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/ParseException.java Mon Sep 25 15:16:35 2006
@@ -116,19 +116,19 @@
if (!specialConstructor) {
return super.getMessage();
}
- String expected = "";
+ StringBuffer expected = new StringBuffer();
int maxSize = 0;
for (int i = 0; i < expectedTokenSequences.length; i++) {
if (maxSize < expectedTokenSequences[i].length) {
maxSize = expectedTokenSequences[i].length;
}
for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected += tokenImage[expectedTokenSequences[i][j]] + " ";
+ expected.append(tokenImage[expectedTokenSequences[i][j]]).append(" ");
}
if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
- expected += "...";
+ expected.append("...");
}
- expected += eol + " ";
+ expected.append(eol).append(" ");
}
String retval = "Encountered \"";
Token tok = currentToken.next;
@@ -148,7 +148,7 @@
} else {
retval += "Was expecting one of:" + eol + " ";
}
- retval += expected;
+ retval += expected.toString();
return retval;
}
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java?view=diff&rev=449838&r1=449837&r2=449838
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParser.java Mon Sep 25 15:16:35 2006
@@ -1073,14 +1073,20 @@
private boolean jj_semLA;
public SelectorParser(java.io.InputStream stream) {
- jj_input_stream = new SimpleCharStream(stream, 1, 1);
+ this(stream, null);
+ }
+ public SelectorParser(java.io.InputStream stream, String encoding) {
+ try { jj_input_stream = new SimpleCharStream(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
token_source = new SelectorParserTokenManager(jj_input_stream);
token = new Token();
jj_ntk = -1;
}
public void ReInit(java.io.InputStream stream) {
- jj_input_stream.ReInit(stream, 1, 1);
+ ReInit(stream, null);
+ }
+ public void ReInit(java.io.InputStream stream, String encoding) {
+ try { jj_input_stream.ReInit(stream, encoding, 1, 1); } catch(java.io.UnsupportedEncodingException e) { throw new RuntimeException(e); }
token_source.ReInit(jj_input_stream);
token = new Token();
jj_ntk = -1;
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java?view=diff&rev=449838&r1=449837&r2=449838
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SelectorParserTokenManager.java Mon Sep 25 15:16:35 2006
@@ -926,14 +926,12 @@
private final int[] jjrounds = new int[43];
private final int[] jjstateSet = new int[86];
protected char curChar;
-public SelectorParserTokenManager(SimpleCharStream stream)
-{
+public SelectorParserTokenManager(SimpleCharStream stream){
if (SimpleCharStream.staticFlag)
throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
input_stream = stream;
}
-public SelectorParserTokenManager(SimpleCharStream stream, int lexState)
-{
+public SelectorParserTokenManager(SimpleCharStream stream, int lexState){
this(stream);
SwitchTo(lexState);
}
Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java?view=diff&rev=449838&r1=449837&r2=449838
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java (original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/selector/SimpleCharStream.java Mon Sep 25 15:16:35 2006
@@ -1,4 +1,4 @@
-/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 3.0 */
+/* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 4.0 */
/**
*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -45,6 +45,11 @@
protected char[] buffer;
protected int maxNextCharInd = 0;
protected int inBuf = 0;
+ protected int tabSize = 8;
+
+ protected void setTabSize(int i) { tabSize = i; }
+ protected int getTabSize(int i) { return tabSize; }
+
protected void ExpandBuff(boolean wrapAround)
{
@@ -180,7 +185,7 @@
break;
case '\t' :
column--;
- column += (8 - (column & 07));
+ column += (tabSize - (column % tabSize));
break;
default :
break;
@@ -266,7 +271,7 @@
}
public SimpleCharStream(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
@@ -295,7 +300,7 @@
}
public void ReInit(java.io.Reader dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}
@@ -304,35 +309,68 @@
{
ReInit(dstream, 1, 1, 4096);
}
+ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+ {
+ this(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+ }
+
public SimpleCharStream(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- this(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+ this(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+ }
+
+ public SimpleCharStream(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn) throws java.io.UnsupportedEncodingException
+ {
+ this(dstream, encoding, startline, startcolumn, 4096);
}
public SimpleCharStream(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
this(dstream, startline, startcolumn, 4096);
}
+ public SimpleCharStream(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+ {
+ this(dstream, encoding, 1, 1, 4096);
+ }
+
public SimpleCharStream(java.io.InputStream dstream)
{
this(dstream, 1, 1, 4096);
}
+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn, int buffersize) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(encoding == null ? new java.io.InputStreamReader(dstream) : new java.io.InputStreamReader(dstream, encoding), startline, startcolumn, buffersize);
+ }
+
public void ReInit(java.io.InputStream dstream, int startline,
int startcolumn, int buffersize)
{
- ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, 4096);
+ ReInit(new java.io.InputStreamReader(dstream), startline, startcolumn, buffersize);
+ }
+
+ public void ReInit(java.io.InputStream dstream, String encoding) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(dstream, encoding, 1, 1, 4096);
}
public void ReInit(java.io.InputStream dstream)
{
ReInit(dstream, 1, 1, 4096);
}
+ public void ReInit(java.io.InputStream dstream, String encoding, int startline,
+ int startcolumn) throws java.io.UnsupportedEncodingException
+ {
+ ReInit(dstream, encoding, startline, startcolumn, 4096);
+ }
public void ReInit(java.io.InputStream dstream, int startline,
- int startcolumn)
+ int startcolumn)
{
ReInit(dstream, startline, startcolumn, 4096);
}