Changeset b47c991 in tol

Timestamp:

Jun 20, 2011, 1:13:12 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

b50906a

Parents:

f5c1a77

Message:

refs #1259, implementamos el argumento '-np' en tol::initlibrary, interpretamos la opcion -np en tolsh y tolbase

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

Files:

• tolbase/lib/toltk/init_toltk.tcl (modified) (1 diff)
• tolbase/lib/toltk/project.tcl (modified) (1 diff)
• tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl (modified) (5 diffs)
• toltcl/generic/toltcl.c (modified) (1 diff)

tolbase/lib/toltk/init_toltk.tcl

@@ -291 +291 @@
 # Load project
 namespace import project::*
+set project::data(iniproject) 1
 foreach option $argv {
   if { [string equal $option "-b"] } {
     set project::data(oculto) 1
+  } elseif { $option eq "-np" } {
+    set project::data(iniproject) 0
   }
 }

tolbase/lib/toltk/project.tcl

@@ -165 +165 @@
   }
 #   update
-  tol::initlibrary
+  tol::initlibrary $data(iniproject)
   foreach prj $projects(Project,names) {
     set prjname $projects(${prj},name)

tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl

@@ -32 +32 @@
   set options(lang)    0
   set options(initlib) 1
+  set options(iniproject) 1
   set options(compile) ""
   set options(vmode)   ""
@@ -46 +47 @@
 #
 #    -i       --> do not include initLibrary
+#    -np      --> do not load _iniproject.tol
 #    -c"..."  --> compile a tol expression
 #    -c "..." --> compile a tol expression
@@ -92 +94 @@
         # 
         set options(initlib) 0
+      } elseif {$opt eq "np"} {
+        set $options(iniproject) 0
       } elseif {[string index $opt 0] eq "c"} {
         if {[string length $opt]>1} {
@@ -226 +230 @@
   puts {
     -i file  --> include a file but not initLibrary
+    -np      --> do not load _iniproject.tol
     -c"..."  --> compile a tol expression
     -c "..." --> compile a tol expression
@@ -386 +391 @@
 
     if {$options(initlib)} {
-      tol::initlibrary
+      tol::initlibrary $options(iniproject)
     }
 

toltcl/generic/toltcl.c

@@ -317 +317 @@
      Tcl_Obj *CONST objv[];  /* Argument objects */
 {
-  if ( objc != 1 ) {
+  int loadIni;
+  int status;
+
+  if ( objc != 2 ) {
     Tcl_AppendResult(interp, "wrong # args: should be \"",
-                     Tcl_GetString(objv[0]),"\"", NULL);
+                     Tcl_GetString(objv[0]), " 0|1\"", NULL);
     return TCL_ERROR;
   }
-  LoadInitLibrary(1);
-  return TCL_OK;
+  
+  if ( (status = Tcl_GetIntFromObj( interp, objv[1], &loadIni )) == TCL_OK ) {
+    LoadInitLibrary( loadIni );
+  }
+  return status;
 }