Support embedding into rank 3 tensors

1 files changed, 8 insertions, 4 deletions

diff --git a/indexinglanguage/src/main/javacc/IndexingParser.jj b/indexinglanguage/src/main/javacc/IndexingParser.jj
index 42bbd26cee6..a3b4039408a 100644
--- a/indexinglanguage/src/main/javacc/IndexingParser.jj
+++ b/indexinglanguage/src/main/javacc/IndexingParser.jj
@@ -37,7 +37,6 @@ import com.yahoo.language.Linguistics;
 
 /**
  * @author Simon Thoresen Hult
- * @version $Id$
  */
 public class IndexingParser {
 
@@ -386,11 +385,16 @@ Expression echoExp() : { }
 
 Expression embedExp() :
 {
-    String val = "";
+    String embedderId = "";
+    String embedderArgument;
+    List<String> embedderArguments = new ArrayList<String>();
 }
 {
-    ( <EMBED> [ LOOKAHEAD(2) val = identifier() ] )
-    { return new EmbedExpression(embedders, val); }
+    (
+      <EMBED> [ LOOKAHEAD(2) embedderId = identifier() ]
+      ( LOOKAHEAD(2) embedderArgument = identifier() { embedderArguments.add(embedderArgument); } )*
+    )
+    { return new EmbedExpression(embedders, embedderId, embedderArguments); }
 }
 
 Expression exactExp() : { }