Changeset 8593497 in tol for toltcl/generic/toltcl.c

Timestamp:

Feb 13, 2012, 8:12:31 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

d2cf6f7

Parents:

f661cb9

Message:

refs #1429, se chequea por idioma en invocación de initkernel, argumentos válidos son: en (0) o en (1), si el argumento es inválido se invoca InitKernel con -1

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

File:

• toltcl/generic/toltcl.c (modified) (6 diffs)

toltcl/generic/toltcl.c

@@ -215 +215 @@
     return TCL_ERROR;
   }
-  lang = (objc == 1 || !strcasecmp("es", Tcl_GetString(objv[1])));
-  vmode = objc == 3 ? Tcl_GetString(objv[2]) :  NULL;
+  if ( objc >= 2 ) {
+    if ( !strcasecmp("es", Tcl_GetString( objv[1] ) ) ) {
+      lang = 1;
+    } else if ( !strcasecmp("en", Tcl_GetString( objv[1] ) ) ) {
+      lang = 0;
+    } else {
+      lang = -1;
+    }
+    if ( objc == 3 ) {
+      vmode = Tcl_GetString( objv[2] );
+    } else {
+      vmode = NULL;
+    }
+  } else {
+    lang = -1;
+    vmode = NULL;
+  }
 
   if ( !TOLHasBeenInitialized( ) ) {
-    //printf( "TOL no esta inicializado\n" );
+    /* printf( "****TOL no esta inicializado %d****\n", lang ); */
     /*
      * Initialize kernel
@@ -232 +247 @@
     Tol_gsl_set_error_handler(&TT_gsl_error_handler);
   } else {
-    //printf( "TOL esta inicializado\n" );
+    /* printf( "****TOL esta inicializado****\n" ); */
   }
   
@@ -953 +968 @@
       }
     } else if (!strncasecmp("reference", arg, length)) {
-//      if (objc > 4 || objc < 3) {
+      /* if (objc > 4 || objc < 3) { */
       if (objc != 3) {
         Tcl_AppendStringsToObj(obj_result,
                                "wrong # args: should be '",
                                Tcl_GetString(objv[0]),
-//                               " reference ?grammar? obj'",
                                " reference {grammar|container objname ?indexes?}'",
                                NULL);
@@ -1234 +1248 @@
      Tcl_Obj * obj_result;
 {
-//  if ( objc < 2 || objc > 3 ) {
   if ( objc != 2 ) {
     Tcl_AppendStringsToObj(obj_result,
@@ -1243 +1256 @@
     return TCL_ERROR;
   }
-//  return  objc == 2 ? Tol_SetVariablesObj(interp, objv[1], obj_result) :
-//    Tol_SetVariableInfoObj(objv[1], objv[2], obj_result);
   return  Tol_SetVariablesObj(interp, objv[1], obj_result);
 }
@@ -1586 +1597 @@
    */
   
-  //InitTolKernel();
   if ( !TOLHasBeenInitialized( ) ) {
     Tol_InstallHciWriter();