Check-in [1d9d3e3f9c]
Not logged in
Overview
Comment: Modified Files: share/vim/VIM/vimrc share/vim/functions/selectBuffer.vim Added Files: 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: 1d9d3e3f9c68be554c31a3cf98d38c509ae62636
User & Date: johannes@zellner.org on 1999-08-21 16:16:54
Other Links: manifest | tags
Context
1999-08-22
18:52
Modified Files: .tclshrc src/tclreadline/README src/tclreadline/configure.in Added Files: src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: ca84c60bc0 user: johannes@zellner.org tags: trunk
1999-08-21
16:16
Modified Files: share/vim/VIM/vimrc share/vim/functions/selectBuffer.vim Added Files: src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: 1d9d3e3f9c user: johannes@zellner.org tags: trunk
1999-08-20
22:43
share/vim/ft/c_ft.vim share/vim/ft/cpp_ft.vim src/tclreadline/configure.in src/tclreadline/tclreadline.n.in src/tclreadline/tclreadlineSetup.tcl.in Added Files: src/tclreadline/Makefile.in src/tclreadline/tclreadline.c src/tclreadline/tclreadlineConfig.sh.in src/tclreadline/tclreadlineInit.tcl.in check-in: d6ac1c38a3 user: johannes@zellner.org tags: trunk
Changes

Modified tclreadline.c from [1a4acfc94a] to [abc453aae1].

1
2
3
4
5

6
7
8
9
10
11
12
1
2
3
4

5
6
7
8
9
10
11
12




-
+








 /* ==================================================================

    FILE: "/home/joze/src/tclreadline/tclreadline.c"
    LAST MODIFICATION: "Fri Aug 20 23:41:24 1999 (joze)"
    LAST MODIFICATION: "Sat Aug 21 17:44:13 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
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
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







-
-
+
+




















-
+





-
+






-
-
+
+






-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+











-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+



-



-
+






-
-
+





-
+


-
+



-
+


-
+

+

-
+

+

-
+

-
+

-
+



-
+

-
+

-
-
+
+


-
+



-
+


-
+


-
-
+
+


-
+


-
-
+
+


-
+


-
-
+
+

-
+















+
-
+


-
+


+
-
+
-



+
-
+


-
+

-
+
-


-
+


-
+


+
+
+
+
+
-
-
+
+

+
-
+

-
+


+
-
+

-
+

-
+


+
-
+



-
+







-
+






+
-
+

-
+


-
+

-
+


-
-
-
+
+
+


-
-
+
+

-
+




+
-
+

-
+


+
-
+

-
+


+
-
+



+
-
+

-
+





-
+











-
-
+
+

-
+















-
+




-
-
+
+











-
+

-
-
+
+

-
-
+
+

-
+
-


-
+


-
+









-
-
+
+
















-

-
-
-
+
+
+
-
-
-
-
-
-
-
+







#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)
#define MALLOC(size) Tcl_Alloc((int) size)
#define FREE(ptr) if (ptr) Tcl_Free((char *) ptr)

enum {
    _CMD_SET     = (1 << 0),
    _CMD_GET     = (1 << 1),
    _CMD_SUB_GET = (1 << 2)
};


typedef struct cmds_t {
    struct cmds_t  *prev;
    char          **cmd;
    struct cmds_t  *next;
} cmds_t;


#define STRIPLEFT(ptr)          \
do {                            \
    char *tmp = ptr;            \
    while (*tmp && *tmp <= ' ') \
        tmp ++;                 \
    strcpy (ptr, tmp);          \
    strcpy(ptr, tmp);           \
} while (0)

#define STRIPRIGHT(ptr)                                \
do {                                                   \
    char *__tmp__;                                     \
    for (__tmp__ = strchr (ptr, '\0') - 1;             \
    for (__tmp__ = strchr(ptr, '\0') - 1;              \
         __tmp__ >= ptr && *__tmp__ <= ' '; __tmp__--) \
        *__tmp__ = '\0';                               \
} while (0)

#define STRIPWHITE(ptr) \
do {                    \
    STRIPLEFT (ptr);    \
    STRIPRIGHT (ptr);   \
    STRIPLEFT(ptr);     \
    STRIPRIGHT(ptr);    \
} while (0)


/*
 * forward declarations.
 */
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*  TclReadlineInitialize	(char *historyfile);
char** TclReadlineCompletion	(char *text, int start, int end);
char*  TclReadline0generator	(char *text, int state);
char*  TclReadline1generator	(char *text, int state);
char*  TclReadlineKnownCommands	(char *text, int state, int mode);
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* TclReadlineInitialize(char *historyfile);
char** TclReadlineCompletion(char *text, int start, int end);
char* TclReadline0generator(char *text, int state);
char* TclReadline1generator(char *text, int state);
char* TclReadlineKnownCommands(char *text, int state, int mode);
int    TclReadlineEventHook	(void);
int    TclReadlineParse	(char **args, int maxargs, char *buf);
int TclReadlineParse(char **args, int maxargs, char *buf);

enum { 
    LINE_PENDING,
    LINE_CONTROL_D,
    LINE_COMPLETE
};

static int line_complete = LINE_PENDING;
static char *line = (char *) NULL;


/*
 * Script to set the tclreadline library path in the
 * variable global "tclreadline_library"
 */

int


int TclReadlineCmd (clientData, interp, argc, argv)
    ClientData clientData;	/* Main window associated with interpreter  */
    Tcl_Interp *interp;		/* Current interpreter                      */
    int argc;			/* Number of arguments                      */
    char **argv;		/* Argument strings                         */
TclReadlineCmd(
    ClientData  clientData, /* Main window associated with interpreter  */
    Tcl_Interp* interp,     /* Current interpreter                      */
    int         argc,       /* Number of arguments                      */
    char**      argv        /* Argument strings                         */
)
{
    int		c, length;
    

    if (argc < 2) {
	interp->result = "wrong # args";
	for (c = 0; c < argc; c++)
	    fprintf (stderr, "argv[%d] = %s\n", c, argv[c]);
	    fprintf(stderr, "argv[%d] = %s\n", c, argv[c]);
	return TCL_ERROR;
    }

    c = argv[1][0];
    length = strlen(argv[1]);


    if (c == 'r'  && strncmp (argv[1], "read", length) == 0) {
    if (c == 'r'  && strncmp(argv[1], "read", length) == 0) {
        
        char *expansion = (char *) NULL;
        int status;
        
        line_complete = LINE_PENDING;
        rl_callback_handler_install (argc == 3 ? argv[2] : "%",
        rl_callback_handler_install(argc == 3 ? argv[2] : "%",
                TclReadlineLineCompleteHandler);

        Tcl_CreateFileHandler (0, TCL_READABLE,
        Tcl_CreateFileHandler(0, TCL_READABLE,
                TclReadlineDataAvailableHandler, (ClientData) NULL);

        while (LINE_PENDING == line_complete) {
            Tcl_DoOneEvent (0);
            Tcl_DoOneEvent(0);
        }

        Tcl_DeleteFileHandler (0);
        Tcl_DeleteFileHandler(0);

        /*
	if (LINE_CONTROL_D == line_complete) {
	    Tcl_Eval (interp, "puts {}; exit");
	    Tcl_Eval(interp, "puts {}; exit");
	}
        */

        status = history_expand (line, &expansion);
        status = history_expand(line, &expansion);
        if (status == 1)
            printf ("%s\n", expansion);
            printf("%s\n", expansion);
        else if (status == -1)
            Tcl_AppendResult (interp, "error in history expansion\n",
            Tcl_AppendResult(interp, "error in history expansion\n",
                    (char *) NULL);
        
        if (expansion && *expansion)
            add_history (expansion);
            add_history(expansion);

        Tcl_AppendResult (interp, expansion, (char *) NULL);
        Tcl_AppendResult(interp, expansion, (char *) NULL);

        FREE (line);
        FREE (expansion);
        FREE(line);
        FREE(expansion);
        return TCL_OK;
    }
    else if (c == 'i'  && strncmp (argv[1], "initialize", length) == 0) {
    else if (c == 'i'  && strncmp(argv[1], "initialize", length) == 0) {
        if (argc != 3)
            goto BAD_COMMAND;
        else
            Tcl_AppendResult (interp, TclReadlineInitialize (argv[2]),
            Tcl_AppendResult(interp, TclReadlineInitialize(argv[2]),
                    (char *) NULL);
    }
    else if (c == 'w'  && strncmp (argv[1], "write", length) == 0) {
    else if (c == 'w'  && strncmp(argv[1], "write", length) == 0) {
        if (argc != 3)
            goto BAD_COMMAND;
        else if (write_history (argv[2]))
            Tcl_AppendResult (interp, "unable to write history to \"",
        else if (write_history(argv[2]))
            Tcl_AppendResult(interp, "unable to write history to \"",
                    argv[2], "\"\n", (char *) NULL);
    }
    else if (c == 'a'  && strncmp (argv[1], "add", length) == 0) {
    else if (c == 'a'  && strncmp(argv[1], "add", length) == 0) {
        if (argc != 3)
            goto BAD_COMMAND;
        else if (TclReadlineKnownCommands (argv[2], (int) 0, _CMD_SET))
            Tcl_AppendResult (interp, "unable to add command \"",
        else if (TclReadlineKnownCommands(argv[2], (int) 0, _CMD_SET))
            Tcl_AppendResult(interp, "unable to add command \"",
                    argv[2], "\"\n", (char *) NULL);
    }
    else if (c == 'c'  && strncmp (argv[1], "complete", length) == 0) {
    else if (c == 'c'  && strncmp(argv[1], "complete", length) == 0) {
        if (argc != 3)
            goto BAD_COMMAND;
        else if (Tcl_CommandComplete (argv[2]))
            Tcl_AppendResult (interp, "1", (char *) NULL);
        else if (Tcl_CommandComplete(argv[2]))
            Tcl_AppendResult(interp, "1", (char *) NULL);
        else
            Tcl_AppendResult (interp, "0", (char *) NULL);
            Tcl_AppendResult(interp, "0", (char *) NULL);
    }
    else
        goto BAD_COMMAND;


    return TCL_OK;

BAD_COMMAND:
    Tcl_AppendResult (interp,
            "wrong # args: should be \"readline option ?arg ...?\"",
	    (char *) NULL);
    return TCL_ERROR;

}

void
void TclReadlineDataAvailableHandler (ClientData clientData, int mask)
TclReadlineDataAvailableHandler(ClientData clientData, int mask)
{
#if 0
    fprintf (stderr, "(TclReadlineDataAvailableHandler) mask = %d\n",  mask);
    fprintf(stderr, "(TclReadlineDataAvailableHandler) mask = %d\n",  mask);
#endif
    if (mask & TCL_READABLE) {
        while (0 == rl_done)
        rl_callback_read_char ();
            rl_callback_read_char();
        rl_redisplay ();
    }
}

void
void TclReadlineLineCompleteHandler (char *ptr)
TclReadlineLineCompleteHandler(char *ptr)
{
#if 0
    fprintf (stderr, "(TclReadlineLineCompleteHandler)  ptr = %p\n",  ptr);
    fprintf(stderr, "(TclReadlineLineCompleteHandler)  ptr = %p\n",  ptr);
    if (ptr)
    fprintf (stderr, "(TclReadlineLineCompleteHandler) *ptr = %p\n", *ptr);
    fprintf(stderr, "(TclReadlineLineCompleteHandler) *ptr = %p\n", *ptr);
#endif
    if (!ptr) { /* <c-d> */
        line_complete = LINE_CONTROL_D;
        rl_callback_handler_remove ();
        rl_callback_handler_remove();
    } else if (*ptr) {
        line_complete = LINE_COMPLETE;
        rl_callback_handler_remove ();
        rl_callback_handler_remove();
        line = ptr;
    }
#endif
    if (ptr && *ptr) {
        line_complete = 1;
        rl_callback_handler_remove ();
        line = ptr;
}

    }
}

int
int Tclreadline_SafeInit (Tcl_Interp *interp)
Tclreadline_SafeInit(Tcl_Interp *interp)
{
    return Tclreadline_Init (interp);
    return Tclreadline_Init(interp);
}

int
int Tclreadline_Init (Tcl_Interp *interp)
Tclreadline_Init(Tcl_Interp *interp)
{
    Tcl_CreateCommand (interp, "::tclreadline::readline", TclReadlineCmd,
    Tcl_CreateCommand(interp, "::tclreadline::readline", TclReadlineCmd,
	    (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL);
    return Tcl_PkgProvide (interp, "tclreadline", TCLREADLINE_VERSION);
    return Tcl_PkgProvide(interp, "tclreadline", TCLREADLINE_VERSION);
}

char*
char *TclReadlineInitialize (char *historyfile)
TclReadlineInitialize(char* historyfile)
{

    rl_readline_name = "tclreadline";
    using_history ();
    using_history();

    /*
     * try to read historyfile in home
     * directory. If this failes, this
     * is *not* an error.
     */
    rl_attempted_completion_function = (CPPFunction *) TclReadlineCompletion;
    if (read_history (historyfile))
    if (read_history(historyfile))
        return "unable to read history file";
    
    else
        return "";
}

char**
char **TclReadlineCompletion (char *text, int start, int end)
TclReadlineCompletion(char* text, int start, int end)
{
    char **matches = (char **) NULL;
    char** matches = (char **) NULL;
    static char local_line[BUFSIZ];
       
    strcpy (local_line, rl_line_buffer);
    strcpy(local_line, rl_line_buffer);
    
    STRIPWHITE (local_line);
    STRIPWHITE(local_line);
    
    /*
    fprintf (stderr, "DEBUG> TclReadlineCompletion: text=|%s|\n", text);
    fprintf (stderr, "DEBUG> TclReadlineCompletion: start=|%d|\n", start);
    fprintf (stderr, "DEBUG> TclReadlineCompletion: end=|%d|\n", end);
    fprintf(stderr, "DEBUG> TclReadlineCompletion: text=|%s|\n", text);
    fprintf(stderr, "DEBUG> TclReadlineCompletion: start=|%d|\n", start);
    fprintf(stderr, "DEBUG> TclReadlineCompletion: end=|%d|\n", end);
    */

    if (start == 0 || !strlen (local_line))
        matches = completion_matches (text, TclReadline0generator);
    if (start == 0 || !strlen(local_line))
        matches = completion_matches(text, TclReadline0generator);
    else
        matches = completion_matches (text, TclReadline1generator);
        matches = completion_matches(text, TclReadline1generator);
    
    return matches;
}

char*
char *TclReadline0generator (char *text, int state)
TclReadline0generator(char* text, int state)
{
    return TclReadlineKnownCommands (text, state, _CMD_GET);
    return TclReadlineKnownCommands(text, state, _CMD_GET);
}

char*
char *TclReadline1generator (char *text, int state)
TclReadline1generator(char* text, int state)
{
    return TclReadlineKnownCommands (text, state, _CMD_SUB_GET);
    return TclReadlineKnownCommands(text, state, _CMD_SUB_GET);
}

char*
char *TclReadlineKnownCommands (char *text, int state, int mode)
TclReadlineKnownCommands(char* text, int state, int mode)
{
    static int len;
    static cmds_t *cmds = (cmds_t *) NULL, *new;
    char* tmp;
    char *tmp, *args[256];
    char* args[256];
    int i, argc;
    char **name;
    char** name;
    
    switch (mode) {
        
        case _CMD_SET:

            new = (cmds_t *) MALLOC (sizeof (cmds_t));
            new = (cmds_t *) MALLOC(sizeof(cmds_t));
            new->next = (cmds_t *) NULL;

            if (!cmds) {
                cmds = new;
                cmds->prev = new;
            }
            else {
                cmds->prev->next = new;
                cmds->prev = new;
            }

            tmp = strdup (text);
            argc = TclReadlineParse (args, sizeof (args), tmp);
            tmp = strdup(text);
            argc = TclReadlineParse(args, sizeof(args), tmp);

            new->cmd = (char **) MALLOC (sizeof (char *) * (argc + 1));
            new->cmd = (char **) MALLOC(sizeof(char *) * (argc + 1));

            for (i = 0; i < argc; i++)
                new->cmd[i] = args[i];

            new->cmd[argc] = (char *) NULL;

            return (char *) NULL;
            break;


        case _CMD_GET:


            if (!state) {
                new = cmds;
                len = strlen (text);
                len = strlen(text);
            }

            while (new && (name = new->cmd)) {
                new = new->next;
                if (!strncmp (name[0], text, len))
                    return strdup (name[0]);
                if (!strncmp(name[0], text, len))
                    return strdup(name[0]);
            }

            return (char *) NULL;
            break;

        case _CMD_SUB_GET:
            

            if (!state) {

                int sub;
                char *local_line = strdup (rl_line_buffer);
                char *local_line = strdup(rl_line_buffer);
                
                len = strlen (local_line);
                STRIPRIGHT (local_line);
                len = strlen(local_line);
                STRIPRIGHT(local_line);

                if (len != strlen (local_line))
                    sub = TclReadlineParse (args, sizeof (args), local_line);
                if (len != strlen(local_line))
                    sub = TclReadlineParse(args, sizeof(args), local_line);
                else
                    sub = TclReadlineParse (args,
                    sub = TclReadlineParse(args, sizeof(args), local_line) - 1;
                                            sizeof (args), local_line) - 1;
                
                new = cmds;
                len = strlen (text);
                len = strlen(text);
                
                while (new && (name = new->cmd)) {
                    if (!strcmp (name[0], args[0]))
                    if (!strcmp(name[0], args[0]))
                        break;
                    new = new->next;
                }
                
                if (!new)
                    return (char *) NULL;

                for (i = 0; new->cmd[i]; i++) /* EMPTY */;

                if (sub < i && !strncmp (new->cmd[sub], text, len))
                    return strdup (new->cmd[sub]);
                if (sub < i && !strncmp(new->cmd[sub], text, len))
                    return strdup(new->cmd[sub]);
                else
                   return (char *) NULL;

            }
            else
                return (char *) NULL;

            /* NOTREACHED */
            break;


        default:
            return (char *) NULL;
            break;

    }
    
    /* NOTREACHED */

}

}

int
int TclReadlineEventHook (void)
{
    Tcl_DoOneEvent (TCL_ALL_EVENTS | TCL_DONT_WAIT);
    return TCL_OK;
}

int TclReadlineParse (char **args, int maxargs, char *buf)
TclReadlineParse(char** args, int maxargs, char* buf)
{
    int nr = 0;

    while (*buf != '\0' && nr < maxargs) {
        /*
         * Strip whitespace.  Use nulls, so
         * that the previous argument is terminated
443
444
445
446
447
448
449
450

451
443
444
445
446
447
448
449

450








-
+
-

        while ((*buf!='\0') && (*buf!=' ') && (*buf!='\t') && (*buf!='\n'))
            buf++;
    }

    *args = '\0';
    return nr;

}
}