hlship 2005/03/08 13:00:06
Modified: . .classpath
framework/src/java/org/apache/hivemind/conditional
Lexer.java
framework/src/test/org/apache/hivemind/conditional
TestLexer.java
src/documentation/content/xdocs conditional.xml
Log:
Allow conditional symbols to include the dash character.
Revision Changes Path
1.51 +0 -1 jakarta-hivemind/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-hivemind/.classpath,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .classpath 1 Mar 2005 20:40:10 -0000 1.50
+++ .classpath 8 Mar 2005 21:00:05 -0000 1.51
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="var" path="CLOVER_RUNTIME"/>
<classpathentry output="framework/target/eclipse-test-classes"
kind="src" path="framework/src/conf"/>
<classpathentry output="framework/target/eclipse-classes" kind="src"
path="framework/src/java"/>
<classpathentry output="framework/target/eclipse-test-classes"
kind="src" path="framework/src/test"/>
1.4 +2 -2
jakarta-hivemind/framework/src/java/org/apache/hivemind/conditional/Lexer.java
Index: Lexer.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/conditional/Lexer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Lexer.java 6 Jan 2005 01:45:15 -0000 1.3
+++ Lexer.java 8 Mar 2005 21:00:05 -0000 1.4
@@ -88,13 +88,13 @@
/**
* This is somewhat limited; a complete regexp would only allow dots
within the text, would not
- * allow consecutive dots, and would require the string start with
letter or underscore.
+ * allow consecutive dots, and would require that the string start with
letter or underscore.
*/
private boolean isSymbolChar(char ch)
{
return (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || (ch
>= '0' && ch <= '9')
- || (ch == '.') || (ch == '_');
+ || (ch == '-') || (ch == '.') || (ch == '_');
}
/**
1.3 +12 -0
jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestLexer.java
Index: TestLexer.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestLexer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestLexer.java 5 Jan 2005 18:05:56 -0000 1.2
+++ TestLexer.java 8 Mar 2005 21:00:05 -0000 1.3
@@ -37,6 +37,18 @@
assertNull(l.next());
}
+ public void testComplexSymbol()
+ {
+ Lexer l = new Lexer("property foo.bar-baz");
+
+ assertSame(TokenType.PROPERTY, l.next().getType());
+
+ Token t = l.next();
+
+ assertSame(TokenType.SYMBOL, t.getType());
+ assertEquals("foo.bar-baz", t.getValue());
+ }
+
public void testParens()
{
Lexer l = new Lexer("not (property foo)");
1.3 +2 -1
jakarta-hivemind/src/documentation/content/xdocs/conditional.xml
Index: conditional.xml
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/src/documentation/content/xdocs/conditional.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- conditional.xml 5 Jan 2005 21:53:31 -0000 1.2
+++ conditional.xml 8 Mar 2005 21:00:05 -0000 1.3
@@ -74,7 +74,8 @@
</p>
<p>
-Symbols are Java identifiers ... they are either JVM system properties or
fully qualified Java class names.
+Symbols are Java identifiers ... they are either JVM system properties or
fully qualified Java class names. In addition, they
+may contain the dash character.
</p>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
