X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-tcl.git;a=blobdiff_plain;f=base%2Fparse.c;h=911cadd3eb71e34d2bbb2dcbef206dc343480e33;hp=5e1f918d99d886a829fb06c8cf8afefa5888cb91;hb=a43cdb5c69224a60f9e87110093e35a0f1f0b468;hpb=743de63e7b3214a5abc748ec0fa90160b6983551

diff --git a/base/parse.c b/base/parse.c
index 5e1f918..911cadd 100644
--- a/base/parse.c
+++ b/base/parse.c
@@ -10,18 +10,6 @@ int pat_charfrom(Tcl_Interp *ip, Tcl_Obj *obj, int *val,
   return TCL_OK;
 }
 
-int pat_enum(Tcl_Interp *ip, Tcl_Obj *obj, const void **val,
-	     const void *opts, size_t sz, const char *what) {
-  *val= enum_lookup_cached_func(ip,obj,opts,sz,what);
-  if (!*val) return TCL_ERROR;
-  return TCL_OK;
-}
-  
-int pat_obj(Tcl_Interp *ip, Tcl_Obj *obj, Tcl_Obj **val) {
-  *val= obj;
-  return TCL_OK;
-}
-
 int pat_int(Tcl_Interp *ip, Tcl_Obj *obj, int *val) {
   return Tcl_GetIntFromObj(ip, obj, val);
 }
@@ -30,6 +18,11 @@ int pat_long(Tcl_Interp *ip, Tcl_Obj *obj, long *val) {
   return Tcl_GetLongFromObj(ip, obj, val);
 }
   
+int pat_string(Tcl_Interp *ip, Tcl_Obj *obj, const char **val) {
+  *val= Tcl_GetString(obj);
+  return TCL_OK;
+}
+  
 int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
   int rc;
   Tcl_Obj *val;
@@ -42,11 +35,11 @@ int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
   rc= Tcl_ConvertToType(ip,val,&hbytes_type);
   if (rc) return rc;
 
-  Tcl_InvalidateStringRep(val);
   if (Tcl_IsShared(val)) {
     val= Tcl_DuplicateObj(val);
     agg->copied= 1;
   }
+  Tcl_InvalidateStringRep(val);
   agg->obj= val;
 
   agg->hb= OBJ_HBYTES(val);
@@ -81,19 +74,10 @@ Tcl_Obj *ret_hb(Tcl_Interp *ip, HBytes_Value val) {
   return obj;
 }
 
-Tcl_Obj *ret_int(Tcl_Interp *ip, int val) {
-  return Tcl_NewIntObj(val);
-}
-
 Tcl_Obj *ret_long(Tcl_Interp *ip, long val) {
   return Tcl_NewLongObj(val);
 }
 
-Tcl_Obj *ret_obj(Tcl_Interp *ip, Tcl_Obj *val) {
-  return val;
-}
-
-void setstringresult(Tcl_Interp *ip, const char *m) {
-  Tcl_ResetResult(ip);
-  Tcl_AppendResult(ip, m, (char*)0);
+Tcl_Obj *ret_string(Tcl_Interp *ip, const char *val) {
+  return Tcl_NewStringObj(val,-1);
 }