ozeigermann 2004/04/21 01:39:48
Modified: webdavclient/commandline/src/java/org/apache/webdav/cmd
ClientLexer.java ClientParser.java
Log:
sync'ed with Client.g
Revision Changes Path
1.5 +43 -32
jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/ClientLexer.java
Index: ClientLexer.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/ClientLexer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClientLexer.java 1 Apr 2004 08:40:23 -0000 1.4
+++ ClientLexer.java 21 Apr 2004 08:39:48 -0000 1.5
@@ -183,13 +183,13 @@
case 'O': case 'P': case 'Q': case 'R':
case 'S': case 'T': case 'U': case 'V':
case 'W': case 'X': case 'Y': case 'Z':
- case 'a': case 'b': case 'c': case 'd':
- case 'e': case 'f': case 'g': case 'h':
- case 'i': case 'j': case 'k': case 'l':
- case 'm': case 'n': case 'o': case 'p':
- case 'q': case 'r': case 's': case 't':
- case 'u': case 'v': case 'w': case 'x':
- case 'y': case 'z':
+ case '\\': case 'a': case 'b': case 'c':
+ case 'd': case 'e': case 'f': case 'g':
+ case 'h': case 'i': case 'j': case 'k':
+ case 'l': case 'm': case 'n': case 'o':
+ case 'p': case 'q': case 'r': case 's':
+ case 't': case 'u': case 'v': case 'w':
+ case 'x': case 'y': case 'z':
{
mSTRING(true);
theRetToken=_returnToken;
@@ -409,6 +409,11 @@
match('+');
break;
}
+ case '\\':
+ {
+ match('\\');
+ break;
+ }
default:
{
throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
@@ -426,6 +431,7 @@
_ttype = STRING;
int _saveIndex;
+ {
switch ( LA(1)) {
case '!': case '#': case '$': case '%':
case '&': case '(': case ')': case '+':
@@ -438,18 +444,18 @@
case 'L': case 'M': case 'N': case 'O':
case 'P': case 'Q': case 'R': case 'S':
case 'T': case 'U': case 'V': case 'W':
- case 'X': case 'Y': case 'Z': case 'a':
- case 'b': case 'c': case 'd': case 'e':
- case 'f': case 'g': case 'h': case 'i':
- case 'j': case 'k': case 'l': case 'm':
- case 'n': case 'o': case 'p': case 'q':
- case 'r': case 's': case 't': case 'u':
- case 'v': case 'w': case 'x': case 'y':
- case 'z':
+ case 'X': case 'Y': case 'Z': case '\\':
+ case 'a': case 'b': case 'c': case 'd':
+ case 'e': case 'f': case 'g': case 'h':
+ case 'i': case 'j': case 'k': case 'l':
+ case 'm': case 'n': case 'o': case 'p':
+ case 'q': case 'r': case 's': case 't':
+ case 'u': case 'v': case 'w': case 'x':
+ case 'y': case 'z':
{
mCHARS(false);
{
- _loop106:
+ _loop107:
do {
switch ( LA(1)) {
case '!': case '#': case '$': case '%':
@@ -463,14 +469,14 @@
case 'L': case 'M': case 'N': case 'O':
case 'P': case 'Q': case 'R': case 'S':
case 'T': case 'U': case 'V': case 'W':
- case 'X': case 'Y': case 'Z': case 'a':
- case 'b': case 'c': case 'd': case 'e':
- case 'f': case 'g': case 'h': case 'i':
- case 'j': case 'k': case 'l': case 'm':
- case 'n': case 'o': case 'p': case 'q':
- case 'r': case 's': case 't': case 'u':
- case 'v': case 'w': case 'x': case 'y':
- case 'z':
+ case 'X': case 'Y': case 'Z': case '\\':
+ case 'a': case 'b': case 'c': case 'd':
+ case 'e': case 'f': case 'g': case 'h':
+ case 'i': case 'j': case 'k': case 'l':
+ case 'm': case 'n': case 'o': case 'p':
+ case 'q': case 'r': case 's': case 't':
+ case 'u': case 'v': case 'w': case 'x':
+ case 'y': case 'z':
{
mCHARS(false);
break;
@@ -482,7 +488,7 @@
}
default:
{
- break _loop106;
+ break _loop107;
}
}
} while (true);
@@ -495,13 +501,13 @@
match('"');
text.setLength(_saveIndex);
{
- _loop108:
+ _loop109:
do {
if ((_tokenSet_1.member(LA(1)))) {
matchNot('"');
}
else {
- break _loop108;
+ break _loop109;
}
} while (true);
@@ -516,6 +522,11 @@
throw new NoViableAltForCharException((char)LA(1),
getFilename(), getLine(), getColumn());
}
}
+ }
+ String txt = new String(text.getBuffer(),_begin,text.length()-_begin);
+ txt = txt.replace('\\', '/');
+ text.setLength(_begin); text.append(txt);
+
if ( _createToken && _token==null && _ttype!=Token.SKIP ) {
_token = makeToken(_ttype);
_token.setText(new String(text.getBuffer(), _begin,
text.length()-_begin));
@@ -678,7 +689,7 @@
private static final long[] mk_tokenSet_0() {
long[] data = new long[1025];
data[0]=576403002173161472L;
- data[1]=576460743847706622L;
+ data[1]=576460744116142078L;
return data;
}
public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
1.5 +4 -4
jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/ClientParser.java
Index: ClientParser.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/ClientParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
