/*
+ * base code for various Tcl extensions
+ * Copyright 2006-2012 Ian Jackson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "tables.h"
+#include "chiark-tcl-base.h"
-int pat_charfrom(Tcl_Interp *ip, Tcl_Obj *obj, int *val,
+int cht_pat_charfrom(Tcl_Interp *ip, Tcl_Obj *obj, int *val,
const char *opts, const char *what) {
- *val= enum1_lookup_cached_func(ip,obj,opts,what);
+ *val= cht_enum1_lookup_cached_func(ip,obj,opts,what);
if (*val==-1) return TCL_ERROR;
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;
+int cht_pat_int(Tcl_Interp *ip, Tcl_Obj *obj, int *val) {
+ return Tcl_GetIntFromObj(ip, obj, val);
+}
+
+int cht_pat_long(Tcl_Interp *ip, Tcl_Obj *obj, long *val) {
+ return Tcl_GetLongFromObj(ip, obj, val);
+}
+
+int cht_pat_string(Tcl_Interp *ip, Tcl_Obj *obj, const char **val) {
+ *val= Tcl_GetString(obj);
return TCL_OK;
}
+
+int cht_pat_constv(Tcl_Interp *ip, Tcl_Obj *var,
+ Tcl_Obj **val_r, Tcl_ObjType *type) {
+ int rc;
+ Tcl_Obj *val;
-int pat_obj(Tcl_Interp *ip, Tcl_Obj *obj, Tcl_Obj **val) {
- *val= obj;
+ val= Tcl_ObjGetVar2(ip,var,0,TCL_LEAVE_ERR_MSG);
+ if (!val) return TCL_ERROR;
+
+ if (type) {
+ rc= Tcl_ConvertToType(ip,val,type);
+ if (rc) return rc;
+ }
+
+ *val_r= val;
return TCL_OK;
}
-int pat_int(Tcl_Interp *ip, Tcl_Obj *obj, int *val) {
- return Tcl_GetIntFromObj(ip, obj, val);
+void cht_init_somethingv(Something_Var *sth) {
+ sth->obj=0; sth->var=0; sth->copied=0;
}
-
-int pat_hbv(Tcl_Interp *ip, Tcl_Obj *var, HBytes_Var *agg) {
+
+int cht_pat_somethingv(Tcl_Interp *ip, Tcl_Obj *var,
+ Something_Var *sth, Tcl_ObjType *type) {
int rc;
Tcl_Obj *val;
- Tcl_IncrRefCount(var);
- agg->var= var;
+ sth->var= var;
val= Tcl_ObjGetVar2(ip,var,0,TCL_LEAVE_ERR_MSG);
if (!val) return TCL_ERROR;
- if (Tcl_IsShared(val)) val= Tcl_DuplicateObj(val);
- Tcl_IncrRefCount(val);
- agg->obj= val;
-
- rc= Tcl_ConvertToType(ip,val,&hbytes_type);
+
+ rc= Tcl_ConvertToType(ip,val,type);
if (rc) return rc;
- agg->hb= OBJ_HBYTES(val); return TCL_OK; }
+ if (Tcl_IsShared(val)) {
+ val= Tcl_DuplicateObj(val);
+ sth->copied= 1;
+ }
+ Tcl_InvalidateStringRep(val);
+ sth->obj= val;
+
+ return TCL_OK;
+}
-void fini_hbv(Tcl_Interp *ip, int rc, HBytes_Var *agg) {
+void cht_fini_somethingv(Tcl_Interp *ip, int rc, Something_Var *sth) {
Tcl_Obj *ro;
- if (agg->obj) Tcl_InvalidateStringRep(agg->obj);
if (!rc) {
- assert(agg->obj);
- ro= Tcl_ObjSetVar2(ip,agg->var,0,agg->obj,TCL_LEAVE_ERR_MSG);
+ assert(sth->obj);
+ ro= Tcl_ObjSetVar2(ip,sth->var,0,sth->obj,TCL_LEAVE_ERR_MSG);
if (!ro) rc= TCL_ERROR;
}
- if (agg->obj) Tcl_DecrRefCount(agg->obj);
- if (agg->var) Tcl_DecrRefCount(agg->var);
-}
-
-int pat_hb(Tcl_Interp *ip, Tcl_Obj *obj, HBytes_Value *val) {
- int rc;
- rc= Tcl_ConvertToType(ip,obj,&hbytes_type); if (rc) return rc;
- *val= *OBJ_HBYTES(obj);
- return TCL_OK;
-}
-
-Tcl_Obj *ret_hb(Tcl_Interp *ip, HBytes_Value val) {
- Tcl_Obj *obj;
- obj= Tcl_NewObj();
- Tcl_InvalidateStringRep(obj);
- *OBJ_HBYTES(obj)= val;
- obj->typePtr= &hbytes_type;
- return obj;
-}
-
-Tcl_Obj *ret_int(Tcl_Interp *ip, int val) {
- return Tcl_NewIntObj(val);
+ if (rc && sth->copied)
+ Tcl_DecrRefCount(sth->obj);
}
-Tcl_Obj *ret_obj(Tcl_Interp *ip, Tcl_Obj *val) {
- return val;
+Tcl_Obj *cht_ret_long(Tcl_Interp *ip, long val) {
+ return Tcl_NewLongObj(val);
}
-void setstringresult(Tcl_Interp *ip, const char *m) {
- Tcl_ResetResult(ip);
- Tcl_AppendResult(ip, m, (char*)0);
+Tcl_Obj *cht_ret_string(Tcl_Interp *ip, const char *val) {
+ return Tcl_NewStringObj(val,-1);
}