extend-if-key-in-array-syntax.patch

   1 ---
   2
   3  doc/help.etx       |   11 ++---------
   4  source/interpret.c |   41 ++++++++++++++++++++++++++++++++++++++++-
   5  source/interpret.h |    1 +
   6  source/parse.y     |   12 ++++++++++--
   7  4 files changed, 53 insertions(+), 12 deletions(-)
   8
   9 diff --quilt old/source/interpret.c new/source/interpret.c
  10 --- old/source/interpret.c
  11 +++ new/source/interpret.c
  12 @@ -143,10 +143,11 @@ static int anonArrayIndexVal(void);
  13  static int anonArrayClose(void);
  14  static int namedArg1(void);
  15  static int namedArgN(void);
  16  static int namedArg1orN(Boolean isFirst);
  17  static int swapTop2(void);
  18 +static int arrayIndex(void);
  19  static int makeArrayKeyFromArgs(int nArgs, char **keyString, int leaveParams);
  20  static void freeSymbolTable(Symbol *symTab);
  21  static int errCheck(const char *s);
  22  static int execError(const char *s1, const char *s2);
  23  static rbTreeNode *arrayEmptyAllocator(void);
  24 @@ -235,10 +236,11 @@ static int (*OpFns[N_OPS])() = {returnNo
  25      arrayRefAndAssignSetup, pushArgVal, pushArgCount, pushArgArray,
  26      anonArrayOpen, anonArraySkip, anonArrayNextVal, anonArrayIndexVal,
  27      anonArrayClose, namedArg1, namedArgN, swapTop2,
  28      callSubroutineStackedN,
  29      unpackArrayToArgs,
  30 +    arrayIndex,
  31      };
  32
  33  /* Stack-> symN-sym0(FP), nArgs, oldFP, retPC, argArray, argN-arg1, next, ... */
  34  #define FP_ARG_COUNT_INDEX (-1)
  35  #define FP_FUNCTION_NAME   (-2) /* !! */
  36 @@ -1758,10 +1760,45 @@ static int assign(void)
  37      }
  38      return STAT_OK;
  39  }
  40
  41  /*
  42 +**
  43 +** Before: Prog->  [nDim], next, ...
  44 +**         TheStack-> [indnDim, ... ind1], next, ...
  45 +** After:  Prog->  nDim, [next], ...
  46 +**         TheStack-> kayValue, next, ...
  47 +*/
  48 +static int arrayIndex(void)
  49 +{
  50 +    int errNum;
  51 +    char *keyString = NULL;
  52 +    DataValue keyData;
  53 +    int nDim;
  54 +
  55 +    nDim = PC->value;
  56 +    PC++;
  57 +
  58 +    DISASM_RT(PC-2, 2);
  59 +    STACKDUMP(nDim+3, 3);
  60 +
  61 +    /* the next nDim stack entries form the index */
  62 +    errNum = makeArrayKeyFromArgs(nDim, &keyString, False);
  63 +    if (errNum != STAT_OK) {
  64 +        return errNum;
  65 +    }
  66 +
  67 +    keyData.tag = STRING_TAG;
  68 +    keyData.val.str.rep = keyString;
  69 +    keyData.val.str.len = strlen(keyString);
  70 +
  71 +    PUSH(keyData)
  72 +
  73 +    return STAT_OK;
  74 +}
  75 +
  76 +/*
  77  ** copy the top value of the stack
  78  ** Before: TheStack-> value, next, ...
  79  ** After:  TheStack-> value, value, next, ...
  80  */
  81  static int dupStack(void)
  82 @@ -3722,10 +3759,11 @@ static void disasmInternal(Inst *inst, i
  83          "NAMED_ARG1",                   /* namedArg1: "fn([...]=..., ...)" */
  84          "NAMED_ARGN",                   /* namedArgN: "fn(..., [...]=...)" */
  85          "SWAP_TOP2",                    /* swapTop2: cf namedArgN */
  86          "SUBR_CALL_STACKED_N",          /* callSubroutineStackedN */
  87          "UNPACKTOARGS",                 /* unpackArrayToArgs */
  88 +        "ARRAY_INDEX",                  /* arrayIndex */
  89      };
  90      int i, j;
  91
  92      for (i = 0; i < nInstr; ++i) {
  93          printd("Prog %8p", &inst[i]);
  94 @@ -3782,11 +3820,12 @@ static void disasmInternal(Inst *inst, i
  95                  else if (j == OP_ARRAY_REF ||
  96                           j == OP_ARRAY_DELETE ||
  97                           j == OP_ARRAY_ASSIGN ||
  98                           j == OP_ANONARRAY_INDEX_VAL ||
  99                           j == OP_NAMED_ARG1 ||
 100 -                         j == OP_NAMED_ARGN) {
 101 +                         j == OP_NAMED_ARGN ||
 102 +                         j == OP_ARRAY_INDEX) {
 103                      printd(" nDim=%d", inst[i+1].value);
 104                      ++i;
 105                  }
 106                  else if (j == OP_ARRAY_REF_ASSIGN_SETUP) {
 107                      printd(" binOp=%s nDim=%d",
 108 diff --quilt old/source/interpret.h new/source/interpret.h
 109 --- old/source/interpret.h
 110 +++ new/source/interpret.h
 111 @@ -52,10 +52,11 @@ enum operations {OP_RETURN_NO_VAL, OP_RE
 112      OP_ANONARRAY_OPEN, OP_ANONARRAY_SKIP, OP_ANONARRAY_NEXT_VAL,
 113      OP_ANONARRAY_INDEX_VAL, OP_ANONARRAY_CLOSE,
 114      OP_NAMED_ARG1, OP_NAMED_ARGN, OP_SWAP_TOP2,
 115      OP_SUBR_CALL_STACKED_N,
 116      OP_UNPACKTOARGS,
 117 +    OP_ARRAY_INDEX,
 118      N_OPS};
 119
 120  enum typeTags {NO_TAG, INT_TAG, STRING_TAG, ARRAY_TAG};
 121
 122  enum execReturnCodes {MACRO_TIME_LIMIT, MACRO_PREEMPT, MACRO_DONE, MACRO_ERROR};
 123 diff --quilt old/source/parse.y new/source/parse.y
 124 --- old/source/parse.y
 125 +++ new/source/parse.y
 126 @@ -462,18 +462,26 @@ numexpr:      '(' blank expr blank ')'
 127              }
 128              | SYMBOL incrdecr %prec INCR {
 129                  ADD_OP(OP_PUSH_SYM); ADD_SYM($1); ADD_OP(OP_DUP);
 130                  ADD_OP($2); ADD_OP(OP_ASSIGN); ADD_SYM($1);
 131              }
 132 -            | numexpr IN blank numexpr {
 133 +            | keyinexpr IN blank numexpr {
 134                  ADD_OP(OP_IN_ARRAY);
 135              }
 136 -            | numexpr NOT IN blank numexpr %prec IN {
 137 +            | keyinexpr NOT IN blank numexpr %prec IN {
 138                  ADD_OP(OP_IN_ARRAY);
 139                  ADD_OP(OP_NOT);
 140              }
 141              ;
 142 +keyinexpr: numexpr
 143 +           | blank '[' arglist ']' blank {
 144 +                /* build the index from arglist and push to stack */
 145 +                ADD_OP(OP_ARRAY_INDEX);
 146 +                ADD_IMMED($3);
 147 +           }
 148 +           ;
 149 +
 150  while:  WHILE blank {
 151              $$ = GetPC(); StartLoopAddrList();
 152          }
 153          ;
 154  do:     DO blank {
 155 diff --quilt old/doc/help.etx new/doc/help.etx
 156 --- old/doc/help.etx
 157 +++ new/doc/help.etx
 158 @@ -2329,22 +2329,15 @@ Macro Language
 159    $sub_sep as the separator.
 160
 161    You can also check for the existence of multi-dimensional array by
 162    looking for $sub_sep in the key.
 163
 164 -  Last, you need $sub_sep if you want to use the 'in' keyword.
 165 +  If you want to use the 'in' keyword, use this syntax:
 166
 167 -      if ((1,2) in myArray)
 168 +      if ([1,2] in myArray)
 169        {..}
 170
 171 -  doesn't work, but
 172 -
 173 -      if (("1" $sub_sep "2") in myArray)
 174 -      {..}
 175 -
 176 -  does work.
 177 -
 178    Note that if an array contains a value that is itself an array, you can
 179    apply the index operator more than once. For example
 180
 181        subarray["a"] = "value"
 182        mainarray[1] = subarray