[Oorexx-svn] SF.net SVN: oorexx:[7256] sandbox/jlf

[<jfa...@us...>]

Revision: 7256
          http://oorexx.svn.sourceforge.net/oorexx/?rev=7256&view=rev
Author:   jfaucher
Date:     2011-10-26 07:30:09 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Fixed a crash in relation with RexxContextualSource and GC.
Fixed a crash in hostemu for Windows platform.

Modified Paths:
--------------
    sandbox/jlf/_diary.txt
    sandbox/jlf/trunk/extensions/hostemu/hostemu.h
    sandbox/jlf/trunk/extensions/hostemu/platform/windows/hostemu.cpp
    sandbox/jlf/trunk/interpreter/classes/ContextualSourceClass.cpp

Modified: sandbox/jlf/_diary.txt
===================================================================
--- sandbox/jlf/_diary.txt	2011-10-26 01:09:45 UTC (rev 7255)
+++ sandbox/jlf/_diary.txt	2011-10-26 07:30:09 UTC (rev 7256)
@@ -78,6 +78,16 @@
 
 
 ===============================================================================
+2011 oct 26
+
+Fixed a crash in relation with RexxContextualSource and GC :
+Must mark objectVariables.
+
+Fixed a crash in hostemu for Windows platform :
+Must add RexxEntry in the declaration of GrxHost.
+
+
+===============================================================================
 2011 oct 23
 
 [doers]
@@ -189,6 +199,7 @@
 - ~each must be available on String and MutableBuffer. The result is an array or no result.
   
 In summary :
+(update JLF 23 oct 2011 : the xxxI methods have been removed, the xxxII methods have been renamed xxxI)
                 reduce   reduceC   reduceW   map   mapC   mapW   mapR   mapCR   mapWR   each    eachC    eachW
                 reduceI  reduceCI  reduceWI  mapI  mapCI  mapWI  mapRI  mapCRI  mapWRI  eachI   eachCI   eachWI
                                                                                         eachII  eachCII  eachWII

Modified: sandbox/jlf/trunk/extensions/hostemu/hostemu.h
===================================================================
--- sandbox/jlf/trunk/extensions/hostemu/hostemu.h	2011-10-26 01:09:45 UTC (rev 7255)
+++ sandbox/jlf/trunk/extensions/hostemu/hostemu.h	2011-10-26 07:30:09 UTC (rev 7256)
@@ -51,7 +51,7 @@
 
 int yyparse (
    void);                        /* no arguments                      */
-RexxReturnCode GrxHost(PCONSTRXSTRING command,
+RexxReturnCode REXXENTRY GrxHost(PCONSTRXSTRING command,
                        unsigned short int *flags,
                        PRXSTRING retc);
 

Modified: sandbox/jlf/trunk/extensions/hostemu/platform/windows/hostemu.cpp
===================================================================
--- sandbox/jlf/trunk/extensions/hostemu/platform/windows/hostemu.cpp	2011-10-26 01:09:45 UTC (rev 7255)
+++ sandbox/jlf/trunk/extensions/hostemu/platform/windows/hostemu.cpp	2011-10-26 07:30:09 UTC (rev 7256)
@@ -262,7 +262,7 @@
 /*                                                                    */
 /*--------------------------------------------------------------------*/
 
-RexxReturnCode GrxHost(PCONSTRXSTRING command,
+RexxReturnCode REXXENTRY GrxHost(PCONSTRXSTRING command,
                        unsigned short int *flags,
                        PRXSTRING retc)
    {

Modified: sandbox/jlf/trunk/interpreter/classes/ContextualSourceClass.cpp
===================================================================
--- sandbox/jlf/trunk/interpreter/classes/ContextualSourceClass.cpp	2011-10-26 01:09:45 UTC (rev 7255)
+++ sandbox/jlf/trunk/interpreter/classes/ContextualSourceClass.cpp	2011-10-26 07:30:09 UTC (rev 7256)
@@ -299,6 +299,7 @@
 /* Function:  Normal garbage collection live marking                          */
 /******************************************************************************/
 {
+    memory_mark(this->objectVariables);
     memory_mark(this->sourceLiteral);
     memory_mark(this->context);
 }
@@ -308,6 +309,7 @@
 /* Function:  Generalized object marking                                      */
 /******************************************************************************/
 {
+    memory_mark_general(this->objectVariables);
     memory_mark_general(this->sourceLiteral);
     memory_mark_general(this->context);
 }
@@ -319,6 +321,7 @@
 {
   setUpFlatten(RexxContextualSource)
 
+  flatten_reference(newThis->objectVariables, envelope);
   newThis->sourceLiteral = OREF_NULL; // this never should be getting flattened, so sever the connection
   newThis->context = OREF_NULL;    // idem
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.