Overview
Comment: | Modified Files: share/vim/ft/tcl_ft.vim src/tclreadline/README src/tclreadline/configure.in src/tclreadline/tclreadline.h.in src/tclreadline/tclreadline.n.in src/tclreadline/tclreadlineSetup.tcl.in Added Files: bin/script/tcltags src/csym/version src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a912dd1a5abd3b68aa5fd4856f1f64ca |
User & Date: | johannes@zellner.org on 1999-08-29 14:41:54 |
Other Links: | manifest | tags |
Context
1999-08-29
| ||
23:51 | Modified Files: share/vim/VIM/vimrc src/tclreadline/tclreadlineSetup.tcl.in Added Files: src/csym/version src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: 1624ab45b9 user: johannes@zellner.org tags: trunk | |
14:41 | Modified Files: share/vim/ft/tcl_ft.vim src/tclreadline/README src/tclreadline/configure.in src/tclreadline/tclreadline.h.in src/tclreadline/tclreadline.n.in src/tclreadline/tclreadlineSetup.tcl.in Added Files: bin/script/tcltags src/csym/version src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: a912dd1a5a user: johannes@zellner.org tags: trunk | |
1999-08-28
| ||
22:12 | Modified Files: .csymrc .tclshrc src/csym/.csymrc src/tclreadline/README src/tclreadline/TODO src/tclreadline/configure.in src/tclreadline/sample.tclshrc src/tclreadline/tclreadline.n.in src/tclreadline/tclreadlineSetup.tcl.in Added Files: src/csym/version src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: f815040834 user: johannes@zellner.org tags: trunk | |
Changes
Modified Makefile.in from [be38010fae] to [7eb121a1a9].
1 | # -*- make -*- | | | | 1 2 3 4 5 6 7 8 9 10 | # -*- make -*- # FILE: "/home/joze/src/tclreadline/Makefile.in" # LAST MODIFICATION: "Sun Aug 29 08:23:45 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> # $Id$ # --- # # tclreadline -- gnu readline for tcl # Copyright (C) 1999 Johannes Zellner # |
︙ | ︙ | |||
252 253 254 255 256 257 258 | tclreadline.o: $(TOP_DIR)/tclreadline.c Makefile $(CC) -c $(CC_SWITCHES) $(TOP_DIR)/tclreadline.c ctags: ctags -R | | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 | tclreadline.o: $(TOP_DIR)/tclreadline.c Makefile $(CC) -c $(CC_SWITCHES) $(TOP_DIR)/tclreadline.c ctags: ctags -R tcltags: ctags tclreadlineInit.tcl.in tclreadlineSetup.tcl.in tcltags -a tclreadlineInit.tcl.in tclreadlineSetup.tcl.in vimtags: tcltags vimtags tags: vimtags |
︙ | ︙ |
Modified README from [37f97b7756] to [a27dd6baf6].
1 2 | FILE: "/home/joze/src/tclreadline/README" | | | 1 2 3 4 5 6 7 8 9 10 | FILE: "/home/joze/src/tclreadline/README" LAST MODIFICATION: "Sun Aug 29 01:00:01 1999 (joze)" (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> $Id$ --- tclreadline -- gnu readline for tcl Copyright (C) 1999 Johannes Zellner |
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | to this value. By default tclreadline::historyfile == -1, that is no truncation occurs. fixes: - after having at least one character typed, X events were not processed any more until pressing <return>. tclreadline-0.9.1: (Aug 1999) changes: - new variable tclreadline_patchLevel - tclreadline::Loop takes an optional <historyfile> | > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | to this value. By default tclreadline::historyfile == -1, that is no truncation occurs. fixes: - after having at least one character typed, X events were not processed any more until pressing <return>. - catching `tclreadline::readline read' errors in tclreadline::Loop. This was necessary, because the evaluation of the script completer can return an error. tclreadline-0.9.1: (Aug 1999) changes: - new variable tclreadline_patchLevel - tclreadline::Loop takes an optional <historyfile> |
︙ | ︙ |
Modified configure.in from [f2de18b30a] to [a0b87e53a8].
1 2 | # -*- autoconf -*- # FILE: "/home/joze/src/tclreadline/configure.in" | | | 1 2 3 4 5 6 7 8 9 10 | # -*- autoconf -*- # FILE: "/home/joze/src/tclreadline/configure.in" # LAST MODIFICATION: "Sun Aug 29 08:08:34 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> # $Id$ # --- # # tclreadline -- gnu readline for tcl # Copyright (C) 1999 Johannes Zellner # |
︙ | ︙ | |||
35 36 37 38 39 40 41 42 43 44 45 46 47 48 | AC_INIT(tclreadline.c) TCLREADLINE_MAJOR_VERSION=0 TCLREADLINE_MINOR_VERSION=9 TCLREADLINE_PATCHLEVEL=2 TCLREADLINE_VERSION=$TCLREADLINE_MAJOR_VERSION.$TCLREADLINE_MINOR_VERSION VERSION=$TCLREADLINE_VERSION AC_PREREQ(2.13) AC_CONFIG_AUX_DIR(./aux) AC_CANONICAL_HOST | > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | AC_INIT(tclreadline.c) TCLREADLINE_MAJOR_VERSION=0 TCLREADLINE_MINOR_VERSION=9 TCLREADLINE_PATCHLEVEL=2 TCLREADLINE_VERSION=$TCLREADLINE_MAJOR_VERSION.$TCLREADLINE_MINOR_VERSION TCLREADLINE_PATCHLEVEL_STR=${TCLREADLINE_VERSION}.${TCLREADLINE_PATCHLEVEL} VERSION=$TCLREADLINE_VERSION AC_PREREQ(2.13) AC_CONFIG_AUX_DIR(./aux) AC_CANONICAL_HOST |
︙ | ︙ | |||
414 415 416 417 418 419 420 421 422 423 424 425 426 427 | # TODO: check for readline version # (link testprogram with -lreadline) AC_SUBST(TCLREADLINE_MAJOR_VERSION) AC_SUBST(TCLREADLINE_MINOR_VERSION) AC_SUBST(TCLREADLINE_VERSION) AC_SUBST(TCLREADLINE_PATCHLEVEL) AC_SUBST(TCL_LIB_DIR) AC_SUBST(TCL_INCLUDE_DIR) AC_SUBST(READLINE_INCLUDE_DIR) AC_SUBST(CFLAGS) AC_SUBST(DL_LIBS) | > > > | 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 | # TODO: check for readline version # (link testprogram with -lreadline) AC_SUBST(TCLREADLINE_MAJOR_VERSION) AC_SUBST(TCLREADLINE_MINOR_VERSION) AC_SUBST(TCLREADLINE_VERSION) AC_SUBST(TCLREADLINE_PATCHLEVEL) AC_SUBST(TCLREADLINE_LIBRARY) AC_SUBST(TCLREADLINE_PATCHLEVEL_STR) AC_SUBST(TCL_LIB_DIR) AC_SUBST(TCL_INCLUDE_DIR) AC_SUBST(READLINE_INCLUDE_DIR) AC_SUBST(CFLAGS) AC_SUBST(DL_LIBS) |
︙ | ︙ | |||
443 444 445 446 447 448 449 | AC_SUBST(TCLREADLINE_BUILD_LIB_SPEC) AC_SUBST(TCLREADLINE_LIB_SPEC) AC_SUBST(TCLREADLINE_LIB_DIR) AC_SUBST(TCLREADLINE_PKG_FILE) AC_SUBST(TCLREADLINE_PACKAGE_PATH) | < | 447 448 449 450 451 452 453 454 455 456 457 458 459 460 | AC_SUBST(TCLREADLINE_BUILD_LIB_SPEC) AC_SUBST(TCLREADLINE_LIB_SPEC) AC_SUBST(TCLREADLINE_LIB_DIR) AC_SUBST(TCLREADLINE_PKG_FILE) AC_SUBST(TCLREADLINE_PACKAGE_PATH) AC_OUTPUT(Makefile tclreadline.h tclreadlineInit.tcl tclreadlineSetup.tcl tclreadlineConfig.sh tclreadline.n pkgIndex.tcl) #TCL_CC='cc' #TCL_CFLAGS_DEBUG='-g' |
︙ | ︙ |
Modified tclreadline.c from [4b2effb6b7] to [9a72d128cc].
1 2 3 4 | /* ================================================================== FILE: "/home/joze/src/tclreadline/tclreadline.c" | | | 1 2 3 4 5 6 7 8 9 10 11 12 | /* ================================================================== FILE: "/home/joze/src/tclreadline/tclreadline.c" LAST MODIFICATION: "Sun Aug 29 15:04:07 1999 (joze)" (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> $Id$ --- tclreadline -- gnu readline for tcl Copyright (C) 1999 Johannes Zellner |
︙ | ︙ | |||
24 25 26 27 28 29 30 | along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <johannes@zellner.org>, http://www.zellner.org/tclreadline/ ================================================================== */ | < | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. <johannes@zellner.org>, http://www.zellner.org/tclreadline/ ================================================================== */ #include <tcl.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #define READLINE_LIBRARY #include <readline.h> #include <history.h> #include "tclreadline.h" #define MALLOC(size) Tcl_Alloc((int) size) #define FREE(ptr) if (ptr) { Tcl_Free((char*) ptr); ptr = 0; } enum { _CMD_SET = (1 << 0), _CMD_GET = (1 << 1) |
︙ | ︙ | |||
66 67 68 69 70 71 72 73 74 75 76 77 78 79 | char* TclReadlineQuote(char* text, char* quotechars); int TclReadlineCmd(ClientData clientData, Tcl_Interp* interp, int argc, char** argv); void TclReadlineDataAvailableHandler(ClientData clientData, int mask); void TclReadlineLineCompleteHandler(char* ptr); int Tclreadline_SafeInit(Tcl_Interp* interp); int Tclreadline_Init(Tcl_Interp* interp); int TclReadlineInitialize(Tcl_Interp* interp, char* historyfile); int blank_line(char* str); char** TclReadlineCompletion(char* text, int start, int end); char* TclReadline0generator(char* text, int state); char* TclReadlineKnownCommands(char* text, int state, int mode); int TclReadlineParse(char** args, int maxargs, char* buf); | > > | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | char* TclReadlineQuote(char* text, char* quotechars); int TclReadlineCmd(ClientData clientData, Tcl_Interp* interp, int argc, char** argv); void TclReadlineDataAvailableHandler(ClientData clientData, int mask); void TclReadlineLineCompleteHandler(char* ptr); int Tclreadline_SafeInit(Tcl_Interp* interp); int Tclreadline_Init(Tcl_Interp* interp); char *TclReadlineFilenameQuotingFunction( char *text, int match_type, char* quote_ptr); int TclReadlineInitialize(Tcl_Interp* interp, char* historyfile); int blank_line(char* str); char** TclReadlineCompletion(char* text, int start, int end); char* TclReadline0generator(char* text, int state); char* TclReadlineKnownCommands(char* text, int state, int mode); int TclReadlineParse(char** args, int maxargs, char* buf); |
︙ | ︙ | |||
171 172 173 174 175 176 177 178 179 180 181 182 183 184 | tclrl_state = TCL_OK; rl_callback_handler_install(argc == 3 ? argv[2] : "%", TclReadlineLineCompleteHandler); Tcl_CreateFileHandler(0, TCL_READABLE, TclReadlineDataAvailableHandler, (ClientData) NULL); while (LINE_PENDING == tclrl_line_complete && TCL_OK == tclrl_state && !rl_done) { Tcl_DoOneEvent(0); /* rl_inhibit_completion = 0; */ } | > > > > > > > < > > > | | 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 | tclrl_state = TCL_OK; rl_callback_handler_install(argc == 3 ? argv[2] : "%", TclReadlineLineCompleteHandler); Tcl_CreateFileHandler(0, TCL_READABLE, TclReadlineDataAvailableHandler, (ClientData) NULL); /** * Main Loop. * XXX each modification of the global variables * which terminates the main loop must call * rl_callback_handler_remove() to leave * readline in a defined state. XXX */ while (LINE_PENDING == tclrl_line_complete && TCL_OK == tclrl_state && !rl_done) { Tcl_DoOneEvent(0); /* rl_inhibit_completion = 0; */ } Tcl_DeleteFileHandler(0); if (TCL_OK != tclrl_state) return tclrl_state; /* !! */ if ((LINE_EOF == tclrl_line_complete) && tclrl_eof_string) { Tcl_Eval(interp, tclrl_eof_string); return tclrl_state; } status = history_expand(tclrl_line, &expansion); if (status >= 1) { #if 0 Tcl_Channel channel = Tcl_MakeFileChannel(stdout, TCL_WRITABLE); /* Tcl_RegisterChannel(interp, channel); */ (void) Tcl_WriteChars(channel, expansion, -1); Tcl_Flush(channel); Tcl_Close(interp, channel); #else printf("%s\n", expansion); #endif } else if (status == -1) { Tcl_AppendResult (interp, "error in history expansion\n", (char*) NULL); return tclrl_state; } /** * TODO: status == 2 ... */ if (expansion && *expansion) add_history(expansion); |
︙ | ︙ | |||
320 321 322 323 324 325 326 | tclrl_line_complete = LINE_COMPLETE; rl_callback_handler_remove(); tclrl_line = ptr; } #else if (ptr && *ptr) { tclrl_line_complete = 1; | | < | | > > > > > > > > > > | > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | | > | | | > > > > > > > > > > | 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 | tclrl_line_complete = LINE_COMPLETE; rl_callback_handler_remove(); tclrl_line = ptr; } #else if (ptr && *ptr) { tclrl_line_complete = 1; rl_callback_handler_remove(); tclrl_line = ptr; } #endif } int Tclreadline_SafeInit(Tcl_Interp *interp) { return Tclreadline_Init(interp); } int Tclreadline_Init(Tcl_Interp *interp) { int status; Tcl_CreateCommand(interp, "::tclreadline::readline", TclReadlineCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); tclrl_interp = interp; if (TCL_OK != (status = Tcl_LinkVar(interp, "::tclreadline::historyLength", (char*) &tclrl_history_length, TCL_LINK_INT))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "::tclreadline::library", (char*) &TCLRL_LIBRARY, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "::tclreadline::version", (char*) &TCLRL_VERSION, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "::tclreadline::patchLevel", (char*) &TCLRL_PATCHLEVEL, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "tclreadline_library", (char*) &TCLRL_LIBRARY, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "tclreadline_version", (char*) &TCLRL_VERSION, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; if (TCL_OK != (status = Tcl_LinkVar(interp, "tclreadline_patchLevel", (char*) &TCLRL_PATCHLEVEL, TCL_LINK_STRING | TCL_LINK_READ_ONLY))) return status; return Tcl_PkgProvide(interp, "tclreadline", TCLRL_VERSION); } #if 0 char * TclReadlineFilenameQuotingFunction (char *filename, int match_type, char* quote_ptr) { char *res = (char*) malloc(sizeof(char) * (strlen(filename) + 2)); int i = 0; fprintf (stderr, "(TclReadlineFilenameQuotingFunction) \n"); if (quote_ptr && *quote_ptr) { *res = *quote_ptr; /* leading quote */ i++; } strcpy (res + i, filename); /* name */ #if 0 fprintf (stderr, "(Tclreadline_Init) filename=|%s|\n", filename); fprintf (stderr, "(Tclreadline_Init) *quote_ptr=|%c|\n", *quote_ptr); #endif if (quote_ptr && '{' == *quote_ptr) { *quote_ptr = '}'; } return res; #if 0 switch (match_type) { case SINGLE_MATCH: break; default: } #endif } #endif int TclReadlineInitialize(Tcl_Interp* interp, char* historyfile) { rl_readline_name = "tclreadline"; rl_special_prefixes = "${\""; /** * default is " \t\n\"\\'`@$><=;|&{(" * removed "(" <-- arrays * removed "{" <-- `${' variables * added "[]" */ rl_basic_word_break_characters = " \t\n\"\\'`@$><=;|&[]"; rl_completer_quote_characters = "\""; /* rl_filename_quote_characters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; rl_filename_quoting_function = (CPFunction*) TclReadlineFilenameQuotingFunction; */ /* rl_filename_quoting_desired = 1; */ using_history(); if (!tclrl_eof_string) tclrl_eof_string = strdup("puts {}; exit"); /* * try to read historyfile in home |
︙ | ︙ | |||
466 467 468 469 470 471 472 | Tcl_ResetResult(tclrl_interp); /* clear result space */ tclrl_state = Tcl_VarEval(tclrl_interp, tclrl_custom_completer, " \"", quoted_text, "\" ", start_s, " ", end_s, " \"", quoted_rl_line_buffer, "\"", (char*) NULL); FREE(quoted_text); FREE(quoted_rl_line_buffer); if (TCL_OK != tclrl_state) { | | < | | | > > | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 | Tcl_ResetResult(tclrl_interp); /* clear result space */ tclrl_state = Tcl_VarEval(tclrl_interp, tclrl_custom_completer, " \"", quoted_text, "\" ", start_s, " ", end_s, " \"", quoted_rl_line_buffer, "\"", (char*) NULL); FREE(quoted_text); FREE(quoted_rl_line_buffer); if (TCL_OK != tclrl_state) { rl_callback_handler_remove(); Tcl_AppendResult (tclrl_interp, " `", tclrl_custom_completer, " \"", quoted_text, "\" ", start_s, " ", end_s, " \"", quoted_rl_line_buffer, "\"' failed.", (char*) NULL); #if 0 fprintf(stderr, "\n|%s|\n", Tcl_GetStringResult(tclrl_interp)); #endif return matches; } obj = Tcl_GetObjResult(tclrl_interp); Tcl_ListObjGetElements(tclrl_interp, obj, &objc, &objv); /* fprintf (stderr, "(TclReadlineCompletion) objc = %d\n", objc); */ if (objc) { |
︙ | ︙ |
Modified tclreadline.h.in from [5ff9fe59ba] to [60998526c8].
1 2 3 | /* ================================================================== | | | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | /* ================================================================== FILE: "/home/joze/src/tclreadline/tclreadline.h.in" LAST MODIFICATION: "Sun Aug 29 08:07:04 1999 (joze)" (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> $Id$ vim:set ft=c: --- tclreadline -- gnu readline for tcl Copyright (C) 1999 Johannes Zellner This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License |
︙ | ︙ | |||
25 26 27 28 29 30 31 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. johannes@zellner.org http://www.zellner.org/tclreadline/ ================================================================== */ | | > > < < | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. johannes@zellner.org http://www.zellner.org/tclreadline/ ================================================================== */ static char *TCLRL_VERSION = "@TCLREADLINE_VERSION@"; static char *TCLRL_LIBRARY = "@TCLREADLINE_LIBRARY@"; /** * NOTE, that PATCHLEVEL is the complete version string. */ static char *TCLRL_PATCHLEVEL = "@TCLREADLINE_PATCHLEVEL_STR@"; |
Modified tclreadline.n.in from [ec21a73d43] to [cb3eb62601].
1 2 3 4 | .TH tclreadline n "@TCLREADLINE_VERSION@.@TCLREADLINE_PATCHLEVEL@" "Johannes Zellner" .\" (C) 1999 by Johannes Zellner .\" FILE: "/home/joze/src/tclreadline/tclreadline.n.in" | | | 1 2 3 4 5 6 7 8 9 10 11 12 | .TH tclreadline n "@TCLREADLINE_VERSION@.@TCLREADLINE_PATCHLEVEL@" "Johannes Zellner" .\" (C) 1999 by Johannes Zellner .\" FILE: "/home/joze/src/tclreadline/tclreadline.n.in" .\" LAST MODIFICATION: "Sun Aug 29 01:14:06 1999 (joze)" .\" (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> .\" $Id$ .\" --- .\" .\" tclreadline -- gnu readline for the tcl scripting language .\" Copyright (C) 1999 Johannes Zellner .\" |
︙ | ︙ | |||
165 166 167 168 169 170 171 172 173 174 175 176 177 178 | This command has to be called before any other tclreadline commands. .TP 5 \fB::tclreadline::readline read\fP \fIprompt\fP prints the \fIprompt\fP to stdout and enters the tclreadline event loop. Both readline and X events are processed. Returns the (eventually history-expanded) input string. .TP 5 \fB::tclreadline::readline write\fP \fIhistoryfile\fP writes the history to the \fIhistoryfile\fP. This command is called automatically from the internal routine ::tclreadline::Exit. If the variable \fBtclreadline::historyLength\fP is non-negative, the historyfile will be truncated to hold only this number lines. | > > | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | This command has to be called before any other tclreadline commands. .TP 5 \fB::tclreadline::readline read\fP \fIprompt\fP prints the \fIprompt\fP to stdout and enters the tclreadline event loop. Both readline and X events are processed. Returns the (eventually history-expanded) input string. \fBtclreadline::readline read\fP rises an error, if an error occurs while evaluating a script completer. .TP 5 \fB::tclreadline::readline write\fP \fIhistoryfile\fP writes the history to the \fIhistoryfile\fP. This command is called automatically from the internal routine ::tclreadline::Exit. If the variable \fBtclreadline::historyLength\fP is non-negative, the historyfile will be truncated to hold only this number lines. |
︙ | ︙ |
Modified tclreadlineInit.tcl.in from [e2d2c550d3] to [08b95b8cfd].
1 2 | #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineInit.tcl.in" | | | 1 2 3 4 5 6 7 8 9 10 | #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineInit.tcl.in" # LAST MODIFICATION: "Sun Aug 29 08:11:24 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> # $Id$ # --- # # tclreadline -- gnu readline for tcl # Copyright (C) 1999 Johannes Zellner # |
︙ | ︙ | |||
31 32 33 34 35 36 37 | namespace eval tclreadline:: { namespace export Init } proc ::tclreadline::Init {} { | < < < < < < < < < < < < < < < < < | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | namespace eval tclreadline:: { namespace export Init } proc ::tclreadline::Init {} { if [catch {load @TCLREADLINE_LIBRARY@/@TCLREADLINE_LIB_FILE@} msg] { puts stderr $msg exit 2 } } tclreadline::Init source [file join [file dirname [info script]] tclreadlineSetup.tcl] |
Modified tclreadlineSetup.tcl.in from [235d3d230f] to [3f57a0d3cc].
1 2 | #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in" | | | 1 2 3 4 5 6 7 8 9 10 | #!/usr/local/bin/tclsh # FILE: "/home/joze/src/tclreadline/tclreadlineSetup.tcl.in" # LAST MODIFICATION: "Sun Aug 29 16:28:35 1999 (joze)" # (C) 1998, 1999 by Johannes Zellner, <johannes@zellner.org> # $Id$ # --- # # tclreadline -- gnu readline for tcl # Copyright (C) 1999 Johannes Zellner # |
︙ | ︙ | |||
23 24 25 26 27 28 29 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # johannes@zellner.org # http://www.zellner.org/tclreadline/ # # ================================================================== | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > | 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 | # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # johannes@zellner.org # http://www.zellner.org/tclreadline/ # # ================================================================== # done: # # - append # - array # - bgerror # - binary # - break # - catch # - cd # - clock # - close # - concat # - continue # - (ddd is only on M$) # - encoding # - eof # - error # - eval # - exec # - exit # - expr # - fblocked # - fconfigure # - fcopy # - file # - fileevent # - flush # - for # TODO # - foreach # TODO # - format # TODO # - gets # - glob # - global # - if # TODO # - incr # - index # - info # - interp # - join # - lappend # - llength # - linsert # - list # - load # - lrange # - lreplace # - lsearch # - lsort # - history # - load # - namespace # - set # - unset # # package provide tclreadline @TCLREADLINE_VERSION@ package provide tclreadline 0.9 proc unknown args { global auto_noexec auto_noload env unknown_pending tcl_interactive global errorCode errorInfo # Save the values of errorCode and errorInfo variables, since they |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 142 143 144 145 146 | } return -code error "invalid command name \"$name\"" } namespace eval tclreadline:: { namespace export Setup Glob Loop InitCmds InitTclCmds InitTkCmds Print ls } # get the longest common completion # e.g. str == {tcl_version tclreadline_version tclreadline_library} # --> [tclreadline::GetCommon ${str}] == "tcl" # proc tclreadline::GetCommon {str} { # puts stderr str=$str | > > > > > > > > > > > > > > > > | 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 | } return -code error "invalid command name \"$name\"" } namespace eval tclreadline:: { namespace export Setup Glob Loop InitCmds InitTclCmds InitTkCmds Print ls } proc tclreadline::FmtFindInList {text lst} { return \ [tclreadline::Format [tclreadline::FindInList $text $lst] $text] } proc tclreadline::FindInList {text lst} { set result "" foreach word $lst { if {[string match ${text}* ${word}]} { lappend result ${word} } } return $result } # get the longest common completion # e.g. str == {tcl_version tclreadline_version tclreadline_library} # --> [tclreadline::GetCommon ${str}] == "tcl" # proc tclreadline::GetCommon {str} { # puts stderr str=$str |
︙ | ︙ | |||
180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | incr i; # discard command break character return [list [expr $start - $i] [string range $line $i end]] } } } return "" } # % p<TAB> # % bla put<TAB> $b # % put<TAB> $b # part == put # start == 0 # end == 3 # line == "put $b" # [PartPosition] should return 0 # proc tclreadline::PartPosition {part start end line} { incr start -1 # puts stderr "(tclreadline::PartPosition) line=|$line|" # puts stderr "(tclreadline::PartPosition) start=$start" set line [string range $line 0 $start] | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | incr i; # discard command break character return [list [expr $start - $i] [string range $line $i end]] } } } return "" } proc tclreadline::IsWhite {char} { if {" " == $char || "\n" == $char || "\t" == $char} { return 1 } else { return 0 } } proc tclreadline::PreviousWord {start line} { incr start -1 set found 0 for {set i $start} {$i > 0} {incr i -1} { set c [string index $line $i] if {${found} && [IsWhite $c]} { break } elseif {!${found} && ![IsWhite $c]} { set found 1 } } return [string trim [string range ${line} $i $start]] } proc tclreadline::Quote {value left} { set right [tclreadline::Right ${left}] if {1 < [llength $value] && "" == $right} { return [list \"${value}\"] } else { return [list ${left}${value}${right}] } } proc tclreadline::InChannelId {text} { return [ChannelId ${text} <inChannel> {stdin}] } proc tclreadline::OutChannelId {text} { return [ChannelId ${text} <outChannel> {stdout stderr}] } proc tclreadline::ChannelId { text {default <channelId>} {chs {stdin stdout stderr}}} { if {[llength ${text}]} { set channel [FmtFindInList $text ${chs}] if {[llength [lindex ${channel} 0]]} { return ${channel} } else { return "" } } return ${default} } proc tclreadline::QuoteQuotes {line} { regsub -all -- \" $line {\"} line regsub -all -- \{ $line {\{} line return $line } # % p<TAB> # % bla put<TAB> $b # % put<TAB> $b # part == put # start == 0 # end == 3 # line == "put $b" # [PartPosition] should return 0 # proc tclreadline::PartPosition {part start end line} { # puts stderr "(tclreadline::PartPosition) line\[start\]=[string index $line $start]" # puts stderr "(tclreadline::PartPosition) part=|$part|" incr start -1 if {"\"" == [string index $line $start]} { incr start -1 } # puts stderr "(tclreadline::PartPosition) line=|$line|" # puts stderr "(tclreadline::PartPosition) start=$start" set line [string range $line 0 $start] set line [QuoteQuotes $line] # puts stderr "(tclreadline::PartPosition) line=|$line|" set result [llength $line] # puts stderr $result return $result } proc tclreadline::Right {left} { if {"\"" == $left} { return "" } elseif {"\{" == $left} { return "\}" } elseif {"\\\{" == $left} { return "\\\}" } return "" } proc tclreadline::GetPrefix {text} { set null [string index $text 0] # puts null=|$null| if {"\"" == $null} { # puts stderr \neins\n set pre "\\\"" } elseif {"\{" == $null} { # puts stderr \nzwei\n set pre "\\\{" } else { # puts stderr \ndrei\n set pre "" } return ${pre} } proc tclreadline::Format {matches {part {}}} { # puts matches=|$matches| # puts stderr \npart=|$part|\n set pre [GetPrefix ${part}] if {1 == [llength $matches]} { ; # unique match # puts stderr \nunique=$matches\n # puts stderr "\n|${pre}${matches}[Right ${pre}]|\n" return ${pre}${matches}[Right ${pre}] } elseif {"" != ${matches}} { # puts stderr \nmore=$matches\n set common [tclreadline::GetCommon ${matches}] # puts stderr common=|$common| if {"" == $common} { return [string trim "[list $part] ${matches}"] } else { return [string trim "${pre}${common} ${matches}"] } } else { return ""; # nothing to complete } } proc tclreadline::ListCompletion {text {level -1}} { # TODO return "" # return [VarCompletion ${text} ${level}] } proc tclreadline::VarCompletion {text {level -1}} { if {-1 == ${level}} { set level [info level] } else { incr level } set pre [GetPrefix ${text}] if {"" == ${pre}} { set var ${text} } else { set var [string range ${text} 1 end] } # arrays # if {[regexp {([^(]*)\((.*)} ${var} all array name]} { set names [uplevel ${level} array names ${array} ${name}*] if {1 == [llength $names]} { ; # unique match return "${array}(${names})" } elseif {"" != ${names}} { return "${array}([tclreadline::GetCommon ${names}] ${names}" } else { return ""; # nothing to complete } } # non-arrays # regsub ":$" ${var} "::" var set namespaces [namespace children :: ${var}*] if {[llength ${namespaces}] && "::" != [string range ${var} 0 1]} { foreach name ${namespaces} { regsub "^::" ${name} "" name if {[string length ${name}]} { lappend new ${name}:: } } set namespaces ${new} unset new } set matches \ [string trim "[uplevel ${level} info vars ${var}*] ${namespaces}"] if {1 == [llength $matches]} { ; # unique match # check if this unique match is an # array name, (whith no "(" yet). # if {[uplevel ${level} array exists $matches]} { return [VarCompletion ${matches}( ${level}]; # recursion } else { return ${pre}${matches}[Right ${pre}] } } elseif {"" != $matches} { ; # more than one match set common [tclreadline::GetCommon ${matches}] if {"" == ${common}} { return [tclreadline::Format ${matches} ${text}] } else { return [string trim "${pre}${common} ${matches}"] } } else { return ""; # nothing to complete } } proc tclreadline::CommandCompletion {cmd} { # puts stderr \ncmd=|$cmd|\n set cmd [string trim ${cmd}]* set commands [info commands [QuoteQuotes ${cmd}]] # puts stderr commands=|$commands| set procs [info procs [QuoteQuotes ${cmd}]] # puts stderr procs=|$procs| set matches [namespace eval :: concat ${commands} ${procs}] set namespaces [namespace children :: ${cmd}] if {![llength ${matches}] && 1 == [llength ${namespaces}]} { set namespaces [string trim ${namespaces}] set matches [namespace eval ${namespaces} \ {concat [info commands] [info procs]}] if {[llength ${matches}]} { foreach match ${matches} { set full ${namespaces}::${match} if {"" != [namespace which ${full}]} { lappend new ${namespaces}::${match} } } set matches ${new} unset new set namespaces "" } } return [string trim "${matches} ${namespaces}"] } # if the line entered so far is # % puts $b<TAB> # part == $b # start == 5 # end == 7 # line == "$puts $b" |
︙ | ︙ | |||
224 225 226 227 228 229 230 | return "" } } # variable completion. Check first, if the # variable starts with a plain `$' or should # be enclosed in braces. # | > > | | | < | | < | < > > < | < < | | < | < < < < < < | < | < < < < < | | 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 | return "" } } # variable completion. Check first, if the # variable starts with a plain `$' or should # be enclosed in braces. # set var [string range $part 1 end] # # if {"\{" == [string index $part 1]} { # set var [string range $part 2 end] # set left "\{" # } else { # set left "" # set var [string range $part 1 end] # } # # check if $var is an array name, which # already has already a "(" somewhere inside. # if {"" != [set vc [VarCompletion $var]]} { if {"" == [lindex $vc 0]} { return "\$ [lrange ${vc} 1 end]" } else { return \$${vc} } # puts stderr vc=|$vc| } else { return "" } # SCENARIO: # # % puts bla; put<TAB> $b # part == put # start == 10 # end == 13 |
︙ | ︙ | |||
285 286 287 288 289 290 291 | set new_line [lindex $sub 1] # puts stderr "(SubCmd) $new_start $new_end $new_line" return \ [tclreadline::ScriptCompleter $part $new_start $new_end $new_line] } elseif {0 == [set pos [tclreadline::PartPosition $part $start $end $line]]} { # puts stderr "(PartPosition) $part $start $end $line" # set matches [array names known_cmds "[string trim ${part}]*"] | | < < < | < | < < < | < < < < < < | > > > > > > > > > > > > | | 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 | set new_line [lindex $sub 1] # puts stderr "(SubCmd) $new_start $new_end $new_line" return \ [tclreadline::ScriptCompleter $part $new_start $new_end $new_line] } elseif {0 == [set pos [tclreadline::PartPosition $part $start $end $line]]} { # puts stderr "(PartPosition) $part $start $end $line" # set matches [array names known_cmds "[string trim ${part}]*"] set all [CommandCompletion ${part}] #puts \nmatches=$matches\n return [tclreadline::Format $all $part] } else { # try to use $pos further ... # regsub -all -- \" $line {\"} thisline set thisline [QuoteQuotes $line] set cmd [lindex $thisline 0] if {"" != [namespace eval ::tclreadline "info procs complete($cmd)"]} { # to be more error-proof, we could check here, # if complete($cmd) takes exactly 5 arguments. if {"\"" == [string index $part 0] \ || "\{" == [string index $part 0]} { set mod [string range $part 1 end] } else { set mod $part } return \ [::tclreadline::complete($cmd) $part $start $end $line $pos $mod] } elseif {"" != [array names known_cmds $cmd]} { set current [lindex $known_cmds($cmd) $pos] if {"" != $current && "" == [string trim $part]} { return $current } else { return "" } } else { |
︙ | ︙ | |||
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 | if [info exists tcl_prompt2] { set ::tclreadline::prompt2 $tcl_prompt2 } else { set ::tclreadline::prompt2 ">" } if {[namespace eval ::tclreadline {[info procs prompt1]}] != ""} { set ::tclreadline::LINE [::tclreadline::readline read \ [::tclreadline::prompt1]] } else { set ::tclreadline::LINE [::tclreadline::readline read %] } while {![::tclreadline::readline complete $::tclreadline::LINE]} { append ::tclreadline::LINE "\n" append ::tclreadline::LINE [::tclreadline::readline read \ ${::tclreadline::prompt2}] } # Magnus Eriksson <magnus.eriksson@netinsight.se> proposed history add $::tclreadline::LINE if [catch { set result [eval $::tclreadline::LINE] if {$result != "" && [::tclreadline::Print]} { | > > > > > | 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 | if [info exists tcl_prompt2] { set ::tclreadline::prompt2 $tcl_prompt2 } else { set ::tclreadline::prompt2 ">" } if {[catch { if {[namespace eval ::tclreadline {[info procs prompt1]}] != ""} { set ::tclreadline::LINE [::tclreadline::readline read \ [::tclreadline::prompt1]] } else { set ::tclreadline::LINE [::tclreadline::readline read %] } while {![::tclreadline::readline complete $::tclreadline::LINE]} { append ::tclreadline::LINE "\n" append ::tclreadline::LINE [::tclreadline::readline read \ ${::tclreadline::prompt2}] } } msg]} { puts stderr \n$msg continue } # Magnus Eriksson <magnus.eriksson@netinsight.se> proposed history add $::tclreadline::LINE if [catch { set result [eval $::tclreadline::LINE] if {$result != "" && [::tclreadline::Print]} { |
︙ | ︙ | |||
519 520 521 522 523 524 525 526 527 | proc ::tclreadline::InitTclCmds {} { variable known_cmds foreach line { "after option ?arg arg ...?" "append varName ?value value ...?" "array option arrayName ?arg ...?" "binary option ?arg arg ...?" "catch command ?varName?" | > > > | | > > > | > | | | | > | > | | 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 | proc ::tclreadline::InitTclCmds {} { variable known_cmds foreach line { "after option ?arg arg ...?" "append varName ?value value ...?" "array option arrayName ?arg ...?" "bgerror" "binary option ?arg arg ...?" "break" "catch command ?varName?" "cd" "clock" "close <channelId>" "concat" "continue" "encoding" "eof <channelId>" "error message ?errorInfo? ?errorCode?" "eval arg ?arg ...?" "exec ?switches? arg ?arg ...?" "exit ?returnCode?" "expr arg ?arg ...?" "fblocked <channelId>" "fconfigure <channelId> ?optionName? ?value? ?optionName value?..." "fcopy input output ?-size size? ?-command callback?" "file" "fileevent channelId event ?script?" "flush channelId" "for start test next command" "foreach varList list ?varList list ...? command" "format formatString ?arg arg ...?" "gets channelId ?varName?" "glob" "global varName ?varName ...?" "history option" "incr varName ?increment?" "info option ?arg arg ...?" "interp cmd ?arg ...?" "join list ?joinString?" "lappend varName ?value value ...?" "lindex list index" "linsert list <index> <element> ?element ...?" "list" "llength list" "load" "lrange list first last" "lreplace list first last ?element element ...?" "lsearch ?mode? list pattern" "lsort ?options? list" "namespace subcommand ?arg ...?" "open fileName ?access? ?permissions?" "package option ?arg arg ...?" |
︙ | ︙ | |||
630 631 632 633 634 635 636 | } { tclreadline::readline add $line set known_cmds([lindex $line 0]) [lrange $line 1 end] } rename tclreadline::InitTkCmds "" } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 | } { tclreadline::readline add $line set known_cmds([lindex $line 0]) [lrange $line 1 end] } rename tclreadline::InitTkCmds "" } namespace eval tclreadline { # explicit command completers # # --- # TCL # --- proc complete(append) {text start end line pos mod} { if {1 == $pos} { return [VarCompletion ${text}] } return "" } proc complete(if) {text start end line pos mod} { # TODO: this is not good yet. if {2 == $pos} { return [FmtFindInList $text {then}] } elseif {$pos > 2} { set prev [PreviousWord ${start} ${line}] switch $prev { then - else - elseif { return "" } } return [FmtFindInList $text {then else elseif}] } } proc complete(incr) {text start end line pos mod} { if {1 == $pos} { set matches [uplevel 2 info vars "${mod}*"] set final "" # check for integers # foreach match $matches { if {[uplevel 2 array exists $match]} { continue } if {[regexp {^[0-9]+$} [uplevel 2 set $match]]} { lappend final $match } } return [Format ${final} $text] } } proc complete(array) {text start end line pos mod} { if {1 == $pos} { set cmds { anymore donesearch exists get names nextelement set size startsearch } return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] switch -- $cmd { anymore - donesearch - exists - get - names - nextelement - set - size - startsearch { set matches "" set vars [uplevel [info level] info vars ${mod}*] foreach var ${vars} { if {[uplevel [info level] array exists ${var}]} { lappend matches ${var} } } return [Format ${matches} ${text}] } } } elseif {3 == $pos} { set cmd [lindex $line 1] switch -- $cmd { get - names { if {[catch { set names [uplevel [info level] \ array names [lindex $line 2] [lindex $line 3]*]}]} { return "" } else { set common [GetCommon ${names}] if {"" == ${common}} { return [Format ${names} ${text}] } else { return [string trim "${common} ${names}"] } } } } } return "" } proc complete(binary) {text start end line pos mod} { if {1 == $pos} { set cmds { format scan } return [FmtFindInList $text $cmds] # # } elseif {2 == $pos} { # set cmd [lindex $line 1] # switch -- $cmd { # format - # scan - # } # } return "" } proc complete(clock) {text start end line pos mod} { if {1 == $pos} { set cmds {clicks format scan seconds} return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] switch -- $cmd { clicks {} format { if {"" == [lindex $line 2]} { return <clockValue> } } scan { if {"" == [lindex $line 2]} { return <dateString> } } seconds {} } } elseif {3 == $pos} { set cmd [lindex $line 1] switch -- $cmd { clicks {} format { set sub [lindex $line 3] set subcmds {-fmt -gmt} return [FmtFindInList $text $subcmds] } scan { set sub [lindex $line 3] set subcmds {-base -gmt} return [FmtFindInList $text $subcmds] } seconds {} } } return "" } proc complete(encoding) {text start end line pos mod} { if {1 == $pos} { set cmds {convertfrom convertto names system} return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] switch -- $cmd { names {} convertfrom - convertto - system { set enc [encoding names] return [FmtFindInList ${text} ${enc}] } } } return "" } proc complete(expr) {text start end line pos mod} { set cmds { acos cos hypot sinh asin cosh log sqrt atan exp log10 tan atan2 floor pow tanh ceil fmod sin abs double int rand round srand } return [FmtFindInList $text $cmds] } proc complete(fconfigure) {text start end line pos mod} { if {1 == $pos} { return [ChannelId ${mod}] } else { set option [PreviousWord ${start} ${line}] switch -- $option { -blocking { return [FmtFindInList ${text} {yes no}] } -buffering { return [FmtFindInList ${text} {full line none}] } -buffersize { if {![llength ${text}} { return <newSize> } } -encoding { set enc [encoding names] return [FmtFindInList ${text} ${enc}] } -eofchar { if {![llength ${text}]} { return [list {{<inChar> <outChar>}}] } } -translation { return [FmtFindInList ${text} {auto binary cr crlf lf}] } } set cmds { -blocking -buffering -buffersize -encoding -eofchar -translation } return [FmtFindInList $text $cmds] } return "" } proc complete(fcopy) {text start end line pos mod} { if {1 == $pos} { return [InChannelId ${mod}] } elseif {2 == $pos} { return [OutChannelId ${mod}] } else { set option [PreviousWord ${start} ${line}] switch -- $option { -size { if {![llength ${mod}]} { return <size> } } -command { if {![llength ${mod}]} { return <callback> } } } return [FmtFindInList $text {-size -command}] } return "" } proc complete(file) {text start end line pos mod} { if {1 == $pos} { set cmds { atime attributes copy delete dirname executable exists extension isdirectory isfile join lstat mtime mkdir nativename owned pathtype readable readlink rename rootname size split stat tail type volumes writable } return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] switch -- $cmd { atime - attributes - dirname - executable - exists - extension - isdirectory - isfile - join - lstat - mtime - mkdir - nativename - owned - pathtype - readable - readlink - rootname - size - split - stat - tail - type - volumes - writable { return "" } copy - delete - rename { set match [FmtFindInList ${mod} {-force}] if {[llength ${match}] && [llength ${mod}]} { return ${match} } else { return "" } } } } } proc complete(fileevent) {text start end line pos mod} { if {1 == $pos} { return [ChannelId ${mod}] } elseif {2 == $pos} { return [FmtFindInList ${mod} {readable writable}] } } proc complete(flush) {text start end line pos mod} { if {1 == $pos} { return [ChannelId ${mod}] } } proc complete(gets) {text start end line pos mod} { if {1 == $pos} { return [InChannelId ${mod}] } } proc complete(glob) {text start end line pos mod} { if {1 == $pos} { set matches [FmtFindInList ${mod} {-nocomplain --}] if {[llength [string trim ${mod}]] && [llength ${matches}]} { return ${matches} } } return "" } proc complete(global) {text start end line pos mod} { return [VarCompletion ${text}] } proc complete(index) {text start end line pos mod} { if {1 == $pos} { return [VarCompletion ${text}] } elseif {2 == $pos && ![llength ${mod}]} { return <index> } return "" } proc complete(info) {text start end line pos mod} { if {1 == $pos} { set cmds { args body cmdcount commands complete default exists globals hostname level library loaded locals nameofexecutable patchlevel procs script sharedlibextension tclversion vars} return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] switch -- $cmd { args - body - default - procs { set matches [uplevel 2 info procs ${mod}*] return [Format $matches $text] } complete { ; # TODO } level { ; # TODO } loaded { ;# TODO } commands - exists - globals - locals - vars { if {"exists" == $cmd} { set do vars } else { set do $cmd } return \ [Format [uplevel 2 info ${do} "${mod}*"] $text] } } } return "" } proc complete(interp) {text start end line pos mod} { set cmd [lindex $line 1] if {1 == $pos} { set cmds { alias aliases create delete eval exists expose hide hidden issafe invokehidden marktrusted slaves share target transfer} return [FmtFindInList $text $cmds] } elseif {2 == $pos} { switch -- $cmd { create { return [FmtFindInList $text {-safe -- ?path?}] } eval - exists - expose - hide - hidden - invokehidden - marktrusted - target {if {![llength ${mod}]} { return <path> }} aliases - delete - issafe - slaves {if {![llength ${mod}]} { return ?path? }} alias - share - transfer {if {![llength ${mod}]} { return <srcPath> }} } } elseif {3 == $pos} { switch -- $cmd { alias {if {![llength ${mod}]} { return <srcCmd> }} create { return [FmtFindInList $text {-safe -- ?path?}] } eval {if {![llength ${mod}]} { return <arg> }} delete {if {![llength ${mod}]} { return ?path? }} expose {if {![llength ${mod}]} { return <hiddenName> }} hide {if {![llength ${mod}]} { return <exposedCmdName> }} invokehidden { return \ [FmtFindInList $text {?-global? <hiddenCmdName}] } target {if {![llength ${mod}]} { return <alias> }} exists {} hidden {} marktrusted {} aliases {} issafe {} slaves {} share - tranfer {return [ChannelId ${mod}]} } } elseif {4 == $pos} { switch -- $cmd { alias {if {![llength ${mod}]} { return <targetPath> }} create { return [FmtFindInList $text {-safe -- path}] } expose {if {![llength ${mod}]} { return ?exposedCmdName? }} hide {if {![llength ${mod}]} { return ?hiddenCmdName? }} share - tranfer {if {![llength ${mod}]} { return ?destPath? }} } } return "" } proc complete(join) {text start end line pos mod} { if {1 == $pos} { return [VarCompletion ${text}] } return "" } proc complete(lappend) {text start end line pos mod} { if {1 == $pos} { return [ListCompletion ${text}] } return "" } proc complete(linsert) {text start end line pos mod} { if {1 == $pos} { return [ListCompletion ${text}] } return "" } proc complete(llength) {text start end line pos mod} { if {1 == $pos} { return [ListCompletion ${text}] } return "" } proc complete(load) {text start end line pos mod} { if {1 == $pos} { return ""; # filename } elseif {2 == $pos && ![llength ${mod}]} { return "<packageName>" } elseif {3 == $pos && ![llength ${mod}]} { return "<interp>" } return "" } proc complete(lrange) {text start end line pos mod} { if {1 == $pos} { return [ListCompletion ${text}] } elseif {2 == $pos && ![llength ${mod}]} { return "<first>" } elseif {3 == $pos && ![llength ${mod}]} { return "<last>" } return "" } proc complete(lreplace) {text start end line pos mod} { if {1 == $pos} { return [ListCompletion ${text}] } elseif {2 == $pos && ![llength ${mod}]} { return "<first>" } elseif {3 == $pos && ![llength ${mod}]} { return "<last>" } elseif {![llength ${mod}]} { return "?element?" } return "" } proc complete(lsearch) {text start end line pos mod} { set options [FmtFindInList $text {-exact -glob -regexp}] if {![llength ${mod}]} { # remove the common match `-' set options [lrange ${options} 1 end] } set opt [lindex ${line} 1] set option [FmtFindInList $opt {-exact -glob -regexp}] if {1 == $pos} { set matches [ListCompletion ${text}] return [string trim "${matches} ${options}"] } elseif {2 == $pos && ![llength ${mod}]} { if {[llength ${option}]} { return "<list>" } else { return "<pattern>" } } elseif {3 == $pos && ![llength ${mod}]} { if {[llength ${option}]} { return "<pattern>" } } return "" } proc complete(lsort) {text start end line pos mod} { set options [FmtFindInList $text { -ascii -dictionary -integer -real -command -increasing -decreasing -index }] if {![llength ${mod}]} { # remove the common match `-' set options [lrange ${options} 1 end] } set matches [ListCompletion ${text}] return [string trim "${matches} ${options}"] } proc complete(history) {text start end line pos mod} { if {1 == $pos} { set cmds {add change clear event info keep nextid redo} return [FmtFindInList $text $cmds] } elseif {2 == ${pos}} { set cmd [lindex $line 1] switch -- $cmd { add { if {![llength ${mod}]} { return <newValue> } } change { if {![llength ${mod}]} { return <newValue> } } info - keep { if {![llength ${mod}]} { return ?count? } } event - redo { if {![llength ${mod}]} { return ?event? } } clear - nextid { return "" } } } } proc complete(namespace) {text start end line pos mod} { if {1 == $pos} { set cmds { children code current delete eval export forget import inscope origin parent qualifiers tail which} return [FmtFindInList $text $cmds] } elseif {2 == $pos} { set cmd [lindex $line 1] # TODO dosn't work ??? # puts stderr \nmod=|$mod|\n # set matches [namespace children ::] # puts stderr \nmatches=$matches\n set space_matches [namespace children :: [string trim ${mod}]\*] switch -- $cmd { children - delete - eval - inscope - parent { return [FmtFindInList $text $space_matches] } code { return "" } current {} export { } forget { } import { } origin { } qualifiers { } tail { } which { } } # TODO return "" } return "" } proc complete(set) {text start end line pos mod} { # puts stderr "\ntext=|$text| $start $end\n" # puts stderr \nline=|$line|\n # puts stderr \npos=|$pos|\n # puts stderr \nmod=|$mod|\n if {1 == $pos} { return [VarCompletion ${text}] } elseif {2 == $pos && ($text == "" || $text == "\"" || $text == "\{")} { set line [QuoteQuotes $line] if {[catch "set value [list [uplevel [info level] set [lindex $line 1]]]" msg]} { return "" } else { return [Quote $value ${text}] } } return "" } proc complete(unset) {text start end line pos mod} { return [VarCompletion ${text}] } }; # namespace tclreadline |