svn commit: r947690 - /cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g

[eevans]

Author: eevans
Date: Mon May 24 16:01:30 2010
New Revision: 947690

URL: http://svn.apache.org/viewvc?rev=947690&view=rev
Log:
support all legal keyspace and column names in cli

Patch by eevans for CASSANDRA-1005

Modified:
    cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g

Modified: 
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g?rev=947690&r1=947689&r2=947690&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g 
(original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/Cli.g 
Mon May 24 16:01:30 2010
@@ -146,9 +146,9 @@ columnFamilyExpr
       -> ^(NODE_COLUMN_ACCESS table columnFamily rowKey ($a+)?)
     ;
 
-table: Identifier;
+table: (Identifier | IntegerLiteral);
 
-columnFamily: Identifier;
+columnFamily: (Identifier | IntegerLiteral);
 
 rowKey:   StringLiteral;
 
@@ -208,9 +208,12 @@ Alnum
     | Digit
     ;
 
+IntegerLiteral
+   : Digit+;
+
 // syntactic Elements
 Identifier
-    : Letter ( Alnum | '_' | '-' )*
+    : Alnum ( Alnum | '_' | '-' )*
     ;
 
 // literals
@@ -219,10 +222,6 @@ StringLiteral
     '\'' (~'\'')* '\'' ( '\'' (~'\'')* '\'' )* 
     ;
 
-
-IntegerLiteral
-   : Digit+;
-
 //
 // syntactic elements
 //