f0004

bintree.h

@@ -15,16 +15,10 @@
  *
  */
 
-#ifndef __BINTREE_H__
-#define __BINTREE_H__
-
 #include "lstring.h"
 
-#ifdef __BINTREE_C__
-# define EXTERN
-#else
-# define EXTERN extern
-#endif
+#ifndef __BINTREE_H__
+#define __BINTREE_H__
 
 #define BALANCE_START 7
 #define BALANCE_INC 8
@@ -59,5 +53,4 @@ void __CDECL BinDel( BinTree *tree, PLstr name,
 void __CDECL BinPrint( PBinLeaf leaf );
 void __CDECL BinBalance( BinTree *tree );
 
-#undef EXTERN
 #endif

bmem.c

@@ -73,8 +73,9 @@ typedef struct tmemory_st {
  byte data[sizeof(void*)];
 } Memory;
 
-static Memory *mem_head = NULL;
-static long total_mem = 0L;
+#include "context.h"
+#define mem_head ((Memory*)(currentContext->bmem_mem_head))
+#define total_mem (currentContext->bmem_total_mem)
 
 void mem_list(void);
 
@@ -242,7 +243,11 @@ mem_list(void)
   mem_print(count++,mem);
   mem = mem->prev;
   if (++y==15) {
-   if (getchar()=='q') exit(0);
+   if (getchar()=='q')
+   {
+     PopContext();
+     exit(0);
+   }
    y = 0;
   }
  }

builtin.c

@@ -73,9 +73,6 @@
 # include <winfunc.h>
 #endif
 
-/* ------------- External variables ------------ */
-extern Lstr     stemvaluenotfound;      /* from variable.c */
-
 /* -------------------------------------------------------------- */
 /*  ADDRESS()                                                     */
 /* -------------------------------------------------------------- */

changelog.txt

@@ -1,6 +1,8 @@
 BREXX CMS Change LOG
 ====================
 
+
+F0004 - Make Re-entrant
 F0006 - Fix error reading the REXX file actually being interpreted
         Fix when program file not found the extra "STAT" Error message
 F0003 - Fix Issue 1 (SAY - Trailing junk)

compile.c

@@ -67,6 +67,7 @@
 #include "trace.h"
 #include "compile.h"
 #include "nextsymb.h"
+#include "context.h"
 
 /*
 //
@@ -93,16 +94,16 @@ void __CDECL C_template( void );
 TBltFunc* __CDECL C_isBuiltin( PLstr );
 
 /* --- static Variables --- */
-static int str_interpreted; /* is it a string interpreted */
-static int checked_semicolon; /* if instruction has checked the semicolon likeIF */
+#define str_interpreted (currentContext->compile_str_interpreted) /* is it a string interpreted */
+#define checked_semicolon (currentContext->compile_checked_semicolon) /* if instruction has checked the semicolon likeIF */
+#define Loop (currentContext->compile_Loop)
 
 typedef struct loop_st {
  size_t Citerate;
  size_t Cleave;
  int noofvars;
  PLstr ctrlvar;
 } LoopCtrl;
-static DQueue  Loop;
 
 /* ------------ local prototypes ------------ */
 static bool C_instr(bool);
@@ -135,7 +136,8 @@ static void C_trace(void);
 static void C_upper(void);
 
 /* ---------------------------------------------------------- */
-static
+/* because ths is const we shall keep it really global */
+static const
 struct sort_list_st {
  char *name;
  void (*func)(void);

compile.h

@@ -21,21 +21,15 @@
  *
  */
 
-#ifndef __COMPILE_H__
-#define __COMPILE_H__
-
 #ifndef WIN
 # include "bmem.h"
 #endif
 #include "lstring.h"
 #include "bintree.h"
 #include "nextsymb.h"
 
-#ifdef __COMPILE_C__
-# define EXTERN
-#else
-# define EXTERN extern
-#endif
+#ifndef __COMPILE_H__
+#define __COMPILE_H__
 
 /* ----------- local defines --------------- */
 #define UNKNOWN_LABEL  0xFFFF
@@ -64,21 +58,7 @@ typedef struct tfunction {
 } RxFunc;
 
 /* ------------ Global Variables ------------ */
-/* --- Compile Variables --- */
-EXTERN RxFile *CompileRxFile;  /* Rexx file pointer */
-EXTERN byte *CompileCodePtr; /* code pointer  */
-EXTERN PLstr CompileCode;  /* code space  */
-#ifndef ALIGN
-EXTERN word CompileCodeLen;  /* code length  */
-#else
-EXTERN dword CompileCodeLen;  /* code length  */
-#endif
-
-EXTERN Clause *CompileClause;  /* compile clauses */
-EXTERN int CompileCurClause; /* current clause */
-EXTERN int CompileClauseItems; /* maximum clause len */
-
-EXTERN int CompileNesting;  /* current nesting */
+#include "context.h"
 
 /* --------------- rexx options ----------------- */
 enum options_type {
@@ -232,5 +212,4 @@ void  *_Add2Lits( PLstr lit, int hasdot );
 void __CDECL _mustbe( enum symboltype sym, int err, int subno);
 PBinLeaf _AddLabel( int type, size_t position );
 
-#undef EXTERN
 #endif

config.h

@@ -1,7 +1,7 @@
 /* Modified for VM/370 CMS and GCC by Robert O'Hara, July 2010. */
 
 /* The one version to rule them all! */
-#define CMS_VERSION "F0006"
+#define CMS_VERSION "F0004"
 
 #include "rxmvs.h"
 

context.c

@@ -0,0 +1,47 @@
+/* Global Variable Context - for reentrancy */
+#define __CONTEXT_C__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "context.h"
+
+void PopContext()
+{
+  Context *oldContext;
+  /* printf("PopContext()\n"); */
+  if (currentContext) {
+    oldContext = currentContext;
+    currentContext = oldContext->previous;
+    free(oldContext);
+  }
+  else printf("currentContext is null\n");
+}
+
+void PushContext()
+{
+  /* printf("PushContext()\n"); */
+  Context *newContext = malloc(sizeof(Context));
+  newContext->previous = currentContext;
+  currentContext = newContext;
+
+  /* bmem.c */
+  currentContext->bmem_mem_head = NULL;
+  currentContext->bmem_total_mem = 0L;
+
+  /* lstring.h */
+  currentContext->lstring_lLastScannedNumber=0.0;
+#ifdef __CMS__
+  currentContext->lstring_lNumericDigits = 9;
+#else
+  currentContext->lstring_lNumericDigits = LMAXNUMERICDIGITS;
+#endif
+
+  /* ltime.c */
+  currentContext->ltime_elapsed=0.0;
+
+  /* rexxfunc.c */
+  currentContext->rexxfunc_ExtraFuncs = NULL;
+
+}
+
+#undef __CONTEXT_C__