Changeset c14b554 in tol for toltcl/generic/toltclInt.h

Timestamp:

Oct 19, 2008, 5:56:30 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

ce06505

Parents:

6d7779d

Message:

merging from NameBlock/VMatrix branch

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

File:

• toltcl/generic/toltclInt.h (modified) (1 diff)

toltcl/generic/toltclInt.h

@@ -285 +285 @@
 int Tol_ParseDate(Tcl_Interp * interp, char * what, BDate & date);
 
-/*! return the set with name obj_name, in case of error return NULL
- *  and leave a description in obj_result. Also looks for files.
- */
-extern
-const BSyntaxObject * Tol_FindSet (Tcl_Obj * obj_name,
-                                   Tcl_Obj * obj_result);
-
-/*! overloaded version to be used in case we need to know if the Set
-    found is a SetFromFile or not */
-extern
-const BSyntaxObject * Tol_FindSet (Tcl_Obj * obj_name,
-                                   Tcl_Obj * obj_result, int& is_file);
-
 /*!
  *  Tol_ResolveObject --
  *
- *     Resolve a SyntaxObject given a toltcl object reference. A reference is
- *     {setname i1 i2 ... in} or a global name
- *     setname is a global set name (including a file name) or, if empty, is
- *     stack's console. The grammar of the object found is matched to the
- *     given argument grammar. If the return value is NULL the corresponding
- *     message is left in interp.
- */
-const BSyntaxObject * Tol_ResolveObject(Tcl_Interp * interp,
-                                        Tcl_Obj * obj_ref,
-                                        BGrammar *  match_gra);
-
-/*! given a tol set in syn_obj, returns its child corresponding to
- *  the set of indexes indexes of size n.
- *  In case of error return NULL and leave a description in obj_result
- */
-extern
-const BSyntaxObject * Tol_FindChild ( Tcl_Interp *    interp,
-                                      const BSyntaxObject * syn_obj,
-                                      Tcl_Obj **      indexes, int n,
-                                      Tcl_Obj *       obj_result);
+ *     Resolve a SyntaxObject given a toltcl object reference. A
+ *     reference is {TYPE ?container? i1 i2 ... in} or a global
+ *     container's name of type File|Set|NameBlock|Console. When TYPE
+ *     is Console then container is not given. The grammar of the
+ *     object found is matched to the given argument grammar. If the
+ *     return value is NULL an error message is left in interp.
+ */
+extern
+const BSyntaxObject * Tol_ResolveObject(Tcl_Interp *interp,
+                                        Tcl_Obj    *obj_ref,
+                                        Tcl_Obj    *obj_result/*,
+                                        BGrammar   *grammar=NULL*/);
 
 extern