Overview
| Comment: | Added a "proc" sub-command to generate C stubs to call Tcl code |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
e9115a162e86d27f4c65422f17a8846f |
| User & Date: | rkeene on 2014-07-16 03:37:56.256 |
| Other Links: | manifest | tags |
Context
|
2014-07-16
| ||
| 04:05 | Updated to support a Tcl_Interp* argument in any position for "proc" check-in: af858c331d user: rkeene tags: trunk | |
| 03:37 | Added a "proc" sub-command to generate C stubs to call Tcl code check-in: e9115a162e user: rkeene tags: trunk | |
|
2014-06-24
| ||
| 21:32 | Fixed patch based on testing from Andreas check-in: 6e18ecd7b2 user: rkeene tags: trunk | |
Changes
Modified tcc4tcl.tcl
from [d7bddf2d39]
to [54f1e6802f].
| ︙ | |||
123 124 125 126 127 128 129 130 131 132 133 134 135 136 | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
set state(tk) 1
}
proc _delete {handle} {
rename $handle ""
unset $handle
}
proc _proc {handle cname adefs rtype body args} {
# Convert body into a C-style string
binary scan $body H* cbody
set cbody [regsub -all {..} $cbody {\\x&}]
# Parse optional arguments
foreach {argname argval} $args {
switch -- $argname {
"-error" {
set returnErrorValue $argval
}
}
}
# Argument definitions (in C style) initialization
set adefs_c [list]
# Names of all arguments initialization
set args [list]
# If we aren't creating a new interp, it must be the first argument
# If the definition of this proc already includes the interp
# argument, use it -- otherwise add one
if {[lindex $adefs 0] != "Tcl_Interp*"} {
set newInterp 1
} else {
set newInterp 0
set interp_name [lindex $adefs 1]
}
# Create the C-style argument definition
foreach {type var} $adefs {
lappend adefs_c [list $type $var]
set types($var) $type
lappend args $var
}
set adefs_c [join $adefs_c {, }]
# Determine how to return in failure
if {$rtype != "void"} {
if {[info exists returnErrorValue]} {
set return_failure "return(${returnErrorValue})"
} else {
switch -- $rtype {
int - long - Tcl_WideInt {
set return_failure "return(-1)"
}
ok {
set return_failure "return(TCL_ERROR)"
}
double - float {
set return_failure "return(NaN)"
}
default {
set return_failure "return(NULL)"
}
}
}
} else {
set return_failure "return"
}
# Define the C function
_ccode $handle "$rtype $cname\($adefs_c) \{"
## Define the Tcl return value checking variable
_ccode $handle " int tclrv;"
## If the interpreters return value is relevant, create a variable to store it
if {$rtype != "ok" && $rtype != "void"} {
_ccode $handle " Tcl_Obj *rv_interp;"
}
## If we are returning a value, declare a variable for that
if {$rtype != "void"} {
_ccode $handle " $rtype rv;"
}
## If we need to create a new interpreter, do so
if {$newInterp} {
set interp_name "ip"
_ccode $handle " Tcl_Interp *${interp_name};"
set args_nointerp $args
} else {
set args_nointerp [lrange $args 1 end]
}
# Declare Tcl_Obj variables
_ccode $handle " Tcl_Obj *_[join $args_nointerp {, *_}];"
_ccode $handle ""
if {$newInterp} {
_ccode $handle " ${interp_name} = Tcl_CreateInterp();"
_ccode $handle " if (!${interp_name}) $return_failure;"
_ccode $handle ""
}
# Process all arguments
foreach arg $args_nointerp {
set type $types($arg)
switch -- $type {
int - long - Tcl_WideInt - float - double {
switch -- $type {
float {
set convCmd Double
}
Tcl_WideInt {
set convCmd WideInt
}
default {
set convCmd [string totitle $type]
}
}
_ccode $handle " _$arg = Tcl_New${convCmd}Obj($arg);"
_ccode $handle " if (!_$arg) $return_failure;"
}
char* {
_ccode $handle " _$arg = Tcl_NewStringObj($arg, -1);"
}
Tcl_Obj* {
_ccode $handle " _$arg = $arg;"
}
default {
return -code error "Unknown type: $type"
}
}
_ccode $handle " if (!Tcl_ObjSetVar2(${interp_name}, Tcl_NewStringObj(\"${arg}\", -1), NULL, _$arg, 0)) $return_failure;"
}
_ccode $handle ""
_ccode $handle " tclrv = Tcl_Eval($interp_name, \"$cbody\");"
_ccode $handle " if (tclrv != TCL_OK) $return_failure;"
_ccode $handle ""
if {$rtype != "ok" && $rtype != "void"} {
_ccode $handle " rv_interp = Tcl_GetObjResult(${interp_name});"
}
switch -- $rtype {
void { }
ok {
_ccode $handle " rv = 0;"
}
int {
_ccode $handle " if (Tcl_GetIntFromObj(ip, rv_interp, &rv) != TCL_OK) $return_failure;"
}
long {
_ccode $handle " if (Tcl_GetLongFromObj(ip, rv_interp, &rv) != TCL_OK) $return_failure;"
}
Tcl_WideInt {
_ccode $handle " if (Tcl_GetWideIntFromObj(ip, rv_interp, &rv) != TCL_OK) $return_failure;"
}
float {
_ccode $handle " {"
_ccode $handle " double t;"
_ccode $handle " if (Tcl_GetDoubleFromObj(ip, rv_interp, &t) != TCL_OK) $return_failure;"
_ccode $handle " rv = (float) t;"
_ccode $handle " }"
}
double {
_ccode $handle " if (Tcl_GetDoubleFromObj(ip, rv_interp, &rv) != TCL_OK) $return_failure;"
}
char* {
_ccode $handle " rv = Tcl_GetString(rv_interp);"
}
char* {
_ccode $handle " rv = Tcl_GetString(rv_interp);"
}
}
_ccode $handle ""
if {$rtype != "void"} {
_ccode $handle " return(rv);"
} else {
_ccode $handle " return;"
}
_ccode $handle "\}"
}
proc _go {handle {outputOnly 0}} {
variable dir
upvar #0 $handle state
set code $state(code)
|
| ︙ |
Modified test.tcl
from [c0aa27fcc2]
to [6f71a6b9f8].
| ︙ | |||
141 142 143 144 145 146 147 | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 | + + + + + + + + + + + + |
$handle add_library_path /usr/lib
$handle add_library_path /usr/lib32
$handle add_library curl
$handle go
curl_fetch http://rkeene.org/
}
set handle [tcc4tcl::new]
$handle proc callToTcl {int a int b} int {
set retval [expr {$a + $b}]
return $retval
}
$handle cwrap callToTcl {int a int b} int
$handle go
if {[callToTcl 3 5] != 8} {
error "3 + 5 is 8"
}
|