From 57e3cc9abc8e1c84ff8db642efa69429b66f4e0c Mon Sep 17 00:00:00 2001
From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Sat, 18 Oct 2008 18:43:38 +0200
Subject: [PATCH] pushString: remove unused variables

B.W.

---

Push: !pushString.patch
---
 pushString.patch    | 19 +++++++++++++------
 symbol-lookup.patch | 12 ++++++------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pushString.patch b/pushString.patch
index f3a768a..c257dce 100644
--- a/pushString.patch
+++ b/pushString.patch
@@ -1,10 +1,10 @@
 ---
 
- source/interpret.c |  287 ++++++++++++++++++++++++++++++++++++++---------------
+ source/interpret.c |  289 ++++++++++++++++++++++++++++++++++++++---------------
  source/interpret.h |   17 +--
  source/ops.h       |    1 
  source/parse.y     |   21 ++-
- 4 files changed, 235 insertions(+), 91 deletions(-)
+ 4 files changed, 235 insertions(+), 93 deletions(-)
 
 diff --quilt old/source/interpret.c new/source/interpret.c
 --- old/source/interpret.c
@@ -342,7 +342,14 @@ diff --quilt old/source/interpret.c new/source/interpret.c
  static void dumpVal(DataValue dv)
  {
      switch (dv.tag) {
-@@ -4363,30 +4503,11 @@ static void dumpVal(DataValue dv)
+@@ -4356,37 +4496,16 @@ static void dumpVal(DataValue dv)
+             break;
+         case STRING_TAG:
+             {
+-                int k, l;
+-                char s[64];
+                 const char *src = dv.val.str.rep;
+                 if (!src) {
                      printd(" <%s NULL>", tagToStr(STRING_TAG));
                  }
                  else {
@@ -378,7 +385,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
                  }
              }
              break;
-@@ -4449,6 +4570,16 @@ static void dumpInst(Inst *inst, const c
+@@ -4449,6 +4568,16 @@ static void dumpInst(Inst *inst, const c
          printd(" <%s %d>", name, inst->val.immed);
          break;
  
@@ -395,7 +402,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
      case BRANCH_INST:
          printd(" <%s %+td:%8p>", name,
                  inst->val.branch, inst + inst->val.branch);
-@@ -4502,10 +4633,6 @@ static void disasmInternal(Inst *inst, i
+@@ -4502,10 +4631,6 @@ static void disasmInternal(Inst *inst, i
              case OP_ASSIGN:
                  CHECK_OPERANDS(1, SYM_INST);
                  dumpInst(&inst[i+1], NULL);
@@ -406,7 +413,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
                  ++i;
                  break;
  
-@@ -4515,6 +4642,12 @@ static void disasmInternal(Inst *inst, i
+@@ -4515,6 +4640,12 @@ static void disasmInternal(Inst *inst, i
                  ++i;
                  break;
  
diff --git a/symbol-lookup.patch b/symbol-lookup.patch
index 09b13b9..9ae5077 100644
--- a/symbol-lookup.patch
+++ b/symbol-lookup.patch
@@ -463,7 +463,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
          valPtr->tag = NO_TAG;
      }
  
-@@ -4586,7 +4495,7 @@ static void dumpInst(Inst *inst, const c
+@@ -4584,7 +4493,7 @@ static void dumpInst(Inst *inst, const c
          break;
  
      case SYM_INST:
@@ -472,7 +472,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
          break;
  
      default:
-@@ -4811,11 +4720,6 @@ static void stackdumpframe(DataValue *ar
+@@ -4809,11 +4718,6 @@ static void stackdumpframe(DataValue *ar
      DataValue *endDv = (arg1 > outpt) ? arg1 : outpt;
      int nArgs = FP_GET_ARG_COUNT(fp);
  
@@ -484,7 +484,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
  #ifdef DEBUG_STACK_HEADFIRST
  #else
      /* do caller's frame */
-@@ -4824,17 +4728,6 @@ static void stackdumpframe(DataValue *ar
+@@ -4822,17 +4726,6 @@ static void stackdumpframe(DataValue *ar
  #endif /* #ifdef DEBUG_STACK_HEADFIRST */
  
      /* do current frame */
@@ -502,7 +502,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
  
      /* output instructions between endDv and sp - 1 inclusive */
  #ifdef DEBUG_STACK_HEADFIRST
-@@ -4845,7 +4738,6 @@ static void stackdumpframe(DataValue *ar
+@@ -4843,7 +4736,6 @@ static void stackdumpframe(DataValue *ar
  #endif /* #ifdef DEBUG_STACK_HEADFIRST */
      {
          const char *posFmt = "%-6s";
@@ -510,7 +510,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
  
          char *pos = "";
          char buffer[sizeof(STACK_DUMP_ARG_PREFIX) + TYPE_INT_STR_SIZE(int)];
-@@ -4869,10 +4761,6 @@ static void stackdumpframe(DataValue *ar
+@@ -4867,10 +4759,6 @@ static void stackdumpframe(DataValue *ar
                      sprintf(pos = buffer, STACK_DUMP_ARG_PREFIX "%d",
                              offset + FP_TO_ARGS_DIST + nArgs + 1);
                  }
@@ -521,7 +521,7 @@ diff --quilt old/source/interpret.c new/source/interpret.c
                  else if (offset == 0) {
                      pos = "FrameP";
                  }
-@@ -4880,17 +4768,6 @@ static void stackdumpframe(DataValue *ar
+@@ -4878,17 +4766,6 @@ static void stackdumpframe(DataValue *ar
          }
          printd(posFmt, pos);
  
-- 
2.11.4.GIT