Changeset bfc7e45 in tol

Timestamp:

Nov 29, 2012, 10:25:14 AM (14 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

11ed08d

Parents:

a51383f

Message:

refs #1520: porting changeset [5298]

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

Files:

• tol/init.cpp (modified) (9 diffs)
• tol/stdlib/TolPackage/client.tol (modified) (1 diff)
• tol/tol_init.h (modified) (1 diff)
• tolbase/lib/toltk/init_toltk.tcl (modified) (2 diffs)
• tolbase/lib/toltk/project.tcl (modified) (1 diff)
• tolsh/tolsh.vfs/lib/app-tolsh/tolsh.tcl (modified) (3 diffs)
• toltcl/OTAN/ToltclLinux32/lib/toltcl/libtoltcl3.2.so (modified) (previous)
• toltcl/generic/toltcl.c (modified) (2 diffs)

tol/init.cpp

@@ -1201 +1201 @@
 
 //--------------------------------------------------------------------
-  bool InitTOLFile(const char* str)
+bool InitTOLFile(const char* str, bool loadDefaultPackages)
 //--------------------------------------------------------------------
 {
@@ -1213 +1213 @@
     Std(I2("\nLoading standard TOL library ",
            "\nCargando la libreria estandar de TOL ") + txt +"\n");
+    if ( loadDefaultPackages )
+      {
+      GraReal()->EvaluateExpr( "Real __NODEFAULTPACKAGES=0;" );
+      }
+    else
+      {
+      GraReal()->EvaluateExpr( "Real __NODEFAULTPACKAGES=1;" );
+      }
     initTol_ = GraSet()->EvaluateExpr(Out()+"Set InitTol = Include(\""+txt+"\")");
     if(initTol_) 
@@ -1246 +1254 @@
 
 //--------------------------------------------------------------------
-void LoadInitLibrary(int loadInitProject)
+void LoadInitLibrary(int loadInitProject, int loadDefaultPackages)
 //--------------------------------------------------------------------
 {
@@ -1256 +1264 @@
   if (initTolPath.Exist()) 
   {
-    InitTOLFile(initTolPath.Name());
+    InitTOLFile(initTolPath.Name(), loadDefaultPackages);
     if(loadInitProject)
     {
@@ -1526 +1534 @@
   BList* stack = NIL;
   bool loadInitProject = true;
+  bool loadDefaultPackages = true;
   if(!helpMode) {
     BInt i = 1;
@@ -1538 +1547 @@
         BText par = arg.SubString(2,arg.Length()-1);
              if  (arg == "-np") { loadInitProject=false; }
+        else if  (arg == "-ndp") { loadDefaultPackages=false;}
         else if  (com == 'v') { ChangeVerboseMode(arg.String()+1); }
         else if  (com == 'm') { ChangeVerboseMode(arg.String()+1); }
@@ -1549 +1559 @@
         {
           InitGrammars(argv[0]);
-          if(initTOL) { LoadInitLibrary(loadInitProject); }
+          if(initTOL) { LoadInitLibrary(loadInitProject,loadDefaultPackages); }
           Trace(I2("\nCompiling command line argument -c :\n",
                    "\nCompilando argumento -c de la línea de comandos :\n  ") + par+"\n");
@@ -1579 +1589 @@
       {
         InitGrammars(argv[0]);
-        if(initTOL) { LoadInitLibrary(loadInitProject); }
+        if(initTOL) { LoadInitLibrary(loadInitProject,loadDefaultPackages); }
         if(arg.HasName()) {
           BText fName = argv[i];
@@ -1683 +1693 @@
     InitGrammars(argv[0]);
     aliveObjects_1 = AliveObjects();
-    if(initTOL) { LoadInitLibrary(loadInitProject); }
+    if(initTOL) { LoadInitLibrary(loadInitProject,loadDefaultPackages); }
     aliveObjects_2 = AliveObjects();
     BOut::PutAllTerm(BTRUE);

tol/stdlib/TolPackage/client.tol

@@ -261 +261 @@
   ////////////////////////////////////////////////////////////////////////////
   {
-    Set toRequire = Select(_.defaultPackages, Real(Set elem) { elem[2] });
+    Real tryDefaults = If( ObjectExist("Real", "__NODEFAULTPACKAGES"),
+                           Not(__NODEFAULTPACKAGES), 1 );
+    Set toRequire = Select(_.defaultPackages, Real(Set elem) 
+                           { And(tryDefaults, elem[2]) });
     Set done = EvalSet( toRequire, Real ( Set elem ) {
         NameBlock Require( elem[1] );

tol/tol_init.h

@@ -35 +35 @@
 TOL_API void  InitCint              ();
 TOL_API void  InitializeFromMainArgs(int argc, char *argv[], char *env[]);
-TOL_API void  LoadInitLibrary       (int loadInitProject);
+TOL_API void  LoadInitLibrary       (int loadInitProject, int loadDefaultPackages);
 TOL_API void  InitTolKernel         (char* calledProgram, int lang, const char* vmode);
 

tolbase/lib/toltk/init_toltk.tcl

@@ -295 +295 @@
 namespace import project::*
 set project::data(iniproject) 1
+set project::data(defaultpackages) 1
 set state ""
 set project::data(-project) $toltk_script_path
@@ -305 +306 @@
       -np {
         set project::data(iniproject) 0
+      }
+      -ndp {
+        set project::data(defaultpackages) 0
       }
       -project {

tolbase/lib/toltk/project.tcl

@@ -172 +172 @@
     set iniproject ""
   }
-  tol::initlibrary $initol
+  tol::initlibrary -initproject $initol -defaultpackages $data(defaultpackages)
   if { $iniproject ne "" } {
     # incluyo _iniproject.tol relativo a -project

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

@@ -33 +33 @@
   set options(initlib) 1
   set options(iniproject) 1
+  set options(defaultpackages) 1
   set options(compile) ""
   set options(vmode)   ""
@@ -95 +96 @@
         # 
         set options(initlib) 0
-      } elseif {$opt eq "np"} {
+      } elseif {$opt eq "ndp"} {
+        set options(defaultpackages) 0
+      }  elseif {$opt eq "np"} {
         set options(iniproject) 0
       } elseif {[string index $opt 0] eq "c"} {
@@ -402 +405 @@
 
     if {$options(initlib)} {
-      tol::initlibrary $options(iniproject)
+      tol::initlibrary -initproject $options(iniproject) \
+          -defaultpackages $options(defaultpackages)
     }
     # why should I do that?

toltcl/generic/toltcl.c

@@ -345 +345 @@
      Tcl_Obj *CONST objv[];  /* Argument objects */
 {
-  int loadIni;
-  int status;
-
-  if ( objc != 2 ) {
+  int loadInitProject = 1;
+  int loadDefaultPackages = 1;
+  int i;
+
+  if ( !( objc % 2 ) ) 
+    {
     Tcl_AppendResult(interp, "wrong # args: should be \"",
-                     Tcl_GetString(objv[0]), " 0|1\"", NULL);
-    return TCL_ERROR;
-  }
-  
-  if ( (status = Tcl_GetIntFromObj( interp, objv[1], &loadIni )) == TCL_OK ) {
-    LoadInitLibrary( loadIni );
-  }
-  return status;
+                     Tcl_GetString(objv[0]), " ?-initproject 0|1? ?-defaultpackages 0|1?\"", NULL);
+    return TCL_ERROR;    
+    }
+  for ( i = 1; i < objc; i += 2 )
+    {
+    if ( !strcmp( Tcl_GetString( objv[i] ), "-initproject" ) )
+      {
+      if ( Tcl_GetIntFromObj( interp, objv[i+1], &loadInitProject ) != TCL_OK ) 
+        {
+        Tcl_AppendResult( interp, "wrong value for option \"-initproject\"",
+                          NULL );
+        return TCL_ERROR;
+        }
+      }
+    else if ( !strcmp( Tcl_GetString( objv[i] ), "-defaultpackages" ) )
+      {
+      if ( Tcl_GetIntFromObj( interp, objv[i+1], &loadDefaultPackages ) != TCL_OK ) 
+        {
+        Tcl_AppendResult( interp, "wrong value for option \"-defaultpackages\"",
+                          NULL );
+        return TCL_ERROR;
+        }
+      }
+    else
+      {
+      Tcl_AppendResult( interp, "wrong option \"", 
+                        Tcl_GetString( objv[i] ),
+                        "\", must be: -initproject or -defaultpackages", NULL );
+      return TCL_ERROR;
+      }
+    }
+  LoadInitLibrary( loadInitProject, loadDefaultPackages );
+  return TCL_OK;
 }
 
@@ -1538 +1565 @@
     Tcl_AppendStringsToObj( obj_result, "wrong # args: should be '",
                            Tcl_GetString(objv[0]),
-                           " serieref ?statname ?args??'", NULL );
+                           " serieref ?statname ?args? ?'", NULL );
     tcl_result = TCL_ERROR;
   } else