[frontierkernel-commits] Frontier/Common/source langevaluate.c,1.3.4.1,1.3.4.2 langpython.c,1.2.4.19,1.2.4.20 langvalue.c,1.5.4.2,1.5.4.3

[David B. <dav...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25884/source

Modified Files:
      Tag: sidewinder-branch
	langevaluate.c langpython.c langvalue.c 
Log Message:
more cleanup -- elimination of callpython in favor of callpythonscript

Index: langvalue.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -C2 -d -r1.5.4.2 -r1.5.4.3
*** langvalue.c	28 Nov 2004 06:51:47 -0000	1.5.4.2
--- langvalue.c	28 Nov 2004 18:30:43 -0000	1.5.4.3
***************
*** 8098,8102 ****
  					return (false);
  				
- 				// 5.0a18 dmb: this probably isn't adequate for osa execution
  				langsetthisvalue (currenthashtable, htable, bsname);
  				
--- 8098,8101 ----

Index: langevaluate.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langevaluate.c,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** langevaluate.c	28 Nov 2004 00:40:47 -0000	1.3.4.1
--- langevaluate.c	28 Nov 2004 18:30:43 -0000	1.3.4.2
***************
*** 1502,1506 ****
  		{false, true},	/*multiplyvalueop*/
  		
! 		{false, true}	/*dividevalueop*/
  		};
  
--- 1502,1508 ----
  		{false, true},	/*multiplyvalueop*/
  		
! 		{false, true},	/*dividevalueop*/
!         
!         {true, nope}    /*pythonscriptop*/
  		};
  
***************
*** 1886,1890 ****
          #ifdef FRONTIER_PYTHON
          case pythonscriptop:
!             return callpython (htree, valtree);
              
          #endif
--- 1888,1893 ----
          #ifdef FRONTIER_PYTHON
          case pythonscriptop:
!             if (ispythonnode (h, &val1))
!                 return callpythonscript (val1, nil, zerostring, valtree, true);
              
          #endif

Index: langpython.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v
retrieving revision 1.2.4.19
retrieving revision 1.2.4.20
diff -C2 -d -r1.2.4.19 -r1.2.4.20
*** langpython.c	28 Nov 2004 08:38:42 -0000	1.2.4.19
--- langpython.c	28 Nov 2004 18:30:43 -0000	1.2.4.20
***************
*** 1697,1707 ****
  }
  
- boolean callpython(hdltreenode htree, tyvaluerecord *vreturned) {
-     boolean result;
-     bigstring bs;
-     copyctopstring("", bs);
-     result = callpythonscript((**htree).nodeval, NULL, bs, vreturned, true);
-     return result;
- }
- 
  #endif
--- 1697,1699 ----