geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r409474 - in /geronimo/sandbox/gshell/trunk/gshell-core: ./ src/main/grammar/ src/main/java/org/apache/geronimo/gshell/commandline/ src/main/java/org/apache/geronimo/gshell/commandline/parser/ src/test/java/org/apache/geronimo/gshell/comman...
Date Thu, 25 May 2006 21:26:26 GMT
Author: jdillon
Date: Thu May 25 14:26:26 2006
New Revision: 409474

URL: http://svn.apache.org/viewvc?rev=409474&view=rev
Log:
Renamed argument to string
Improved testing of comment parsing
Added NodeSupport as a base-class for all AST nodes
Starting to add compound expression support
Using latest JavaCC plugin to get at JavaCC 4

Added:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java
  (with props)
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainString.java
      - copied, changed from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainArgument.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedString.java
      - copied, changed from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedArgument.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTStringSupport.java
      - copied, changed from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTArgumentSupport.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/NodeSupport.java
Removed:
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTArgumentSupport.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueArgument.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainArgument.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedArgument.java
Modified:
    geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/grammar/CommandLineParser.jjt
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
    geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/commandline/parser/CommandLineParserTest.java

Modified: geronimo/sandbox/gshell/trunk/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/pom.xml?rev=409474&r1=409473&r2=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/pom.xml (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/pom.xml Thu May 25 14:26:26 2006
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.0</version>
+                <version>2.1-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <id>jjtree</id>
@@ -103,9 +103,9 @@
                             <tasks>
                                 <delete>
                                     <fileset dir="${pom.basedir}/target/generated-sources/jjtree">
-                                        <include name="ASTPlainArgument.java"/>
-                                        <include name="ASTQuotedArgument.java"/>
-                                        <include name="ASTOpaqueArgument.java"/>
+                                        <include name="ASTPlainString.java"/>
+                                        <include name="ASTQuotedString.java"/>
+                                        <include name="ASTOpaqueString.java"/>
                                     </fileset>
                                 </delete>
                             </tasks>
@@ -113,26 +113,6 @@
                         <goals>
                             <goal>run</goal>
                         </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>${pom.basedir}/target/generated-sources/jjtree</source>
-                                <source>${pom.basedir}/target/generated-sources/javacc</source>
-                            </sources>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/grammar/CommandLineParser.jjt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/grammar/CommandLineParser.jjt?rev=409474&r1=409473&r2=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/grammar/CommandLineParser.jjt (original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/grammar/CommandLineParser.jjt Thu May
25 14:26:26 2006
@@ -17,11 +17,11 @@
 options {
     STATIC = false;
     UNICODE_INPUT = true;
-    OPTIMIZE_TOKEN_MANAGER = true;
     ERROR_REPORTING = true;
     MULTI = true;
     VISITOR = true;
     NODE_DEFAULT_VOID = true;
+    NODE_EXTENDS = "NodeSupport";
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,9 @@
 
 package org.apache.geronimo.gshell.commandline.parser;
 
+import java.io.Reader;
+import java.io.StringReader;
+
 /**
  * Command line parser.
  *
@@ -38,9 +41,15 @@
 public class CommandLineParser
     extends CommandLineParserSupport
 {
-    //
-    // TODO: ???
-    //
+    public CommandLineParser() {
+        this(new StringReader(""));
+    }
+
+    public ASTCommandLine parse(final Reader reader) throws ParseException {
+        this.ReInit(reader);
+
+        return this.commandLine();
+    }
 }
 
 PARSER_END(CommandLineParser)
@@ -66,19 +75,19 @@
 
 SPECIAL_TOKEN :
 {
-  <SINGLE_LINE_COMMENT: "#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")?>
+  < COMMENT: "#" (~["\n", "\r"])* ("\n" | "\r" | "\r\n")? >
 }
 
 //
-// LITERALS
+// STRINGS
 //
 
 TOKEN :
 {
-  < PLAIN_ARGUMENT:
-      (   (~["\"", "\\", " ", "\t", "\n", "\r", "\f"])
+  < STRING:
+      (   (~["\"","\\"," ","\t","\n","\r","\f",";"])
         | ("\\"
-            ( ["n","t","b","r","f","\\","'","\""]
+            ( ["n","t","b","r","f","\\","'","\"",";"]
             | ["0"-"7"] ( ["0"-"7"] )?
             | ["0"-"3"] ["0"-"7"] ["0"-"7"]
             )
@@ -86,7 +95,7 @@
       )+
   >
 |
-  < OPAQUE_ARGUMENT:
+  < OPAQUE_STRING:
       "'"
       (   (~["\"","\\","\n","\r"])
         | ("\\"
@@ -99,7 +108,7 @@
       "'"
   >
 |
-  < QUOTED_ARGUMENT:
+  < QUOTED_STRING:
       "\""
       (   (~["\"","\\","\n","\r"])
         | ("\\"
@@ -113,53 +122,80 @@
   >
 }
 
+//
+// SEPARATORS
+//
+
+TOKEN :
+{
+  < SEMICOLON: ";" >
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 
-ASTCommandLine CommandLine() #CommandLine: {}
+ASTCommandLine commandLine() #CommandLine: {}
+{
+    (
+        expression() ( ";" expression() )* | <EOF>
+    )
+    {
+        return jjtThis;
+    }
+}
+
+void expression() #Expression: {}
 {
-    Expression()
-    { return jjtThis; }
+    ( argument() )+
 }
 
-void Expression() #Expression: {}
+void argument() #void: {}
 {
-    ( Argument() )*
+    string()
+
+    //
+    // TODO: Add variable() to resolve raw $xxx or ${xxx}
+    //       quoted string will have to post parse these values
+    //       into strings, but raw could potentially return object
+    //       references
+    //
 }
 
-void Argument() : {}
+void string() #void: {}
 {
-    QuotedArgument() | OpaqueArgument() | PlainArgument()
+    quotedString() | opaqueString() | plainString()
 }
 
-void QuotedArgument() #QuotedArgument:
+void quotedString() #QuotedString:
 {
     Token t;
 }
 {
-    t=<QUOTED_ARGUMENT>
+    t=<QUOTED_STRING>
     {
         jjtThis.setToken(t);
     }
 }
 
-void OpaqueArgument() #OpaqueArgument:
+void opaqueString() #OpaqueString:
 {
     Token t;
 }
 {
-    t=<OPAQUE_ARGUMENT>
+    t=<OPAQUE_STRING>
     {
         jjtThis.setToken(t);
     }
 }
 
-void PlainArgument() #PlainArgument:
+void plainString() #PlainString:
 {
     Token t;
 }
 {
-    t=<PLAIN_ARGUMENT>
+    t=<STRING>
     {
         jjtThis.setToken(t);
     }
 }
+

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java?rev=409474&r1=409473&r2=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLine.java
Thu May 25 14:26:26 2006
@@ -21,9 +21,12 @@
  *
  * @version $Id: Variables.java 404908 2006-05-08 03:42:51Z jdillon $
  */
-public class CommandLine
+public interface CommandLine
 {
     //
-    // void execute() throws Exception;
+    // TODO: If we descide on returning an Object from a command, then
+    //       this returns an Object too
     //
+    
+    void execute() throws Exception;
 }

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java?rev=409474&r1=409473&r2=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/CommandLineBuilder.java
Thu May 25 14:26:26 2006
@@ -23,4 +23,11 @@
  */
 public class CommandLineBuilder
 {
+    public CommandLine create() {
+        //
+        // TODO:
+        //
+
+        return null;
+    }
 }

Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java?rev=409474&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java
Thu May 25 14:26:26 2006
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.geronimo.gshell.commandline.parser;
+
+/**
+ * Represents an <em>opaque</em> argument.
+ *
+ * @version $Id$
+ */
+public class ASTOpaqueString
+    extends ASTStringSupport
+{
+    public ASTOpaqueString(int id) {
+        super(id);
+    }
+
+    public ASTOpaqueString(CommandLineParser p, int id) {
+        super(p, id);
+    }
+}
\ No newline at end of file

Propchange: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTOpaqueString.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainString.java
(from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainArgument.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainString.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainString.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainArgument.java&r1=409304&r2=409474&rev=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainArgument.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTPlainString.java
Thu May 25 14:26:26 2006
@@ -21,14 +21,14 @@
  *
  * @version $Id$
  */
-public class ASTPlainArgument
-    extends ASTArgumentSupport
+public class ASTPlainString
+    extends ASTStringSupport
 {
-    public ASTPlainArgument(int id) {
+    public ASTPlainString(int id) {
         super(id);
     }
 
-    public ASTPlainArgument(CommandLineParser p, int id) {
+    public ASTPlainString(CommandLineParser p, int id) {
         super(p, id);
     }
 }

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedString.java
(from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedArgument.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedString.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedString.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedArgument.java&r1=409304&r2=409474&rev=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedArgument.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTQuotedString.java
Thu May 25 14:26:26 2006
@@ -21,14 +21,14 @@
  *
  * @version $Id$
  */
-public class ASTQuotedArgument
-    extends ASTArgumentSupport
+public class ASTQuotedString
+    extends ASTStringSupport
 {
-    public ASTQuotedArgument(int id) {
+    public ASTQuotedString(int id) {
         super(id);
     }
 
-    public ASTQuotedArgument(CommandLineParser p, int id) {
+    public ASTQuotedString(CommandLineParser p, int id) {
         super(p, id);
     }
 }

Copied: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTStringSupport.java
(from r409304, geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTArgumentSupport.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTStringSupport.java?p2=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTStringSupport.java&p1=geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTArgumentSupport.java&r1=409304&r2=409474&rev=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTArgumentSupport.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/ASTStringSupport.java
Thu May 25 14:26:26 2006
@@ -17,20 +17,20 @@
 package org.apache.geronimo.gshell.commandline.parser;
 
 /**
- * Support for argument types.
+ * Support for string types.
  *
  * @version $Id$
  */
-public abstract class ASTArgumentSupport
+public abstract class ASTStringSupport
     extends SimpleNode
 {
     protected Token token;
 
-    public ASTArgumentSupport(int id) {
+    public ASTStringSupport(int id) {
         super(id);
     }
 
-    public ASTArgumentSupport(CommandLineParser p, int id) {
+    public ASTStringSupport(CommandLineParser p, int id) {
         super(p, id);
     }
 
@@ -44,11 +44,15 @@
         return token;
     }
 
+    public String getValue() {
+        return getToken().image;
+    }
+
     public Object jjtAccept(CommandLineParserVisitor visitor, Object data) {
         return visitor.visit(this, data);
     }
 
     public String toString() {
-        return super.toString() + "{ " + getToken() + " }";
+        return super.toString() + "( " + getToken() + " )";
     }
 }

Added: geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/NodeSupport.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/NodeSupport.java?rev=409474&view=auto
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/NodeSupport.java
(added)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/main/java/org/apache/geronimo/gshell/commandline/parser/NodeSupport.java
Thu May 25 14:26:26 2006
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.geronimo.gshell.commandline.parser;
+
+/**
+ * Support for nodes.
+ *
+ * @version $Id: Variables.java 404908 2006-05-08 03:42:51Z jdillon $
+ */
+public class NodeSupport
+{
+    //
+    // TODO: ???
+    //
+}

Modified: geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/commandline/parser/CommandLineParserTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/commandline/parser/CommandLineParserTest.java?rev=409474&r1=409473&r2=409474&view=diff
==============================================================================
--- geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/commandline/parser/CommandLineParserTest.java
(original)
+++ geronimo/sandbox/gshell/trunk/gshell-core/src/test/java/org/apache/geronimo/gshell/commandline/parser/CommandLineParserTest.java
Thu May 25 14:26:26 2006
@@ -33,10 +33,10 @@
         assert input != null;
 
         Reader reader = new StringReader(input);
-        CommandLineParser parser = new CommandLineParser(reader);
-        ASTCommandLine cl = parser.CommandLine();
+        CommandLineParser parser = new CommandLineParser();
+        ASTCommandLine cl = parser.parse(reader);
 
-        cl.dump("");
+        cl.dump("> ");
 
         assertNotNull(cl);
 
@@ -51,61 +51,84 @@
         String input = "# this should be completly ignored";
 
         ASTCommandLine cl = parse(input);
+
+        // Children array is lazy created, so when no children this is null
+        assertNull(cl.children);
     }
 
     public void testSingleComment2() throws Exception {
         String input = "####";
 
         ASTCommandLine cl = parse(input);
+
+        // Children array is lazy created, so when no children this is null
+        assertNull(cl.children);
     }
 
     public void testSingleComment3() throws Exception {
         String input = "# ignored; this too";
 
         ASTCommandLine cl = parse(input);
+
+        // Children array is lazy created, so when no children this is null
+        assertNull(cl.children);
     }
 
     //
-    // Arguments
+    // Strings
     //
 
-    public void testArguments1() throws Exception {
+    public void testStrings1() throws Exception {
         String input = "a b c";
 
         ASTCommandLine cl = parse(input);
 
         //
-        // TODO: Verify 3 plain arguments
+        // TODO: Verify 3 plain strings
         //
     }
 
-    public void testArguments2() throws Exception {
+    public void testStrings2() throws Exception {
         String input = "a -b --c d";
 
         ASTCommandLine cl = parse(input);
 
         //
-        // TODO: Verify 4 plain arguments
+        // TODO: Verify 4 plain strings
         //
     }
 
-    public void testQuotedArguments1() throws Exception {
+    public void testQuotedStrings1() throws Exception {
         String input = "a \"b -c\" d";
 
         ASTCommandLine cl = parse(input);
 
         //
-        // TODO: Verify 2 plain arguments + 1 quoted
+        // TODO: Verify 2 plain strings + 1 quoted
         //
     }
 
-    public void testOpaqueArguments1() throws Exception {
+    public void testOpaqueStrings1() throws Exception {
         String input = "a 'b -c' d";
 
         ASTCommandLine cl = parse(input);
 
         //
-        // TODO: Verify 2 plain arguments + 1 opaque
+        // TODO: Verify 2 plain strings + 1 opaque
+        //
+    }
+
+    //
+    // Compound
+    //
+
+    public void testCompoundCommandLine1() throws Exception {
+        String input = "a b c; d e f";
+
+        ASTCommandLine cl = parse(input);
+
+        //
+        // TODO: Verify 2 expressions
         //
     }
 }



Mime
View raw message