drop-SUBR_TAG.patch

   1 ---
   2
   3  source/interpret.c |   33 +--------------------------------
   4  source/interpret.h |    3 +--
   5  source/macro.c     |   21 +++++++--------------
   6  3 files changed, 9 insertions(+), 48 deletions(-)
   7
   8 diff --quilt old/source/interpret.c new/source/interpret.c
   9 --- old/source/interpret.c
  10 +++ new/source/interpret.c
  11 @@ -342,7 +342,6 @@ int AddSym(Symbol *sym, char **msg)
  12         *msg = "macro too large";
  13         return 0;
  14      }
  15 -    sym->added = 1;
  16      ProgP->type = SYM_INST;
  17      ProgP->val.sym = sym;
  18      ProgP++;
  19 @@ -946,7 +945,6 @@ Symbol *InstallSymbol(const char *name,
  20      strcpy(s->name, name);
  21      s->type = type;
  22      s->value = value;
  23 -    s->added = 0;
  24      s->hash = hashName(s->name);
  25      if (type == LOCAL_SYM) {
  26         s->next = LocalSymList;
  27 @@ -971,7 +969,7 @@ Symbol *PromoteToGlobal(Symbol *sym)
  28  {
  29      Symbol *s;
  30
  31 -    if (sym->type != LOCAL_SYM || sym->added)
  32 +    if (sym->type != LOCAL_SYM)
  33         return sym;
  34
  35      /* Remove sym from the local symbol list */
  36 @@ -1587,11 +1585,6 @@ static int pushSymVal(void)
  37          if (!s->value.val.subr(FocusWindow, NULL, 0, &symVal, &errMsg)) {
  38              EXEC_ERROR(errMsg, s->name);
  39          }
  40 -    } else if (s->type == C_FUNCTION_SYM
  41 -            || s->type == MACRO_FUNCTION_SYM
  42 -            || s->type == ACTION_ROUTINE_SYM) {
  43 -        symVal.tag = SUBR_TAG;
  44 -        symVal.val.sym = s;
  45      } else
  46          EXEC_ERROR("reading non-variable: %s", s->name);
  47      if (symVal.tag == NO_TAG && !inTypeOfMode) {
  48 @@ -2686,27 +2679,12 @@ static int callSubroutineFromSymbol(Symb
  49      DataValue argArray = noValue;
  50      Program *prog;
  51      int haveNamedArgs = (nArgs < 0);
  52 -    DataValue *symValPtr = NULL;
  53
  54      if (haveNamedArgs) {
  55          nArgs = -nArgs - 1;
  56          POP(argArray);
  57      }
  58
  59 -    if (sym->type == LOCAL_SYM) {
  60 -        symValPtr = &FP_GET_SYM_VAL(FrameP, sym);
  61 -    } else if (sym->type == GLOBAL_SYM) {
  62 -        symValPtr = &sym->value;
  63 -    }
  64 -    if (symValPtr) {
  65 -        if (symValPtr->tag == SUBR_TAG) {
  66 -            sym = symValPtr->val.sym;
  67 -        } else {
  68 -            EXEC_ERROR("%s is not a variable holding a subroutine pointer",
  69 -                    sym->name);
  70 -        }
  71 -    }
  72 -
  73      /*
  74      ** If the subroutine is built-in, call the built-in routine
  75      */
  76 @@ -2909,7 +2887,6 @@ int OverlayRoutineFromProg(Program *prog
  77      strcpy(sym->name, prog->name);
  78      sym->value.val.prog = prog;
  79      sym->next = NULL;
  80 -    sym->added = 0;
  81
  82      ret = OverlayRoutineFromSymbol(sym, nArgs, removeArgs);
  83
  84 @@ -4095,9 +4072,6 @@ static int typeOfOut(void)
  85          case ARRAY_TAG:
  86              retVal.val.str.rep = PERM_ALLOC_STR("ARRAY");
  87              break;
  88 -        case SUBR_TAG:
  89 -            retVal.val.str.rep = PERM_ALLOC_STR("SUBROUTINE");
  90 -            break;
  91      }
  92      retVal.val.str.len = strlen(retVal.val.str.rep);
  93
  94 @@ -4348,8 +4322,6 @@ static const char *tagToStr(enum typeTag
  95              return "string";
  96          case ARRAY_TAG:
  97              return "array";
  98 -        case SUBR_TAG:
  99 -            return "subroutine";
 100          case NO_TAG:
 101          default:
 102              return "no value";
 103 @@ -4492,9 +4464,6 @@ static void dumpVal(DataValue dv)
 104              printd("<%s:%u %08p>", tagToStr(ARRAY_TAG), ArraySize(&dv),
 105                      dv.val.arrayPtr);
 106              break;
 107 -        case SUBR_TAG:
 108 -            printd("<%s %s>", tagToStr(SUBR_TAG), dv.val.sym->name);
 109 -            break;
 110          case NO_TAG:
 111              if (!dv.val.inst) {
 112                  printd("<%s>", tagToStr(NO_TAG));
 113 diff --quilt old/source/interpret.h new/source/interpret.h
 114 --- old/source/interpret.h
 115 +++ new/source/interpret.h
 116 @@ -50,7 +50,7 @@ enum operations {
 117      N_OPS
 118  };
 119
 120 -enum typeTags {NO_TAG, INT_TAG, STRING_TAG, ARRAY_TAG, SUBR_TAG};
 121 +enum typeTags {NO_TAG, INT_TAG, STRING_TAG, ARRAY_TAG};
 122
 123  enum execReturnCodes {MACRO_TIME_LIMIT, MACRO_PREEMPT, MACRO_DONE, MACRO_ERROR};
 124
 125 @@ -106,7 +106,6 @@ typedef struct SparseArrayEntryTag {
 126  typedef struct SymbolRec {
 127      enum symTypes type;
 128      DataValue value;
 129 -    int added;
 130      unsigned int hash;
 131      struct SymbolRec *next;     /* to link to another */
 132      char name[1];
 133 diff --quilt old/source/macro.c new/source/macro.c
 134 --- old/source/macro.c
 135 +++ new/source/macro.c
 136 @@ -3816,24 +3816,20 @@ static int callMS(WindowInfo *window, Da
 137          int nArgs, DataValue *result, char **errMsg)
 138  {
 139      Symbol *sym;
 140 +    char stringStorage[TYPE_INT_STR_SIZE(int)];
 141 +    char *fnname;
 142
 143      if (nArgs < 1) {
 144          *errMsg = "subroutine %s called without arguments";
 145          return False;
 146      }
 147 -    if (argList[0].tag == SUBR_TAG) {
 148 -        sym = argList[0].val.sym;
 149 -    } else {
 150 -        char stringStorage[TYPE_INT_STR_SIZE(int)];
 151 -        char *fnname;
 152 -
 153 -        if (!readStringArg(argList[0], &fnname, stringStorage, errMsg)) {
 154 -            return False;
 155 -        }
 156
 157 -        sym = LookupSymbol(fnname);
 158 +    if (!readStringArg(argList[0], &fnname, stringStorage, errMsg)) {
 159 +        return False;
 160      }
 161
 162 +    sym = LookupSymbol(fnname);
 163 +
 164      if (!sym) {
 165          *errMsg = "subroutine name invalid";
 166          return False;
 167 @@ -3843,7 +3839,7 @@ static int callMS(WindowInfo *window, Da
 168  }
 169
 170  /*
 171 - * subr = define(func_name, func_body[, "override"])
 172 + * define(func_name, func_body[, "override"])
 173   */
 174  static int defineMS(WindowInfo *window, DataValue *argList, int nArgs,
 175          DataValue *result, char **errMsg)
 176 @@ -3932,9 +3928,6 @@ static int defineMS(WindowInfo *window,
 177          sym = InstallSymbol(name, MACRO_FUNCTION_SYM, subrPtr);
 178      }
 179
 180 -    result->tag = SUBR_TAG;
 181 -    result->val.sym = sym;
 182 -
 183      return True;
 184  }
 185