Lots of documentation upgrades. Found an edge case in writing and example and fixed it with refgression tests.

Author: gaynor@illinois.edu

.idea/workspace.xml

@@ -85,7 +85,7 @@ protected Object get(State state) {
             throw new IllegalStateException("error: left argument must evaluate to be a stem ");
         }
         StemVariable stemVariable = (StemVariable) r0;
-        IndexList r = stemVariable.get(indexList);
+        IndexList r = stemVariable.get(indexList,true);
         Object result = r.get(0);
         setResult(result);
         setResultType(Constant.getType(result));
@@ -113,7 +113,7 @@ protected void oldWhittle(IndexList indexList){
 
             for (int i = indexList.size() - 1; 0 <= i; i--) {
                 if (indexList.get(i) instanceof StemVariable) {
-                    r = ((StemVariable) indexList.get(i)).get(indexList.tail(i + 1));
+                    r = ((StemVariable) indexList.get(i)).get(indexList.tail(i + 1), false);
                     indexList.truncate(i);
                     indexList.addAll(i, r);
                 }
@@ -134,7 +134,7 @@ protected void newWhittle(IndexList indexList){
                     if(i == indexList.size() - 1 ){
                         continue;
                        }
-                    r = ((StemVariable) indexList.get(i)).get(indexList.tail(i + 1));
+                    r = ((StemVariable) indexList.get(i)).get(indexList.tail(i + 1), false);
                     indexList.truncate(i);
                     indexList.addAll(i, r);
                 }else{

ncsa-qdl/src/main/docs/qdl_reference.odt

@@ -1423,9 +1423,9 @@ public Object get(StemPath<StemPathEntry> stemPath) {
     This is used to overlay the stem in the calling function
     so arguments don't get lost
      */
-    public IndexList get(IndexList indexList) {
+    public IndexList get(IndexList indexList, boolean strictMatching) {
         if (experimental) {
-            return newGet(indexList);
+            return newGet(indexList, strictMatching);
         }
         return oldGet(indexList);
     }
@@ -1484,6 +1484,9 @@ public IndexList oldGet(IndexList indexList) {
     }
 
     public IndexList newGet(IndexList indexList) {
+                                        return newGet(indexList, true);
+    }
+    public IndexList newGet(IndexList indexList, boolean strictMatching) {
         if (indexList.get(indexList.size() - 1) instanceof StemVariable) {
             StemVariable ndx = (StemVariable) indexList.get(indexList.size() - 1);
             if (!ndx.isList()) {
@@ -1527,6 +1530,9 @@ public IndexList newGet(IndexList indexList) {
             if (obj instanceof StemVariable) {
                 currentStem = (StemVariable) obj;
             } else {
+                if(strictMatching && i != indexList.size()-1){
+                    throw new IndexError("error:  scalars do not have indices.");
+                }
                 rc.add(obj); // 0th entry is returned value
                 gotOne = true;
             }

ncsa-qdl/src/main/docs/qdl_scripting.odt

@@ -1127,9 +1127,16 @@ So options = 0 means append, have a trailing delimiter
    options = 1 means prepend, "   "     leading "
    options = 2 means append, omit trailing delimiter
    options = 3 means prepend, omit first delimiter
-E.g. detokenize(indices(4), ' ') yields the string
-'0 1 2 3 '
-(Note the trailing blank added at the end.)
+E.g.
+   detokenize([;4],'|')
+0|1|2|3|
+
+Note the trailing | added at the end.
+E.g.
+   detokenize([;4]], '|',2)
+'0 1 2 3'
+
+omits the trailing |.
 See also: truncate, constants (which contains the option values for reference)
 
                 ]]>
@@ -1680,19 +1687,12 @@ E.g. 1: getting a result set
   price:8.99,
   isbn:0-553-21311-3,...
 
-  Note well that results are returned as stem lists of v paths.
-
-  A v path is a string of the form
-
-  (` | · ) vpath0 (` | · ) vpath1 (` | · )
-
-  whose paths are v-encoded. You may use either a backtick ` or a
-  raised dot · (unicode \u00b7).
+  Note well that results are returned as stem lists of paths.
 
 E.g. 2: Getting the indices
   ndx. := query(test., '$..book[?(@.isbn)]', true); // Just get the indices
   ndx.
-['`store`book`2','`store`book`3']
+[[store,book,2],[store,book,3]]
 
 E.g. 3: Using the indices
    my_json.ndx.0
@@ -1704,7 +1704,6 @@ E.g. 3: Using the indices
 Hint: Easy way to import the JSON is to cut and paste it to a file at /my/path/my_json.json
        and issue
        my_json. := from_json(file_read('/my/path/my_json.json'));
-
                 ]]>
             </body>
         </entry>

ncsa-qdl/src/main/docs/qdl_server_scripts.odt

@@ -1,6 +1,7 @@
 package edu.uiuc.ncsa.qdl;
 
 import edu.uiuc.ncsa.qdl.evaluate.StemEvaluator;
+import edu.uiuc.ncsa.qdl.exceptions.IndexError;
 import edu.uiuc.ncsa.qdl.expressions.ConstantNode;
 import edu.uiuc.ncsa.qdl.expressions.Polyad;
 import edu.uiuc.ncsa.qdl.expressions.VariableNode;
@@ -1509,4 +1510,30 @@ public void testDyadicStemSubtraction() throws Throwable {
     assert getBooleanValue("ok", state);
 }
 
+    public void testExtraIndices() throws Throwable {
+    State state = testUtils.getNewState();
+    StringBuffer script = new StringBuffer();
+    addLine(script, "b. := [;5].2.4;");
+    QDLInterpreter interpreter = new QDLInterpreter(null, state);
+    try {
+        interpreter.execute(script.toString());
+        assert false : "was able to access a non-existant index in a stem";
+    }catch(IndexError ie){
+        assert true;
+    }
+}
+
+    public void testExtraIndices2() throws Throwable {
+     State state = testUtils.getNewState();
+     StringBuffer script = new StringBuffer();
+     addLine(script, "b. := [;5].i(2).i(4);");
+     QDLInterpreter interpreter = new QDLInterpreter(null, state);
+     try {
+         interpreter.execute(script.toString());
+         assert false : "was able to access a non-existant index in a stem";
+     }catch(IndexError ie){
+         assert true;
+     }
+ }
+
 }