Changeset 827eb3c in tol

Timestamp:

Jun 22, 2010, 11:13:17 PM (16 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

7b0030e

Parents:

227444a

Message:

refs #927, trick to ensure tcl code is evaluated before invoking any Curl API

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@2301 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/stdlib/general/system/Curl

Files:

• Curl.tol (modified) (1 diff)
• CurlFunctions.tol (modified) (1 diff)

tol/stdlib/general/system/Curl/Curl.tol

@@ -13 +13 @@
 Set _.autodoc.authors = [[ "josp@tol-project.org" ]];
 
+Text _tclCode = { 
+  Text dir = GetAbsolutePath(".") + "/";
+  Text ReadFile( dir + "TolCurl.tcl" )
+};
+
 #Embed "CurlFunctions.tol"
 ]];
-
-Real {
-  Text dir = GetAbsolutePath(".") + "/";
-  Set tclStatus = Tcl_EvalEx( [[ "source", dir + "TolCurl.tcl" ]] );
-  Real If( Not(tclStatus["status"]), {
-      Error( "Initializing Curl: " + tclStatus["result"] );
-      Real 0
-    } )
-};

tol/stdlib/general/system/Curl/CurlFunctions.tol

@@ -4 +4 @@
 //////////////////////////////////////////////////////////////////////////////
 
+Real _tclCodeLoaded = 0;
+
+Real _InitTclCode( Real void )
+{
+  Real If( _tclCodeLoaded, 1, {
+      Set tclStatus = Tcl_EvalEx( [[ "eval", _tclCode ]] );
+      Real If( tclStatus["status"], _tclCodeLoaded:=1, {
+          Error( "Initializing Curl: " + tclStatus["result"] );
+          Real 0
+        } )
+    } )
+};
+
 Real Get( NameBlock args )
 {
+  // Esta inicializacion deberia desaparecer
+  Real _InitTclCode(?);
+  
   Text url = args::url;
   Text file = args::file;