Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch hypnotoad-vexpr Excluding Merge-Ins
This is equivalent to a diff from b274b30ee6 to 728208200b
|
2013-04-30
| ||
| 18:49 | (::platform::LibcVersion): Followup to the 2013-01-30 change. The RE become too restrictive again. S... check-in: b15cddcf1f user: andreask tags: trunk | |
|
2013-04-29
| ||
| 12:34 | Bringing vexpr up to date with the latest trunk. Combining the vexpr patch with my fix to the m4 fi... Closed-Leaf check-in: 728208200b user: hypnotoad tags: hypnotoad-vexpr | |
| 12:31 | Bringing patch up to date with the latest trunk Closed-Leaf check-in: 216aa27e26 user: hypnotoad tags: hypnotoad-prefer-native-8.6 | |
| 09:31 | Improve code generation for [array set] in a common case. check-in: b274b30ee6 user: dkf tags: trunk | |
|
2013-04-25
| ||
| 07:40 | merge-mark check-in: f97e93ec09 user: jan.nijtmans tags: trunk | |
|
2013-03-18
| ||
| 12:38 | Merging with updates from trunk check-in: 0827b509f2 user: seandeelywoods tags: hypnotoad-vexpr | |
Changes to ChangeLog.
| ︙ | ︙ | |||
475 476 477 478 479 480 481 482 | 2012-11-26 Reinhard Max <max@suse.de> * unix/tclUnixSock.c: Factor out creation of the -sockname and -peername lists from TcpGetOptionProc() to TcpHostPortList(). Make it robust against implementations of getnameinfo() that error out if reverse mapping fails instead of falling back to the numeric representation. | | > > > > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 | 2012-11-26 Reinhard Max <max@suse.de> * unix/tclUnixSock.c: Factor out creation of the -sockname and -peername lists from TcpGetOptionProc() to TcpHostPortList(). Make it robust against implementations of getnameinfo() that error out if reverse mapping fails instead of falling back to the numeric representation. 2012-11-21 Sean Woods <yoda@etoyoc.com> * Added generic/tclVexpr.c - Vector expression stack * Added generic/tclVexpr.tcl - Script to regenerate generic/tclVexpr.c * Added doc/vexpr.n - Manual for vexpr 2012-11-20 Donal K. Fellows <dkf@users.sf.net> * generic/tclBinary.c (BinaryDecode64): [Bug 3033307]: Corrected handling of trailing whitespace when decoding base64. Thanks to Anton Kovalenko for reporting, and Andy Goth for the fix and tests. 2012-11-19 Donal K. Fellows <dkf@users.sf.net> * generic/tclExecute.c (INST_STR_RANGE_IMM): [Bug 3588366]: Corrected |
| ︙ | ︙ |
Added doc/vexpr.n.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 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 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 |
.\"
.\" Copyright (c) 2012 Sean Woods
.\"
.\" See the file "license.terms" for information on usage and redistribution
.\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
.\"
.so man.macros
.TH vexpr n 8.7 Tcl "Tcl Built-In Commands"
.BS
.\" Note: do not modify the .SH NAME line immediately below!
.SH NAME
vexpr \- Vector Expression Evaluator
.SH SYNOPSIS
\fBvexpr \fIarg arg opcode \fR?\fIarg opcode...?\fR
.BE
.SH DESCRIPTION
.PP
Performs one of several vector operations, depending on the \fIopcode\fR.
Opcodes and arguments are evaluated using reverse-polish notation.
.
Example:
.CS
\fBvexpr {1 1 1} {2 2 2} +\fR
.CE
.PP
Will return \fB\{3.0 3.0 3.0}\fR.
.PP
.RE
The legal \fIopcode\fRs:
.TP
\fBaffine_identity\fR
.RS 1
Usage: \fBaffine_identity\fR
.RE
.RS 1
Result: AFFINE
.RE
.PP
.RS 1
Pushes an affine identity matrix onto the stack
.RE
.TP
\fBaffine_multiply\fR
.RS 1
Usage: \fIAFFINE AFFINE\fR \fBaffine_multiply\fR
.RE
.RS 1
Result: AFFINE
.RE
.PP
.RS 1
Muliply 2 4x4 matrices. Used to combine 2 affine transformations. Note: Some affine transformations need to be performed in a particular order to make sense.
.RE
.TP
\fBaffine_rotate\fR
.RS 1
Usage: \fIVECTOR\fR \fBaffine_rotate\fR
.RE
.RS 1
Result: AFFINE
.RE
.PP
.RS 1
Convert a rotation vector (X Y Z) into an affine transformation
.RE
.TP
\fBaffine_scale\fR
.RS 1
Usage: \fIVECTOR\fR \fBaffine_scale\fR
.RE
.RS 1
Result: AFFINE
.RE
.PP
.RS 1
Convert a scale vector (X Y Z) into an affine transformation
.RE
.TP
\fBaffine_translate\fR
.RS 1
Usage: \fIVECTOR\fR \fBaffine_translate\fR
.RE
.RS 1
Result: AFFINE
.RE
.PP
.RS 1
Convert a displacement vector (X Y Z) into an affine transformation
.RE
.TP
\fBcartesian_to_cylindrical\fR
.RS 1
Usage: \fIVECTOR\fR \fBcartesian_to_cylindrical\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a cartesian vector to cylindrical coordinates
.RE
.TP
\fBcartesian_to_spherical\fR
.RS 1
Usage: \fIVECTOR\fR \fBcartesian_to_spherical\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a cartesian vector to spherical vector
.RE
.TP
\fBcopy\fR
.RS 1
Usage: \fIANY\fR \fBcopy\fR
.RE
.RS 1
Result: ANY ANY
.RE
.PP
.RS 1
Place an additional copy of the top of the stack on the top of the stack
.RE
.TP
\fBcylindrical_to_cartesian\fR
.RS 1
Usage: \fIVECTOR\fR \fBcylindrical_to_cartesian\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a cylindrical vector to a cartesian vector
.RE
.TP
\fBcylindrical_to_degrees\fR
.RS 1
Usage: \fIVECTOR\fR \fBcylindrical_to_degrees\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a cylindrical vector in radians to a cylindrical vector in degrees
.RE
.TP
\fBcylindrical_to_radians\fR
.RS 1
Usage: \fIVECTOR\fR \fBcylindrical_to_radians\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a cylindrical vector in degrees to a cylindrical vector in radians
.RE
.TP
\fBdt_get\fR
.RS 1
Usage: \fBdt_get\fR
.RE
.RS 1
Result: SCALER
.RE
.PP
.RS 1
Pushes the stored value of dT into the stack
.RE
.TP
\fBdt_set\fR
.RS 1
Usage: \fISCALER\fR \fBdt_set\fR
.RE
.RS 1
Result: (None)
.RE
.PP
.RS 1
Stores a new value for dT
.RE
.TP
\fBdump\fR
.RS 1
Usage: \fIANY\fR \fBdump\fR
.RE
.RS 1
Result: (None)
.RE
.PP
.RS 1
Output the contents of the top of the stack to stdout
.RE
.TP
\fBload\fR
.RS 1
Usage: \fBload\fR
.RE
.RS 1
Result: ANY
.RE
.PP
.RS 1
Push a previosly stored value the top of the stack
.RE
.TP
\fBpi\fR
.RS 1
Usage: \fBpi\fR
.RE
.RS 1
Result: SCALER
.RE
.PP
.RS 1
Pushes the value of PI into the stack
.RE
.TP
\fBspherical_to_cartesian\fR
.RS 1
Usage: \fIVECTOR\fR \fBspherical_to_cartesian\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a spherical vector to a cartesian vector
.RE
.TP
\fBspherical_to_degrees\fR
.RS 1
Usage: \fIVECTOR\fR \fBspherical_to_degrees\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a spherical vector in radians to a spherical vector in degrees
.RE
.TP
\fBspherical_to_radians\fR
.RS 1
Usage: \fIVECTOR\fR \fBspherical_to_radians\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert a spherical vector in degrees to a spherical vector in radians
.RE
.TP
\fBstore\fR
.RS 1
Usage: \fIANY\fR \fBstore\fR
.RE
.RS 1
Result: ANY
.RE
.PP
.RS 1
Store the top of the stack internally for later use. The value stored remains at the top of the stack.
.RE
.TP
\fBto_degrees\fR
.RS 1
Usage: \fIVECTOR\fR \fBto_degrees\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert Radians to Degress
.RE
.TP
\fBto_radians\fR
.RS 1
Usage: \fIVECTOR\fR \fBto_radians\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Convert Degrees to Radians
.RE
.TP
\fBvector_add\fR
.RS 1
Usage: \fIVECTOR VECTOR\fR \fBvector_add\fR
.RE
.RS 1
Aliases: +
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Add Two Vectors
.RE
.TP
\fBvector_cross_product\fR
.RS 1
Usage: \fIVECTOR VECTOR\fR \fBvector_cross_product\fR
.RE
.RS 1
Aliases: *X
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Push the cross product of two vectors on the stack
.RE
.TP
\fBvector_dot_product\fR
.RS 1
Usage: \fIVECTOR VECTOR\fR \fBvector_dot_product\fR
.RE
.RS 1
Aliases: *.
.RE
.RS 1
Result: SCALER
.RE
.PP
.RS 1
Push the dot product of two vectors on the stack
.RE
.TP
\fBvector_length\fR
.RS 1
Usage: \fIVECTOR\fR \fBvector_length\fR
.RE
.RS 1
Result: SCALER
.RE
.PP
.RS 1
Convert a vector to it's length
.RE
.TP
\fBvector_scale\fR
.RS 1
Usage: \fIVECTOR SCALER\fR \fBvector_scale\fR
.RE
.RS 1
Aliases: *
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Scale a vector by a scaler
.RE
.TP
\fBvector_subtract\fR
.RS 1
Usage: \fIVECTOR VECTOR\fR \fBvector_subtract\fR
.RE
.RS 1
Aliases: -
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Subtract Two Vectors
.RE
.TP
\fBvector_transform_affine\fR
.RS 1
Usage: \fIAFFINE VECTOR\fR \fBvector_transform_affine\fR
.RE
.RS 1
Result: VECTOR
.RE
.PP
.RS 1
Transform a vector using an affine matrix
.RE
.SH "SEE ALSO"
expr(n)
.SH KEYWORDS
vector
|
Changes to generic/tclBasic.c.
| ︙ | ︙ | |||
248 249 250 251 252 253 254 255 256 257 258 259 260 261 |
{"throw", Tcl_ThrowObjCmd, TclCompileThrowCmd, NULL, 1},
{"trace", Tcl_TraceObjCmd, NULL, NULL, 1},
{"try", Tcl_TryObjCmd, TclCompileTryCmd, TclNRTryObjCmd, 1},
{"unset", Tcl_UnsetObjCmd, TclCompileUnsetCmd, NULL, 1},
{"uplevel", Tcl_UplevelObjCmd, NULL, TclNRUplevelObjCmd, 1},
{"upvar", Tcl_UpvarObjCmd, TclCompileUpvarCmd, NULL, 1},
{"variable", Tcl_VariableObjCmd, TclCompileVariableCmd, NULL, 1},
{"while", Tcl_WhileObjCmd, TclCompileWhileCmd, TclNRWhileObjCmd, 1},
{"yield", NULL, TclCompileYieldCmd, TclNRYieldObjCmd, 1},
{"yieldto", NULL, NULL, TclNRYieldToObjCmd, 1},
/*
* Commands in the OS-interface. Note that many of these are unsafe.
*/
| > | 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 |
{"throw", Tcl_ThrowObjCmd, TclCompileThrowCmd, NULL, 1},
{"trace", Tcl_TraceObjCmd, NULL, NULL, 1},
{"try", Tcl_TryObjCmd, TclCompileTryCmd, TclNRTryObjCmd, 1},
{"unset", Tcl_UnsetObjCmd, TclCompileUnsetCmd, NULL, 1},
{"uplevel", Tcl_UplevelObjCmd, NULL, TclNRUplevelObjCmd, 1},
{"upvar", Tcl_UpvarObjCmd, TclCompileUpvarCmd, NULL, 1},
{"variable", Tcl_VariableObjCmd, TclCompileVariableCmd, NULL, 1},
{"vexpr", Tcl_VexprObjCmd, NULL, NULL, 1},
{"while", Tcl_WhileObjCmd, TclCompileWhileCmd, TclNRWhileObjCmd, 1},
{"yield", NULL, TclCompileYieldCmd, TclNRYieldObjCmd, 1},
{"yieldto", NULL, NULL, TclNRYieldToObjCmd, 1},
/*
* Commands in the OS-interface. Note that many of these are unsafe.
*/
|
| ︙ | ︙ |
Changes to generic/tclInt.h.
| ︙ | ︙ | |||
3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 | Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_UpvarObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_VariableObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_VwaitObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_WhileObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); | > > > | 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 | Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_UpvarObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_VariableObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_VexprObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_VwaitObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); MODULE_SCOPE int Tcl_WhileObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); |
| ︙ | ︙ |
Added generic/tclVexpr.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 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 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 |
#include <tcl.h>
#include <math.h>
#include <string.h>
#define VERSION "1.0"
/*
* Structures and Datatypes
*/
typedef double AFFINE[4][4];
typedef double QUATERNION[4];
typedef double VECTOR[3];
typedef double SCALER[1];
typedef struct GenMatrix {
int rows,cols;
union {
double *pointer;
double cells[16];
SCALER scaler;
VECTOR vector;
QUATERNION quaternion;
AFFINE affine;
};
} MATOBJ;
/* Vector array elements. */
#define U 0
#define V 1
#define iX 0
#define jY 1
#define kZ 2
#define W 3
#define VX(X) { *(X+0) }
#define VY(X) { *(X+1) }
#define VZ(X) { *(X+2) }
#define RADIUS 0
#define THETA 1
#define PHI 2
/*
* Constants
*/
#ifndef M_PI
#define M_PI 3.1415926535897932384626
#endif
#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923
#endif
#ifndef TWO_M_PI
#define TWO_M_PI 6.283185307179586476925286766560
#endif
#ifndef M_PI_180
#define M_PI_180 0.01745329251994329576
#endif
#ifndef M_PI_360
#define M_PI_360 0.00872664625997164788
#endif
#define MATSTACKSIZE 64
/*
* Module-Wide Variables
*/
/*
* Tcl Interface
*/
EXTERN int VecExpr_ObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *tinterp, int objc, Tcl_Obj *CONST objv[]));
/*
* Macros
*/
#define CosD(A) { cos(A * M_PI_180); }
#define SinD(A) { sin(A * M_PI_180); }
#define POP(X) { if (MatStack_Pop(X) != TCL_OK) return TCL_ERROR; }
#define PUSH(X) { if (MatStack_Push(X) != TCL_OK) return TCL_ERROR; }
/*
* Stack Commands
*/
static Tcl_Interp *current_interp;
static MATOBJ Stack[MATSTACKSIZE];
static int StackIdx=-1;
static char *ErrorString;
static int ErrorResult; /* Error if Non-Zero */
void Matrix_Error(const char *error) {
if(current_interp) {
Tcl_AppendResult(current_interp,error,(char *) NULL);
}
ErrorString=error;
ErrorResult = TCL_ERROR;
}
void Matrix_ErrorStr(Tcl_Obj *errResult)
{
Tcl_SetStringObj(errResult,ErrorString,-1);
}
/* Produce a general case matrix from a TCL List */
void MatStack_Clear(void)
{
StackIdx = -1;
}
void affine_Copy(AFFINE A,AFFINE B)
{
int i,j;
for(i=0;i<4;i++)
for(j=0;j<4;j++)
B[i][j]=A[i][j];
}
inline void Matrix_Copy(MATOBJ *A,MATOBJ *B)
{
memcpy(B,A,sizeof(MATOBJ));
/*
B->rows=A->rows;
B->cols=A->cols;
affine_Copy(A->affine,B->affine);
*/
}
/* Produce a general case matrix from a TCL List */
int MatStack_Pop(MATOBJ *item)
{
if (StackIdx < 0)
{
Matrix_Error("Not Enough Arguments");
item=NULL;
return TCL_ERROR;
}
Matrix_Copy(&Stack[StackIdx],item);
StackIdx--;
return TCL_OK;
}
int MatStack_Push(MATOBJ *value) {
if (StackIdx >= MATSTACKSIZE) {
Matrix_Error("Vector Stack Overflow");
return TCL_ERROR;
}
StackIdx++;
Matrix_Copy(value,&Stack[StackIdx]);
return TCL_OK;
}
/*
* Affine Operations
* Must be performed on a 4x4 matrix
*/
void affine_ZeroMatrix(AFFINE A)
{
register int i,j;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
A[i][j]=0;
}
void affine_IdentityMatrix(AFFINE A)
{
register int i;
affine_ZeroMatrix(A);
for (i=0;i<4;i++)
A[i][i]=1;
}
void affine_Translate(VECTOR A,AFFINE B)
{
affine_IdentityMatrix(B);
B[0][3]=-A[0];
B[1][3]=-A[1];
B[2][3]=-A[2];
}
void affine_Scale(VECTOR A,AFFINE B)
{
affine_ZeroMatrix(B);
B[0][0]=A[iX];
B[1][1]=A[jY];
B[2][2]=A[kZ];
B[3][3]=1.0;
}
void affine_RotateX(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[0][0]=1.0;
A[3][3]=1.0;
A[1][1]=c;
A[2][2]=c;
A[1][2]=s;
A[2][1]=0.0-s;
}
void affine_RotateY(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[1][1]=1.0;
A[3][3]=1.0;
A[0][0]=c;
A[2][2]=c;
A[0][2]=0.0-s;
A[2][0]=s;
}
void affine_RotateZ(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[2][2]=1.0;
A[3][3]=1.0;
A[0][0]=c;
A[1][1]=c;
A[0][1]=s;
A[1][0]=0.0-s;
}
void affine_Multiply(AFFINE A,AFFINE B,AFFINE R)
{
int i,j,k;
AFFINE temp_matrix;
for (i=0;i<4;i++)
{
for (j=0;j<4;j++)
{
temp_matrix[i][j]=0.0;
for (k=0;k<4;k++) temp_matrix[i][j]+=A[i][k]*B[k][j];
}
}
affine_Copy(temp_matrix,R);
}
void affine_Rotate(VECTOR rotate,AFFINE R)
{
AFFINE OP;
affine_RotateX(rotate[iX],R);
affine_RotateY(rotate[jY],OP);
affine_Multiply(OP,R,R);
affine_RotateZ(rotate[kZ],OP);
affine_Multiply(OP,R,R);
}
void affine_ComputeTransform(VECTOR trans,VECTOR rotate,AFFINE R)
{
AFFINE M1,M2,M3,M4,M5,M6,M7,M8,M9;
//VECTOR scale = {1.0, 1.0, 1.0};
//affine_Scale(scale,M1);
affine_IdentityMatrix(M1);
affine_RotateX(rotate[iX],M2);
affine_RotateY(rotate[jY],M3);
affine_RotateZ(rotate[kZ],M4);
affine_Translate(trans,M5);
affine_Multiply(M2,M1,M6);
affine_Multiply(M3,M6,M7);
affine_Multiply(M4,M7,M8);
affine_Multiply(M5,M8,M9);
affine_Copy(M9,R);
}
int affine_Inverse(AFFINE r, AFFINE m)
{
double d00, d01, d02, d03;
double d10, d11, d12, d13;
double d20, d21, d22, d23;
double d30, d31, d32, d33;
double m00, m01, m02, m03;
double m10, m11, m12, m13;
double m20, m21, m22, m23;
double m30, m31, m32, m33;
double D;
m00 = m[0][0]; m01 = m[0][1]; m02 = m[0][2]; m03 = m[0][3];
m10 = m[1][0]; m11 = m[1][1]; m12 = m[1][2]; m13 = m[1][3];
m20 = m[2][0]; m21 = m[2][1]; m22 = m[2][2]; m23 = m[2][3];
m30 = m[3][0]; m31 = m[3][1]; m32 = m[3][2]; m33 = m[3][3];
d00 = m11*m22*m33 + m12*m23*m31 + m13*m21*m32 - m31*m22*m13 - m32*m23*m11 - m33*m21*m12;
d01 = m10*m22*m33 + m12*m23*m30 + m13*m20*m32 - m30*m22*m13 - m32*m23*m10 - m33*m20*m12;
d02 = m10*m21*m33 + m11*m23*m30 + m13*m20*m31 - m30*m21*m13 - m31*m23*m10 - m33*m20*m11;
d03 = m10*m21*m32 + m11*m22*m30 + m12*m20*m31 - m30*m21*m12 - m31*m22*m10 - m32*m20*m11;
d10 = m01*m22*m33 + m02*m23*m31 + m03*m21*m32 - m31*m22*m03 - m32*m23*m01 - m33*m21*m02;
d11 = m00*m22*m33 + m02*m23*m30 + m03*m20*m32 - m30*m22*m03 - m32*m23*m00 - m33*m20*m02;
d12 = m00*m21*m33 + m01*m23*m30 + m03*m20*m31 - m30*m21*m03 - m31*m23*m00 - m33*m20*m01;
d13 = m00*m21*m32 + m01*m22*m30 + m02*m20*m31 - m30*m21*m02 - m31*m22*m00 - m32*m20*m01;
d20 = m01*m12*m33 + m02*m13*m31 + m03*m11*m32 - m31*m12*m03 - m32*m13*m01 - m33*m11*m02;
d21 = m00*m12*m33 + m02*m13*m30 + m03*m10*m32 - m30*m12*m03 - m32*m13*m00 - m33*m10*m02;
d22 = m00*m11*m33 + m01*m13*m30 + m03*m10*m31 - m30*m11*m03 - m31*m13*m00 - m33*m10*m01;
d23 = m00*m11*m32 + m01*m12*m30 + m02*m10*m31 - m30*m11*m02 - m31*m12*m00 - m32*m10*m01;
d30 = m01*m12*m23 + m02*m13*m21 + m03*m11*m22 - m21*m12*m03 - m22*m13*m01 - m23*m11*m02;
d31 = m00*m12*m23 + m02*m13*m20 + m03*m10*m22 - m20*m12*m03 - m22*m13*m00 - m23*m10*m02;
d32 = m00*m11*m23 + m01*m13*m20 + m03*m10*m21 - m20*m11*m03 - m21*m13*m00 - m23*m10*m01;
d33 = m00*m11*m22 + m01*m12*m20 + m02*m10*m21 - m20*m11*m02 - m21*m12*m00 - m22*m10*m01;
D = m00*d00 - m01*d01 + m02*d02 - m03*d03;
if (D == 0.0)
{
Matrix_Error("Singular matrix in MInvers.");
return TCL_ERROR;
}
r[0][0] = d00/D; r[0][1] = -d10/D; r[0][2] = d20/D; r[0][3] = -d30/D;
r[1][0] = -d01/D; r[1][1] = d11/D; r[1][2] = -d21/D; r[1][3] = d31/D;
r[2][0] = d02/D; r[2][1] = -d12/D; r[2][2] = d22/D; r[2][3] = -d32/D;
r[3][0] = -d03/D; r[3][1] = d13/D; r[3][2] = -d23/D; r[3][3] = d33/D;
return TCL_OK;
}
/*
* A - the vector to be tranformed
* B - the affine tranformation matrix
* R - a place to dump the result
*
* A and R MUST BE DIFFERENT
*/
void vector_MatrixMultiply(VECTOR A,AFFINE M,VECTOR R)
{
int i,j;
for(i=0;i<3;i++)
{
R[i]=A[iX]*M[0][i] + A[jY]*M[1][i] + A[kZ]* M[2][i] + M[3][i];
}
}
void vector_Scale(VECTOR A,double S)
{
A[iX]*=S;
A[jY]*=S;
A[kZ]*=S;
}
double vector_Length(VECTOR A)
{
return (sqrt(A[0]*A[0]+A[1]*A[1]+A[2]*A[2]));
}
double vector_LengthInvSqr(VECTOR A)
{
return (1.0/(A[0]*A[0]+A[1]*A[1]+A[2]*A[2]));
}
void vector_Normalize(VECTOR A)
{
double d;
d=1.0 / vector_Length(A);
A[0]*=d;
A[1]*=d;
A[2]*=d;
}
void vector_ToSphere(VECTOR A,VECTOR R)
{
double S;
R[RADIUS]=vector_Length(A);
S=sqrt(A[iX]*A[iX]+A[jY]*A[jY]);
if (A[iX] > 0.0) {
R[THETA] =asin(A[jY]/S);
} else {
R[THETA] =M_PI - asin(A[jY]/S);
}
R[PHI] =asin(A[kZ]/R[RADIUS]);
}
void sphere_ToVector(VECTOR A,VECTOR R)
{
R[iX]=A[RADIUS]*cos(A[THETA])*cos(A[PHI]);
R[jY]=A[RADIUS]*sin(A[THETA])*cos(A[PHI]);
R[kZ]=A[RADIUS]*sin(A[PHI]);
}
void cylinder_ToVector(VECTOR A,VECTOR R)
{
R[iX]=A[RADIUS]*cos(A[THETA]);
R[jY]=A[RADIUS]*sin(A[THETA]);
R[kZ]=A[kZ];
}
void vector_ToCylinder(VECTOR A,VECTOR R)
{
R[RADIUS]=sqrt(A[iX]*A[iX] + A[jY]*A[jY]);
R[THETA] =atan2(A[jY],A[iX]);
R[kZ] =A[kZ];
}
void Matrix_Dump(MATOBJ *A)
{
int i,j;
printf("\nRows: %d Cols %d",A->rows,A->cols);
for (i=0;i<4;i++)
{
printf("\nRow %d:",i);
for (j=0;j<4;j++)
{
printf(" %f ",A->affine[i][j]);
}
printf("\n");
}
printf("\n");
}
/*
* Tcl List Utilities
*/
int Matrix_FromObj(Tcl_Interp *interp, Tcl_Obj *listPtr,MATOBJ *matrix)
{
Tcl_Obj **rowPtrs;
Tcl_Obj **elemPtrs;
int result;
int rows,cols;
register int i,j;
int len;
/* Step one, Measure the matrix */
result = Tcl_ListObjGetElements(interp, listPtr, &rows, &rowPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Digesting Rows");
return result;
}
result = Tcl_ListObjGetElements(interp, rowPtrs[0], &cols, &elemPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Digesting Rows");
return result;
}
/* Link what we have found so far */
matrix->rows = rows;
matrix->cols = cols;
affine_ZeroMatrix(matrix->affine);
if (cols==1) {
for(i=0;i<rows;i++) {
matrix->rows = cols;
matrix->cols = rows;
double temp;
result = Tcl_GetDoubleFromObj(interp, rowPtrs[i], &temp);
if (result != TCL_OK) {
Matrix_Error("Error Loading Elements");
return result;
}
if (result != TCL_OK) {
Matrix_Error("Error Interpreting Value");
return result;
}
matrix->affine[0][i]=temp;
}
} else {
for(i=0;i<rows;i++) {
result = Tcl_ListObjGetElements(interp, rowPtrs[i], &len, &elemPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Loading Elements");
return result;
}
if(len != cols) {
Matrix_Error("Columns Not Uniform");
return TCL_ERROR;
}
for(j=0;j<len;j++) {
double temp;
result = Tcl_GetDoubleFromObj(interp, elemPtrs[j], &temp);
if (result != TCL_OK) {
Matrix_Error("Bad Argument or command");
return result;
}
matrix->affine[i][j]=temp;
}
}
}
return TCL_OK;
}
Tcl_Obj *Matrix_ToList(MATOBJ *matrix) {
Tcl_Obj *dest=Tcl_NewObj();
Tcl_Obj **row;
Tcl_Obj **col;
int rows,cols;
register int i,j;
/* Step 1, dimension matrix */
rows = matrix->rows;
cols = matrix->cols;
if(rows==1) {
/*
* Output single-row matrices (i.e. vectors)
* as a single tcl list (rather than nest them
* as a list within a list)
*/
rows=cols;
row = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * rows);
for(j=0;j<cols;j++) {
row[j] = Tcl_NewDoubleObj(matrix->affine[0][j]);
}
} else {
row = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * rows);
col = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * cols);
for(i=0;i<rows;i++) {
for(j=0;j<cols;j++) {
col[j] = Tcl_NewDoubleObj(matrix->affine[i][j]);
}
row[i] = Tcl_NewListObj(cols,col);
}
}
Tcl_SetListObj(dest,rows,row);
return dest;
}
void matrix_ToVector(MATOBJ *A,VECTOR R)
{
R[iX]=A->vector[iX];
R[jY]=A->vector[jY];
R[kZ]=A->vector[kZ];
}
void vector_ToMatrix(VECTOR A,MATOBJ *R)
{
R->rows=3;
R->cols=1;
R->vector[iX]=A[iX];
R->vector[jY]=A[jY];
R->vector[kZ]=A[kZ];
}
void matrix_ToAffine(MATOBJ *A,AFFINE R)
{
register int i,j;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
R[i][j]=A->affine[i][j];
}
void affine_ToMatrix(AFFINE A,MATOBJ *R)
{
register int i,j;
R->rows=4;
R->cols=4;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
R->affine[i][j]=A[i][j];
}
int affine_Push(AFFINE value)
{
MATOBJ temp;
affine_ToMatrix(value,&temp);
return (MatStack_Push(&temp));
}
int vector_Push(VECTOR value)
{
MATOBJ temp;
vector_ToMatrix(value,&temp);
return (MatStack_Push(&temp));
}
int affine_Pop(AFFINE value)
{
MATOBJ temp;
if (MatStack_Pop(&temp) != TCL_OK) {
Matrix_Error("Error Affine POP");
return TCL_ERROR;
}
matrix_ToAffine(&temp,value);
return TCL_OK;
}
int vector_Pop(VECTOR value)
{
MATOBJ temp;
if (MatStack_Pop(&temp) != TCL_OK) {
Matrix_Error("Error Vector POP");
return TCL_ERROR;
}
matrix_ToVector(&temp,value);
return TCL_OK;
}
static char *vectorCmds[] = {
"*",
"*.",
"*X",
"+",
"-",
"affine_identity",
"affine_multiply",
"affine_rotate",
"affine_scale",
"affine_translate",
"cartesian_to_cylindrical",
"cartesian_to_spherical",
"copy",
"cylindrical_to_cartesian",
"cylindrical_to_degrees",
"cylindrical_to_radians",
"dt_get",
"dt_set",
"dump",
"load",
"pi",
"spherical_to_cartesian",
"spherical_to_degrees",
"spherical_to_radians",
"store",
"to_degrees",
"to_radians",
"vector_add",
"vector_cross_product",
"vector_dot_product",
"vector_length",
"vector_scale",
"vector_subtract",
"vector_transform_affine",
(char *)NULL
};
static enum {
vexpr_opcode_star,
vexpr_opcode_stardot,
vexpr_opcode_starX,
vexpr_opcode_plus,
vexpr_opcode_minus,
vexpr_opcode_affine_identity,
vexpr_opcode_affine_multiply,
vexpr_opcode_affine_rotate,
vexpr_opcode_affine_scale,
vexpr_opcode_affine_translate,
vexpr_opcode_cartesian_to_cylindrical,
vexpr_opcode_cartesian_to_spherical,
vexpr_opcode_copy,
vexpr_opcode_cylindrical_to_cartesian,
vexpr_opcode_cylindrical_to_degrees,
vexpr_opcode_cylindrical_to_radians,
vexpr_opcode_dt_get,
vexpr_opcode_dt_set,
vexpr_opcode_dump,
vexpr_opcode_load,
vexpr_opcode_pi,
vexpr_opcode_spherical_to_cartesian,
vexpr_opcode_spherical_to_degrees,
vexpr_opcode_spherical_to_radians,
vexpr_opcode_store,
vexpr_opcode_to_degrees,
vexpr_opcode_to_radians,
vexpr_opcode_vector_add,
vexpr_opcode_vector_cross_product,
vexpr_opcode_vector_dot_product,
vexpr_opcode_vector_length,
vexpr_opcode_vector_scale,
vexpr_opcode_vector_subtract,
vexpr_opcode_vector_transform_affine
} vexpr_opcodes;
int Stack_VectorCommand(int opCode)
{
MATOBJ A,B,C;
static MATOBJ STORE;
static double dt;
switch(opCode)
{
case vexpr_opcode_affine_identity: {
affine_IdentityMatrix(C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
case vexpr_opcode_affine_multiply: {
POP(&A);
POP(&B);
affine_Multiply(A.affine,B.affine,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
case vexpr_opcode_affine_rotate: {
POP(&A);
affine_Rotate(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
case vexpr_opcode_affine_scale: {
POP(&A);
affine_Scale(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
case vexpr_opcode_affine_translate: {
POP(&A);
affine_Translate(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
case vexpr_opcode_cartesian_to_cylindrical: {
POP(&A);
vector_ToCylinder(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
case vexpr_opcode_cartesian_to_spherical: {
POP(&A);
vector_ToSphere(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
case vexpr_opcode_copy: {
POP(&A);
if(MatStack_Push(&A) != TCL_OK) return TCL_ERROR;
return(MatStack_Push(&A));
}
case vexpr_opcode_cylindrical_to_cartesian: {
POP(&A);
cylinder_ToVector(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
case vexpr_opcode_cylindrical_to_degrees: {
POP(&A);
A.vector[THETA]/=M_PI_180;
return(MatStack_Push(&A));
}
case vexpr_opcode_cylindrical_to_radians: {
POP(&A);
A.vector[THETA]*=M_PI_180;
return(MatStack_Push(&A));
}
case vexpr_opcode_dt_get: {
A.rows=1;
A.cols=1;
A.cells[0]=dt;
return(MatStack_Push(&A));
}
case vexpr_opcode_dt_set: {
POP(&A);
A.rows=1;
A.cols=1;
dt=A.cells[0];
return(MatStack_Push(&A));
}
case vexpr_opcode_dump: {
POP(&A);
Matrix_Dump(&A);
return(MatStack_Push(&A));
}
case vexpr_opcode_load: {
A.rows=STORE.rows;
A.cols=STORE.cols;
affine_Copy(STORE.affine,A.affine);
return(MatStack_Push(&A));
}
case vexpr_opcode_pi: {
A.rows=A.cols=1;
A.cells[0]=M_PI;
return(MatStack_Push(&A));
}
case vexpr_opcode_spherical_to_cartesian: {
POP(&A);
sphere_ToVector(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
case vexpr_opcode_spherical_to_degrees: {
POP(&A);
A.vector[THETA]/=M_PI_180;
A.vector[PHI]/=M_PI_180;
return(MatStack_Push(&A));
}
case vexpr_opcode_spherical_to_radians: {
POP(&A);
A.vector[THETA]*=M_PI_180;
A.vector[PHI]*=M_PI_180;
return(MatStack_Push(&A));
}
case vexpr_opcode_store: {
POP(&A);
STORE.rows=A.rows;
STORE.cols=A.cols;
affine_Copy(A.affine,STORE.affine);
return(MatStack_Push(&A));
}
case vexpr_opcode_to_degrees: {
POP(&A);
vector_Scale(A.vector,1.0/M_PI_180);
return(MatStack_Push(&A));
}
case vexpr_opcode_to_radians: {
POP(&A);
vector_Scale(A.vector,M_PI_180);
return(MatStack_Push(&A));
}
case vexpr_opcode_plus:
case vexpr_opcode_vector_add: {
POP(&A);
POP(&B);
int i;
for(i=0;i<16;i++) {
A.cells[i]+=B.cells[i];
}
return(MatStack_Push(&A));
}
case vexpr_opcode_starX:
case vexpr_opcode_vector_cross_product: {
POP(&A);
POP(&B);
int i,j;
double result=0.0;
C.cells[iX]=A.cells[jY]*B.cells[kZ]-A.cells[kZ]*B.cells[jY];
C.cells[jY]=A.cells[kZ]*B.cells[iX]-A.cells[iX]*B.cells[kZ];
C.cells[kZ]=A.cells[iX]*B.cells[jY]-A.cells[jY]*B.cells[iX];
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
case vexpr_opcode_stardot:
case vexpr_opcode_vector_dot_product: {
POP(&A);
POP(&B);
int i,j;
double result=0.0;
for(i=0;i<4;i++) {
result+=A.cells[i]*B.cells[i];
}
C.cells[0]=result;
C.rows=1;
C.cols=1;
return(MatStack_Push(&C));
}
case vexpr_opcode_vector_length: {
POP(&A);
B.rows=B.cols=1;
B.cells[0]=vector_Length(A.vector);
return(MatStack_Push(&B));
}
case vexpr_opcode_star:
case vexpr_opcode_vector_scale: {
int i;
double S=A.cells[0];
POP(&A);
POP(&B);
for(i=0;i<16;i++) {
B.cells[i]*=S;
}
return(MatStack_Push(&B));
}
case vexpr_opcode_minus:
case vexpr_opcode_vector_subtract: {
int i;
POP(&A);
POP(&B);
for(i=0;i<16;i++) {
A.cells[i]-=B.cells[i];
}
return(MatStack_Push(&A));
}
case vexpr_opcode_vector_transform_affine: {
POP(&A);
POP(&B);
C.rows=1;
C.cols=3;
vector_MatrixMultiply(A.vector,B.affine,C.vector);
return(MatStack_Push(&C));
}
}
Matrix_Error("Unknown/Unimplemented command");
return TCL_ERROR;
}
EXTERN int Tcl_VexprObjCmd(dummy, tinterp, objc, objv)
ClientData dummy; /* Not used. */
Tcl_Interp *tinterp; /* Current interpreter. */
int objc; /* Number of arguments. */
Tcl_Obj *CONST objv[]; /* Argument objects. */
{
MATOBJ mresult;
int i,result;
int index;
current_interp=tinterp;
result = TCL_OK;
for(i=1;i<objc;i++) {
if (Tcl_GetIndexFromObj(tinterp, objv[i], vectorCmds, "verb", 0,
(int *) &index) != TCL_OK)
{
MATOBJ temp;
/* Not an opcode, push value into stack */
if (Matrix_FromObj(tinterp,objv[i],&temp) != TCL_OK) {
/* Failed to convert argument to a matrix. Die hard */
return TCL_ERROR;
}
if (MatStack_Push(&temp) != TCL_OK) {
return TCL_ERROR;
}
} else {
Tcl_ResetResult(tinterp);
result = Stack_VectorCommand(index);
if(result != TCL_OK) {
return result;
}
}
}
if (MatStack_Pop(&mresult) != TCL_OK)
{
return TCL_ERROR;
}
Tcl_SetObjResult(tinterp,Matrix_ToList(&mresult));
return TCL_OK;
}
|
Added generic/tclVexpr.tcl.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 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 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 |
###
# This file contains the definitions and documentation
# for the vexpr opcodes. To add a new opcode, run this
# script and recompile tclVexpr.c
#
# It need only be called if the developer wishes to add
# a new opcode
###
set path [file dirname [file normalize [info script]]]
#package require dict
proc vector_enum name {
return vexpr_opcode_[string map {+ plus - minus * star . dot} $name]
}
proc vector_opcode {name info cimpl} {
global opcode_cname opcode_aliases opcode_body opcode_info opcode_enum
set opcode_cname($name) $name
set opcode_enum($name) [vector_enum $name]
set opcode_body($name) $cimpl
set opcode_info($name) {
aliases {}
description {}
arguments {}
result {}
}
foreach {field value} $info {
dict set opcode_info($name) $field $value
switch $field {
aliases {
foreach v $value {
set opcode_cname($v) $name
set opcode_enum($v) [vector_enum $v]
lappend opcode_aliases($name) $v
}
}
}
}
}
###
# vector_opcode defines a new opcode
# The format is:
# vector_opcode NAME METADATA C_IMPLEMEMTATION
###
vector_opcode affine_identity {
description {Pushes an affine identity matrix onto the stack}
arguments {}
result AFFINE
} {
affine_IdentityMatrix(C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
vector_opcode affine_multiply {
description {Muliply 2 4x4 matrices. Used to combine 2 affine transformations. Note: Some affine transformations need to be performed in a particular order to make sense.}
arguments {AFFINE AFFINE}
result AFFINE
} {
POP(&A);
POP(&B);
affine_Multiply(A.affine,B.affine,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
vector_opcode affine_rotate {
description {Convert a rotation vector (X Y Z) into an affine transformation}
arguments VECTOR
result AFFINE
} {
POP(&A);
affine_Rotate(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
vector_opcode affine_scale {
description {Convert a scale vector (X Y Z) into an affine transformation}
arguments VECTOR
result AFFINE
} {
POP(&A);
affine_Scale(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
vector_opcode affine_translate {
description {Convert a displacement vector (X Y Z) into an affine transformation}
arguments VECTOR
result AFFINE
} {
POP(&A);
affine_Translate(A.vector,C.affine);
C.rows=4;
C.cols=4;
return(MatStack_Push(&C));
}
vector_opcode cartesian_to_cylindrical {
description {Convert a cartesian vector to cylindrical coordinates}
arguments VECTOR
result VECTOR
} {
POP(&A);
vector_ToCylinder(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
vector_opcode cartesian_to_spherical {
description {Convert a cartesian vector to spherical vector}
arguments VECTOR
result VECTOR
} {
POP(&A);
vector_ToSphere(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
vector_opcode cylindrical_to_cartesian {
description {Convert a cylindrical vector to a cartesian vector}
arguments VECTOR
result VECTOR
} {
POP(&A);
cylinder_ToVector(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
vector_opcode cylindrical_to_degrees {
description {Convert a cylindrical vector in radians to a cylindrical vector in degrees}
arguments VECTOR
result VECTOR
} {
POP(&A);
A.vector[THETA]/=M_PI_180;
return(MatStack_Push(&A));
}
vector_opcode cylindrical_to_radians {
description {Convert a cylindrical vector in degrees to a cylindrical vector in radians}
arguments VECTOR
result VECTOR
} {
POP(&A);
A.vector[THETA]*=M_PI_180;
return(MatStack_Push(&A));
}
vector_opcode copy {
description {Place an additional copy of the top of the stack on the top of the stack}
arguments {ANY}
result {ANY ANY}
} {
POP(&A);
if(MatStack_Push(&A) != TCL_OK) return TCL_ERROR;
return(MatStack_Push(&A));
}
vector_opcode dump {
description {Output the contents of the top of the stack to stdout}
arguments {ANY}
result {}
} {
POP(&A);
Matrix_Dump(&A);
return(MatStack_Push(&A));
}
vector_opcode dt_get {
aliases {}
description {Pushes the stored value of dT into the stack}
arguments {}
result SCALER
} {
A.rows=1;
A.cols=1;
A.cells[0]=dt;
return(MatStack_Push(&A));
}
vector_opcode dt_set {
aliases {}
description {Stores a new value for dT}
arguments SCALER
result {}
} {
POP(&A);
A.rows=1;
A.cols=1;
dt=A.cells[0];
return(MatStack_Push(&A));
}
vector_opcode load {
description {Push a previosly stored value the top of the stack}
arguments {}
result ANY
} {
A.rows=STORE.rows;
A.cols=STORE.cols;
affine_Copy(STORE.affine,A.affine);
return(MatStack_Push(&A));
}
vector_opcode pi {
aliases {}
description {Pushes the value of PI into the stack}
arguments {}
result SCALER
} {
A.rows=A.cols=1;
A.cells[0]=M_PI;
return(MatStack_Push(&A));
}
vector_opcode spherical_to_cartesian {
description {Convert a spherical vector to a cartesian vector}
arguments VECTOR
result VECTOR
} {
POP(&A);
sphere_ToVector(A.vector,C.vector);
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
vector_opcode spherical_to_degrees {
description {Convert a spherical vector in radians to a spherical vector in degrees}
arguments VECTOR
result VECTOR
} {
POP(&A);
A.vector[THETA]/=M_PI_180;
A.vector[PHI]/=M_PI_180;
return(MatStack_Push(&A));
}
vector_opcode spherical_to_radians {
description {Convert a spherical vector in degrees to a spherical vector in radians}
arguments VECTOR
result VECTOR
} {
POP(&A);
A.vector[THETA]*=M_PI_180;
A.vector[PHI]*=M_PI_180;
return(MatStack_Push(&A));
}
vector_opcode store {
description {Store the top of the stack internally for later use. The value stored remains at the top of the stack.}
arguments {ANY}
result ANY
} {
POP(&A);
STORE.rows=A.rows;
STORE.cols=A.cols;
affine_Copy(A.affine,STORE.affine);
return(MatStack_Push(&A));
}
vector_opcode to_radians {
description {Convert Degrees to Radians}
arguments {VECTOR}
result {VECTOR}
} {
POP(&A);
vector_Scale(A.vector,M_PI_180);
return(MatStack_Push(&A));
}
vector_opcode to_degrees {
description {Convert Radians to Degress}
arguments {VECTOR}
result {VECTOR}
} {
POP(&A);
vector_Scale(A.vector,1.0/M_PI_180);
return(MatStack_Push(&A));
}
vector_opcode vector_add {
aliases {+}
description {Add Two Vectors}
arguments {VECTOR VECTOR}
result {VECTOR}
} {
POP(&A);
POP(&B);
int i;
for(i=0;i<16;i++) {
A.cells[i]+=B.cells[i];
}
return(MatStack_Push(&A));
}
vector_opcode vector_length {
aliases {}
description {Convert a vector to it's length}
arguments {VECTOR}
result {SCALER}
} {
POP(&A);
B.rows=B.cols=1;
B.cells[0]=vector_Length(A.vector);
return(MatStack_Push(&B));
}
vector_opcode vector_cross_product {
aliases {*X}
description {Push the cross product of two vectors on the stack}
arguments {VECTOR VECTOR}
result {VECTOR}
} {
POP(&A);
POP(&B);
int i,j;
double result=0.0;
C.cells[iX]=A.cells[jY]*B.cells[kZ]-A.cells[kZ]*B.cells[jY];
C.cells[jY]=A.cells[kZ]*B.cells[iX]-A.cells[iX]*B.cells[kZ];
C.cells[kZ]=A.cells[iX]*B.cells[jY]-A.cells[jY]*B.cells[iX];
C.rows=1;
C.cols=3;
return(MatStack_Push(&C));
}
vector_opcode vector_dot_product {
aliases {*.}
description {Push the dot product of two vectors on the stack}
arguments {VECTOR VECTOR}
result {SCALER}
} {
POP(&A);
POP(&B);
int i,j;
double result=0.0;
for(i=0;i<4;i++) {
result+=A.cells[i]*B.cells[i];
}
C.cells[0]=result;
C.rows=1;
C.cols=1;
return(MatStack_Push(&C));
}
vector_opcode vector_scale {
aliases {*}
description {Scale a vector by a scaler}
arguments {VECTOR SCALER}
result {VECTOR}
} {
int i;
double S=A.cells[0];
POP(&A);
POP(&B);
for(i=0;i<16;i++) {
B.cells[i]*=S;
}
return(MatStack_Push(&B));
}
vector_opcode vector_subtract {
aliases {-}
description {Subtract Two Vectors}
arguments {VECTOR VECTOR}
result {VECTOR}
} {
int i;
POP(&A);
POP(&B);
for(i=0;i<16;i++) {
A.cells[i]-=B.cells[i];
}
return(MatStack_Push(&A));
}
vector_opcode vector_transform_affine {
aliases {}
description {Transform a vector using an affine matrix}
arguments {AFFINE VECTOR}
result {VECTOR}
} {
POP(&A);
POP(&B);
C.rows=1;
C.cols=3;
vector_MatrixMultiply(A.vector,B.affine,C.vector);
return(MatStack_Push(&C));
}
###
# With documentation in hand, lets start writing files
###
set fout [open [file join $path tclVexpr.c] w]
set manout [open [file join $path .. doc vexpr.n] w]
puts $manout "
.\\\"
.\\\" Copyright (c) 2012 Sean Woods
.\\\"
.\\\" See the file \"license.terms\" for information on usage and redistribution
.\\\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
.\\\"
.so man.macros
.TH vexpr n 8.7 Tcl \"Tcl Built-In Commands\"
.BS
.\\\" Note: do not modify the .SH NAME line immediately below!
.SH NAME
vexpr \\- Vector Expression Evaluator
.SH SYNOPSIS
\\fBvexpr \\fIarg arg opcode \\fR?\\fIarg opcode...?\\fR
.BE
.SH DESCRIPTION
.PP
Performs one of several vector operations, depending on the \\fIopcode\\fR.
Opcodes and arguments are evaluated using reverse-polish notation.
.
Example:
.CS
\\fBvexpr {1 1 1} {2 2 2} +\\fR
.CE
.PP
Will return \\fB\\{3.0 3.0 3.0}\\fR.
.PP
.RE
The legal \\fIopcode\\fRs:
"
###
# Add in the start of the file
###
puts $fout {
#include <tcl.h>
#include <math.h>
#include <string.h>
#define VERSION "1.0"
/*
* Structures and Datatypes
*/
typedef double AFFINE[4][4];
typedef double QUATERNION[4];
typedef double VECTOR[3];
typedef double SCALER[1];
typedef struct GenMatrix {
int rows,cols;
union {
double *pointer;
double cells[16];
SCALER scaler;
VECTOR vector;
QUATERNION quaternion;
AFFINE affine;
};
} MATOBJ;
/* Vector array elements. */
#define U 0
#define V 1
#define iX 0
#define jY 1
#define kZ 2
#define W 3
#define VX(X) { *(X+0) }
#define VY(X) { *(X+1) }
#define VZ(X) { *(X+2) }
#define RADIUS 0
#define THETA 1
#define PHI 2
}
puts $fout {
/*
* Constants
*/
#ifndef M_PI
#define M_PI 3.1415926535897932384626
#endif
#ifndef M_PI_2
#define M_PI_2 1.57079632679489661923
#endif
#ifndef TWO_M_PI
#define TWO_M_PI 6.283185307179586476925286766560
#endif
#ifndef M_PI_180
#define M_PI_180 0.01745329251994329576
#endif
#ifndef M_PI_360
#define M_PI_360 0.00872664625997164788
#endif
#define MATSTACKSIZE 64
/*
* Module-Wide Variables
*/
/*
* Tcl Interface
*/
EXTERN int VecExpr_ObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *tinterp, int objc, Tcl_Obj *CONST objv[]));
/*
* Macros
*/
#define CosD(A) { cos(A * M_PI_180); }
#define SinD(A) { sin(A * M_PI_180); }
#define POP(X) { if (MatStack_Pop(X) != TCL_OK) return TCL_ERROR; }
#define PUSH(X) { if (MatStack_Push(X) != TCL_OK) return TCL_ERROR; }
/*
* Stack Commands
*/
static Tcl_Interp *current_interp;
static MATOBJ Stack[MATSTACKSIZE];
static int StackIdx=-1;
static char *ErrorString;
static int ErrorResult; /* Error if Non-Zero */
void Matrix_Error(const char *error) {
if(current_interp) {
Tcl_AppendResult(current_interp,error,(char *) NULL);
}
ErrorString=error;
ErrorResult = TCL_ERROR;
}
void Matrix_ErrorStr(Tcl_Obj *errResult)
{
Tcl_SetStringObj(errResult,ErrorString,-1);
}
/* Produce a general case matrix from a TCL List */
void MatStack_Clear(void)
{
StackIdx = -1;
}
void affine_Copy(AFFINE A,AFFINE B)
{
int i,j;
for(i=0;i<4;i++)
for(j=0;j<4;j++)
B[i][j]=A[i][j];
}
inline void Matrix_Copy(MATOBJ *A,MATOBJ *B)
{
memcpy(B,A,sizeof(MATOBJ));
/*
B->rows=A->rows;
B->cols=A->cols;
affine_Copy(A->affine,B->affine);
*/
}
/* Produce a general case matrix from a TCL List */
int MatStack_Pop(MATOBJ *item)
{
if (StackIdx < 0)
{
Matrix_Error("Not Enough Arguments");
item=NULL;
return TCL_ERROR;
}
Matrix_Copy(&Stack[StackIdx],item);
StackIdx--;
return TCL_OK;
}
int MatStack_Push(MATOBJ *value) {
if (StackIdx >= MATSTACKSIZE) {
Matrix_Error("Vector Stack Overflow");
return TCL_ERROR;
}
StackIdx++;
Matrix_Copy(value,&Stack[StackIdx]);
return TCL_OK;
}
/*
* Affine Operations
* Must be performed on a 4x4 matrix
*/
void affine_ZeroMatrix(AFFINE A)
{
register int i,j;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
A[i][j]=0;
}
void affine_IdentityMatrix(AFFINE A)
{
register int i;
affine_ZeroMatrix(A);
for (i=0;i<4;i++)
A[i][i]=1;
}
void affine_Translate(VECTOR A,AFFINE B)
{
affine_IdentityMatrix(B);
B[0][3]=-A[0];
B[1][3]=-A[1];
B[2][3]=-A[2];
}
void affine_Scale(VECTOR A,AFFINE B)
{
affine_ZeroMatrix(B);
B[0][0]=A[iX];
B[1][1]=A[jY];
B[2][2]=A[kZ];
B[3][3]=1.0;
}
void affine_RotateX(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[0][0]=1.0;
A[3][3]=1.0;
A[1][1]=c;
A[2][2]=c;
A[1][2]=s;
A[2][1]=0.0-s;
}
void affine_RotateY(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[1][1]=1.0;
A[3][3]=1.0;
A[0][0]=c;
A[2][2]=c;
A[0][2]=0.0-s;
A[2][0]=s;
}
void affine_RotateZ(double angle,AFFINE A)
{
double c,s;
c=cos(angle);
s=sin(angle);
affine_ZeroMatrix(A);
A[2][2]=1.0;
A[3][3]=1.0;
A[0][0]=c;
A[1][1]=c;
A[0][1]=s;
A[1][0]=0.0-s;
}
void affine_Multiply(AFFINE A,AFFINE B,AFFINE R)
{
int i,j,k;
AFFINE temp_matrix;
for (i=0;i<4;i++)
{
for (j=0;j<4;j++)
{
temp_matrix[i][j]=0.0;
for (k=0;k<4;k++) temp_matrix[i][j]+=A[i][k]*B[k][j];
}
}
affine_Copy(temp_matrix,R);
}
void affine_Rotate(VECTOR rotate,AFFINE R)
{
AFFINE OP;
affine_RotateX(rotate[iX],R);
affine_RotateY(rotate[jY],OP);
affine_Multiply(OP,R,R);
affine_RotateZ(rotate[kZ],OP);
affine_Multiply(OP,R,R);
}
void affine_ComputeTransform(VECTOR trans,VECTOR rotate,AFFINE R)
{
AFFINE M1,M2,M3,M4,M5,M6,M7,M8,M9;
//VECTOR scale = {1.0, 1.0, 1.0};
//affine_Scale(scale,M1);
affine_IdentityMatrix(M1);
affine_RotateX(rotate[iX],M2);
affine_RotateY(rotate[jY],M3);
affine_RotateZ(rotate[kZ],M4);
affine_Translate(trans,M5);
affine_Multiply(M2,M1,M6);
affine_Multiply(M3,M6,M7);
affine_Multiply(M4,M7,M8);
affine_Multiply(M5,M8,M9);
affine_Copy(M9,R);
}
int affine_Inverse(AFFINE r, AFFINE m)
{
double d00, d01, d02, d03;
double d10, d11, d12, d13;
double d20, d21, d22, d23;
double d30, d31, d32, d33;
double m00, m01, m02, m03;
double m10, m11, m12, m13;
double m20, m21, m22, m23;
double m30, m31, m32, m33;
double D;
m00 = m[0][0]; m01 = m[0][1]; m02 = m[0][2]; m03 = m[0][3];
m10 = m[1][0]; m11 = m[1][1]; m12 = m[1][2]; m13 = m[1][3];
m20 = m[2][0]; m21 = m[2][1]; m22 = m[2][2]; m23 = m[2][3];
m30 = m[3][0]; m31 = m[3][1]; m32 = m[3][2]; m33 = m[3][3];
d00 = m11*m22*m33 + m12*m23*m31 + m13*m21*m32 - m31*m22*m13 - m32*m23*m11 - m33*m21*m12;
d01 = m10*m22*m33 + m12*m23*m30 + m13*m20*m32 - m30*m22*m13 - m32*m23*m10 - m33*m20*m12;
d02 = m10*m21*m33 + m11*m23*m30 + m13*m20*m31 - m30*m21*m13 - m31*m23*m10 - m33*m20*m11;
d03 = m10*m21*m32 + m11*m22*m30 + m12*m20*m31 - m30*m21*m12 - m31*m22*m10 - m32*m20*m11;
d10 = m01*m22*m33 + m02*m23*m31 + m03*m21*m32 - m31*m22*m03 - m32*m23*m01 - m33*m21*m02;
d11 = m00*m22*m33 + m02*m23*m30 + m03*m20*m32 - m30*m22*m03 - m32*m23*m00 - m33*m20*m02;
d12 = m00*m21*m33 + m01*m23*m30 + m03*m20*m31 - m30*m21*m03 - m31*m23*m00 - m33*m20*m01;
d13 = m00*m21*m32 + m01*m22*m30 + m02*m20*m31 - m30*m21*m02 - m31*m22*m00 - m32*m20*m01;
d20 = m01*m12*m33 + m02*m13*m31 + m03*m11*m32 - m31*m12*m03 - m32*m13*m01 - m33*m11*m02;
d21 = m00*m12*m33 + m02*m13*m30 + m03*m10*m32 - m30*m12*m03 - m32*m13*m00 - m33*m10*m02;
d22 = m00*m11*m33 + m01*m13*m30 + m03*m10*m31 - m30*m11*m03 - m31*m13*m00 - m33*m10*m01;
d23 = m00*m11*m32 + m01*m12*m30 + m02*m10*m31 - m30*m11*m02 - m31*m12*m00 - m32*m10*m01;
d30 = m01*m12*m23 + m02*m13*m21 + m03*m11*m22 - m21*m12*m03 - m22*m13*m01 - m23*m11*m02;
d31 = m00*m12*m23 + m02*m13*m20 + m03*m10*m22 - m20*m12*m03 - m22*m13*m00 - m23*m10*m02;
d32 = m00*m11*m23 + m01*m13*m20 + m03*m10*m21 - m20*m11*m03 - m21*m13*m00 - m23*m10*m01;
d33 = m00*m11*m22 + m01*m12*m20 + m02*m10*m21 - m20*m11*m02 - m21*m12*m00 - m22*m10*m01;
D = m00*d00 - m01*d01 + m02*d02 - m03*d03;
if (D == 0.0)
{
Matrix_Error("Singular matrix in MInvers.");
return TCL_ERROR;
}
r[0][0] = d00/D; r[0][1] = -d10/D; r[0][2] = d20/D; r[0][3] = -d30/D;
r[1][0] = -d01/D; r[1][1] = d11/D; r[1][2] = -d21/D; r[1][3] = d31/D;
r[2][0] = d02/D; r[2][1] = -d12/D; r[2][2] = d22/D; r[2][3] = -d32/D;
r[3][0] = -d03/D; r[3][1] = d13/D; r[3][2] = -d23/D; r[3][3] = d33/D;
return TCL_OK;
}
/*
* A - the vector to be tranformed
* B - the affine tranformation matrix
* R - a place to dump the result
*
* A and R MUST BE DIFFERENT
*/
void vector_MatrixMultiply(VECTOR A,AFFINE M,VECTOR R)
{
int i,j;
for(i=0;i<3;i++)
{
R[i]=A[iX]*M[0][i] + A[jY]*M[1][i] + A[kZ]* M[2][i] + M[3][i];
}
}
void vector_Scale(VECTOR A,double S)
{
A[iX]*=S;
A[jY]*=S;
A[kZ]*=S;
}
double vector_Length(VECTOR A)
{
return (sqrt(A[0]*A[0]+A[1]*A[1]+A[2]*A[2]));
}
double vector_LengthInvSqr(VECTOR A)
{
return (1.0/(A[0]*A[0]+A[1]*A[1]+A[2]*A[2]));
}
void vector_Normalize(VECTOR A)
{
double d;
d=1.0 / vector_Length(A);
A[0]*=d;
A[1]*=d;
A[2]*=d;
}
void vector_ToSphere(VECTOR A,VECTOR R)
{
double S;
R[RADIUS]=vector_Length(A);
S=sqrt(A[iX]*A[iX]+A[jY]*A[jY]);
if (A[iX] > 0.0) {
R[THETA] =asin(A[jY]/S);
} else {
R[THETA] =M_PI - asin(A[jY]/S);
}
R[PHI] =asin(A[kZ]/R[RADIUS]);
}
void sphere_ToVector(VECTOR A,VECTOR R)
{
R[iX]=A[RADIUS]*cos(A[THETA])*cos(A[PHI]);
R[jY]=A[RADIUS]*sin(A[THETA])*cos(A[PHI]);
R[kZ]=A[RADIUS]*sin(A[PHI]);
}
void cylinder_ToVector(VECTOR A,VECTOR R)
{
R[iX]=A[RADIUS]*cos(A[THETA]);
R[jY]=A[RADIUS]*sin(A[THETA]);
R[kZ]=A[kZ];
}
void vector_ToCylinder(VECTOR A,VECTOR R)
{
R[RADIUS]=sqrt(A[iX]*A[iX] + A[jY]*A[jY]);
R[THETA] =atan2(A[jY],A[iX]);
R[kZ] =A[kZ];
}
void Matrix_Dump(MATOBJ *A)
{
int i,j;
printf("\nRows: %d Cols %d",A->rows,A->cols);
for (i=0;i<4;i++)
{
printf("\nRow %d:",i);
for (j=0;j<4;j++)
{
printf(" %f ",A->affine[i][j]);
}
printf("\n");
}
printf("\n");
}
/*
* Tcl List Utilities
*/
int Matrix_FromObj(Tcl_Interp *interp, Tcl_Obj *listPtr,MATOBJ *matrix)
{
Tcl_Obj **rowPtrs;
Tcl_Obj **elemPtrs;
int result;
int rows,cols;
register int i,j;
int len;
/* Step one, Measure the matrix */
result = Tcl_ListObjGetElements(interp, listPtr, &rows, &rowPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Digesting Rows");
return result;
}
result = Tcl_ListObjGetElements(interp, rowPtrs[0], &cols, &elemPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Digesting Rows");
return result;
}
/* Link what we have found so far */
matrix->rows = rows;
matrix->cols = cols;
affine_ZeroMatrix(matrix->affine);
if (cols==1) {
for(i=0;i<rows;i++) {
matrix->rows = cols;
matrix->cols = rows;
double temp;
result = Tcl_GetDoubleFromObj(interp, rowPtrs[i], &temp);
if (result != TCL_OK) {
Matrix_Error("Error Loading Elements");
return result;
}
if (result != TCL_OK) {
Matrix_Error("Error Interpreting Value");
return result;
}
matrix->affine[0][i]=temp;
}
} else {
for(i=0;i<rows;i++) {
result = Tcl_ListObjGetElements(interp, rowPtrs[i], &len, &elemPtrs);
if (result != TCL_OK) {
Matrix_Error("Error Loading Elements");
return result;
}
if(len != cols) {
Matrix_Error("Columns Not Uniform");
return TCL_ERROR;
}
for(j=0;j<len;j++) {
double temp;
result = Tcl_GetDoubleFromObj(interp, elemPtrs[j], &temp);
if (result != TCL_OK) {
Matrix_Error("Bad Argument or command");
return result;
}
matrix->affine[i][j]=temp;
}
}
}
return TCL_OK;
}
Tcl_Obj *Matrix_ToList(MATOBJ *matrix) {
Tcl_Obj *dest=Tcl_NewObj();
Tcl_Obj **row;
Tcl_Obj **col;
int rows,cols;
register int i,j;
/* Step 1, dimension matrix */
rows = matrix->rows;
cols = matrix->cols;
if(rows==1) {
/*
* Output single-row matrices (i.e. vectors)
* as a single tcl list (rather than nest them
* as a list within a list)
*/
rows=cols;
row = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * rows);
for(j=0;j<cols;j++) {
row[j] = Tcl_NewDoubleObj(matrix->affine[0][j]);
}
} else {
row = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * rows);
col = (Tcl_Obj **)Tcl_Alloc(sizeof(Tcl_Obj *) * cols);
for(i=0;i<rows;i++) {
for(j=0;j<cols;j++) {
col[j] = Tcl_NewDoubleObj(matrix->affine[i][j]);
}
row[i] = Tcl_NewListObj(cols,col);
}
}
Tcl_SetListObj(dest,rows,row);
return dest;
}
void matrix_ToVector(MATOBJ *A,VECTOR R)
{
R[iX]=A->vector[iX];
R[jY]=A->vector[jY];
R[kZ]=A->vector[kZ];
}
void vector_ToMatrix(VECTOR A,MATOBJ *R)
{
R->rows=3;
R->cols=1;
R->vector[iX]=A[iX];
R->vector[jY]=A[jY];
R->vector[kZ]=A[kZ];
}
void matrix_ToAffine(MATOBJ *A,AFFINE R)
{
register int i,j;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
R[i][j]=A->affine[i][j];
}
void affine_ToMatrix(AFFINE A,MATOBJ *R)
{
register int i,j;
R->rows=4;
R->cols=4;
for (i=0;i<4;i++)
for (j=0;j<4;j++)
R->affine[i][j]=A[i][j];
}
int affine_Push(AFFINE value)
{
MATOBJ temp;
affine_ToMatrix(value,&temp);
return (MatStack_Push(&temp));
}
int vector_Push(VECTOR value)
{
MATOBJ temp;
vector_ToMatrix(value,&temp);
return (MatStack_Push(&temp));
}
int affine_Pop(AFFINE value)
{
MATOBJ temp;
if (MatStack_Pop(&temp) != TCL_OK) {
Matrix_Error("Error Affine POP");
return TCL_ERROR;
}
matrix_ToAffine(&temp,value);
return TCL_OK;
}
int vector_Pop(VECTOR value)
{
MATOBJ temp;
if (MatStack_Pop(&temp) != TCL_OK) {
Matrix_Error("Error Vector POP");
return TCL_ERROR;
}
matrix_ToVector(&temp,value);
return TCL_OK;
}
}
puts $fout "static char *vectorCmds\[\] = \{"
set thelist {}
foreach opcode [lsort -dictionary [array names opcode_cname]] {
puts $fout " \"$opcode\","
lappend thelist $opcode_enum($opcode)
}
puts $fout " (char *)NULL"
puts $fout "\}\;
"
puts $fout "static enum \{"
puts $fout " [join $thelist ",\n "]"
puts $fout "\} vexpr_opcodes\;
"
puts $fout "int Stack_VectorCommand(int opCode)
\{
MATOBJ A,B,C\;
static MATOBJ STORE\;
static double dt\;
switch(opCode)
\{"
foreach opcode [lsort -dictionary [array names opcode_body]] {
puts $manout .TP
dict with opcode_info($opcode) {}
puts $manout "\\fB${opcode}\\fR"
puts $manout ".RS 1"
if {[llength $arguments]} {
puts $manout "Usage: \\fI$arguments\\fR \\fB${opcode}\\fR"
} else {
puts $manout "Usage: \\fB${opcode}\\fR"
}
puts $manout .RE
if { $aliases ne {} } {
puts $manout ".RS 1"
puts $manout "Aliases: $aliases"
puts $manout .RE
}
puts $manout ".RS 1"
if { $result eq {} } {
puts $manout "Result: (None)"
} else {
puts $manout "Result: $result"
}
puts $manout .RE
puts $manout .PP
puts $manout ".RS 1"
puts $manout "$description"
puts $manout .RE
if {[info exists opcode_aliases($opcode)]} {
foreach a $opcode_aliases($opcode) {
puts $fout " case $opcode_enum($a):"
}
}
puts $fout " case $opcode_enum($opcode): \{"
puts $fout $opcode_body($opcode)
puts $fout " \}"
}
puts $fout " \}"
puts $fout "
Matrix_Error(\"Unknown/Unimplemented command\")\;
return TCL_ERROR;
\}
"
puts $manout {
.SH "SEE ALSO"
expr(n)
.SH KEYWORDS
vector
}
puts $fout {
EXTERN int Tcl_VexprObjCmd(dummy, tinterp, objc, objv)
ClientData dummy; /* Not used. */
Tcl_Interp *tinterp; /* Current interpreter. */
int objc; /* Number of arguments. */
Tcl_Obj *CONST objv[]; /* Argument objects. */
{
MATOBJ mresult;
int i,result;
int index;
current_interp=tinterp;
result = TCL_OK;
for(i=1;i<objc;i++) {
if (Tcl_GetIndexFromObj(tinterp, objv[i], vectorCmds, "verb", 0,
(int *) &index) != TCL_OK)
{
MATOBJ temp;
/* Not an opcode, push value into stack */
if (Matrix_FromObj(tinterp,objv[i],&temp) != TCL_OK) {
/* Failed to convert argument to a matrix. Die hard */
return TCL_ERROR;
}
if (MatStack_Push(&temp) != TCL_OK) {
return TCL_ERROR;
}
} else {
Tcl_ResetResult(tinterp);
result = Stack_VectorCommand(index);
if(result != TCL_OK) {
return result;
}
}
}
if (MatStack_Pop(&mresult) != TCL_OK)
{
return TCL_ERROR;
}
Tcl_SetObjResult(tinterp,Matrix_ToList(&mresult));
return TCL_OK;
}
}
close $fout
close $manout
|
Changes to unix/Makefile.in.
| ︙ | ︙ | |||
303 304 305 306 307 308 309 | tclObj.o tclPanic.o tclParse.o tclPathObj.o tclPipe.o \ tclPkg.o tclPkgConfig.o tclPosixStr.o \ tclPreserve.o tclProc.o tclRegexp.o \ tclResolve.o tclResult.o tclScan.o tclStringObj.o \ tclStrToD.o tclThread.o \ tclThreadAlloc.o tclThreadJoin.o tclThreadStorage.o tclStubInit.o \ tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o tclZlib.o \ | | | 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | tclObj.o tclPanic.o tclParse.o tclPathObj.o tclPipe.o \ tclPkg.o tclPkgConfig.o tclPosixStr.o \ tclPreserve.o tclProc.o tclRegexp.o \ tclResolve.o tclResult.o tclScan.o tclStringObj.o \ tclStrToD.o tclThread.o \ tclThreadAlloc.o tclThreadJoin.o tclThreadStorage.o tclStubInit.o \ tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o tclZlib.o \ tclTomMathInterface.o tclVexpr.o \ tclAssembly.o OO_OBJS = tclOO.o tclOOBasic.o tclOOCall.o tclOODefineCmds.o tclOOInfo.o \ tclOOMethod.o tclOOStubInit.o TOMMATH_OBJS = bncore.o bn_reverse.o bn_fast_s_mp_mul_digs.o \ bn_fast_s_mp_sqr.o bn_mp_add.o bn_mp_and.o \ |
| ︙ | ︙ | |||
450 451 452 453 454 455 456 457 458 459 460 461 462 463 | $(GENERIC_DIR)/tclThreadAlloc.c \ $(GENERIC_DIR)/tclThreadJoin.c \ $(GENERIC_DIR)/tclThreadStorage.c \ $(GENERIC_DIR)/tclTimer.c \ $(GENERIC_DIR)/tclTrace.c \ $(GENERIC_DIR)/tclUtil.c \ $(GENERIC_DIR)/tclVar.c \ $(GENERIC_DIR)/tclAssembly.c \ $(GENERIC_DIR)/tclZlib.c OO_SRCS = \ $(GENERIC_DIR)/tclOO.c \ $(GENERIC_DIR)/tclOOBasic.c \ $(GENERIC_DIR)/tclOOCall.c \ | > | 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 | $(GENERIC_DIR)/tclThreadAlloc.c \ $(GENERIC_DIR)/tclThreadJoin.c \ $(GENERIC_DIR)/tclThreadStorage.c \ $(GENERIC_DIR)/tclTimer.c \ $(GENERIC_DIR)/tclTrace.c \ $(GENERIC_DIR)/tclUtil.c \ $(GENERIC_DIR)/tclVar.c \ $(GENERIC_DIR)/tclVexpr.c \ $(GENERIC_DIR)/tclAssembly.c \ $(GENERIC_DIR)/tclZlib.c OO_SRCS = \ $(GENERIC_DIR)/tclOO.c \ $(GENERIC_DIR)/tclOOBasic.c \ $(GENERIC_DIR)/tclOOCall.c \ |
| ︙ | ︙ | |||
1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 | tclUtil.o: $(GENERIC_DIR)/tclUtil.c $(PARSEHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtil.c tclUtf.o: $(GENERIC_DIR)/tclUtf.c $(GENERIC_DIR)/tclUniData.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtf.c tclVar.o: $(GENERIC_DIR)/tclVar.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclVar.c tclZlib.o: $(GENERIC_DIR)/tclZlib.c $(CC) -c $(CC_SWITCHES) $(ZLIB_INCLUDE) $(GENERIC_DIR)/tclZlib.c tclTest.o: $(GENERIC_DIR)/tclTest.c $(IOHDR) $(TCLREHDRS) | > > > | 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 | tclUtil.o: $(GENERIC_DIR)/tclUtil.c $(PARSEHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtil.c tclUtf.o: $(GENERIC_DIR)/tclUtf.c $(GENERIC_DIR)/tclUniData.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtf.c tclVexpr.o: $(GENERIC_DIR)/tclVexpr.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclVexpr.c tclVar.o: $(GENERIC_DIR)/tclVar.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclVar.c tclZlib.o: $(GENERIC_DIR)/tclZlib.c $(CC) -c $(CC_SWITCHES) $(ZLIB_INCLUDE) $(GENERIC_DIR)/tclZlib.c tclTest.o: $(GENERIC_DIR)/tclTest.c $(IOHDR) $(TCLREHDRS) |
| ︙ | ︙ |
Changes to unix/tcl.m4.
| ︙ | ︙ | |||
445 446 447 448 449 450 451 452 453 |
# Results
# Subst's the following values:
# TCLSH_PROG
#------------------------------------------------------------------------
AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
search_path=`echo ${PATH} | sed -e 's/:/ /g'`
| > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | | | | | | | > | | 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 |
# Results
# Subst's the following values:
# TCLSH_PROG
#------------------------------------------------------------------------
AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
search_path=`echo ${PATH} | sed -e 's/:/ /g'`
# Attempt to find Tcl8.6
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh8[[6-9]] 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find Tcl9+ or later
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh9* 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find any tclsh8.5 on the system
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh8[[5-9]] 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find any tclsh on the system
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh* 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
])
if test -f "$ac_cv_path_tclsh" ; then
TCLSH_PROG="$ac_cv_path_tclsh"
AC_MSG_RESULT($TCLSH_PROG)
else
# It is not an error if an installed version of Tcl can't be located.
TCLSH_PROG=""
AC_MSG_RESULT([No tclsh found on PATH])
fi
AC_SUBST(TCLSH_PROG)
])
|
| ︙ | ︙ |
Changes to win/makefile.bc.
| ︙ | ︙ | |||
255 256 257 258 259 260 261 262 263 264 265 266 267 268 | $(TMPDIR)\tclThread.obj \ $(TMPDIR)\tclThreadJoin.obj \ $(TMPDIR)\tclTimer.obj \ $(TMPDIR)\tclTrace.obj \ $(TMPDIR)\tclUtf.obj \ $(TMPDIR)\tclUtil.obj \ $(TMPDIR)\tclVar.obj \ $(TMPDIR)\tclWin32Dll.obj \ $(TMPDIR)\tclWinChan.obj \ $(TMPDIR)\tclWinConsole.obj \ $(TMPDIR)\tclWinSerial.obj \ $(TMPDIR)\tclWinError.obj \ $(TMPDIR)\tclWinFCmd.obj \ $(TMPDIR)\tclWinFile.obj \ | > | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | $(TMPDIR)\tclThread.obj \ $(TMPDIR)\tclThreadJoin.obj \ $(TMPDIR)\tclTimer.obj \ $(TMPDIR)\tclTrace.obj \ $(TMPDIR)\tclUtf.obj \ $(TMPDIR)\tclUtil.obj \ $(TMPDIR)\tclVar.obj \ $(TMPDIR)\tclVexpr.obj \ $(TMPDIR)\tclWin32Dll.obj \ $(TMPDIR)\tclWinChan.obj \ $(TMPDIR)\tclWinConsole.obj \ $(TMPDIR)\tclWinSerial.obj \ $(TMPDIR)\tclWinError.obj \ $(TMPDIR)\tclWinFCmd.obj \ $(TMPDIR)\tclWinFile.obj \ |
| ︙ | ︙ |
Changes to win/makefile.vc.
| ︙ | ︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 | $(TMP_DIR)\tclThreadStorage.obj \ $(TMP_DIR)\tclTimer.obj \ $(TMP_DIR)\tclTomMathInterface.obj \ $(TMP_DIR)\tclTrace.obj \ $(TMP_DIR)\tclUtf.obj \ $(TMP_DIR)\tclUtil.obj \ $(TMP_DIR)\tclVar.obj \ $(TMP_DIR)\tclZlib.obj ZLIBOBJS = \ $(TMP_DIR)\adler32.obj \ $(TMP_DIR)\compress.obj \ $(TMP_DIR)\crc32.obj \ $(TMP_DIR)\deflate.obj \ | > | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | $(TMP_DIR)\tclThreadStorage.obj \ $(TMP_DIR)\tclTimer.obj \ $(TMP_DIR)\tclTomMathInterface.obj \ $(TMP_DIR)\tclTrace.obj \ $(TMP_DIR)\tclUtf.obj \ $(TMP_DIR)\tclUtil.obj \ $(TMP_DIR)\tclVar.obj \ $(TMP_DIR)\tclVexpr.obj \ $(TMP_DIR)\tclZlib.obj ZLIBOBJS = \ $(TMP_DIR)\adler32.obj \ $(TMP_DIR)\compress.obj \ $(TMP_DIR)\crc32.obj \ $(TMP_DIR)\deflate.obj \ |
| ︙ | ︙ |
Changes to win/tcl.m4.
| ︙ | ︙ | |||
1152 1153 1154 1155 1156 1157 1158 |
#------------------------------------------------------------------------
AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
search_path=`echo ${PATH} | sed -e 's/:/ /g'`
| > | > | > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > | 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 |
#------------------------------------------------------------------------
AC_DEFUN([SC_PROG_TCLSH], [
AC_MSG_CHECKING([for tclsh])
AC_CACHE_VAL(ac_cv_path_tclsh, [
search_path=`echo ${PATH} | sed -e 's/:/ /g'`
# Attempt to find Tcl8.6
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh8[[6-9]]*.exe 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find Tcl9+ or later
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh9*.exe 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find any tclsh8.5 on the system
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh8[[5-9]]*.exe 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
if test -e "$ac_cv_path_tclsh" ; then
# Attempt to find any tclsh on the system
for dir in $search_path ; do
for j in \
`ls -r $dir/tclsh* 2> /dev/null` \
; do
if test x"$ac_cv_path_tclsh" = x ; then
if test -f "$j" ; then
ac_cv_path_tclsh=$j
break
fi
fi
done
done
fi
])
if test -f "$ac_cv_path_tclsh" ; then
TCLSH_PROG="$ac_cv_path_tclsh"
AC_MSG_RESULT($TCLSH_PROG)
else
# It is not an error if an installed version of Tcl can't be located.
|
| ︙ | ︙ |