LWTools: lwcc/token.c annotate

annotate lwcc/token.c @ 560:dba08c7dff96

Fix off by one handling MOD directive optional arguments Fixes an off by one in handling the optional arguments to the MOD directive as of changeset 928c033c0cd0. Thanks to Alex Evans <varmfskii@gmail.com> for reporting the problem and a suggested fix. This fix is different but should be more stable should the rest of the parsing code be refactored in the future.

author	William Astle <lost@l-w.ca>
date	Fri, 22 Sep 2023 12:15:09 -0600
parents	54f213c8fb81
children

rev	line source
295 4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	1 /*
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	2 lwcc/token.c
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	3
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	4 Copyright © 2013 William Astle
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	5
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	6 This file is part of LWTOOLS.
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	7
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	8 LWTOOLS is free software: you can redistribute it and/or modify it under the
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	9 terms of the GNU General Public License as published by the Free Software
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	10 Foundation, either version 3 of the License, or (at your option) any later
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	11 version.
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	12
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	13 This program is distributed in the hope that it will be useful, but WITHOUT
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	16 more details.
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	17
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	18 You should have received a copy of the GNU General Public License along with
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	19 this program. If not, see <http://www.gnu.org/licenses/>.
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	20 */
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	21
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	22 #include <stdlib.h>
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	23
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	24 #include <lw_alloc.h>
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	25 #include <lw_string.h>
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	26
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	27 #include "token.h"
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	28
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	29 struct token token_create(int ttype, char strval, int row, int col, const char *fn)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	30 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	31 struct token *t;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	32
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	33 t = lw_alloc(sizeof(struct token));
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	34 t -> ttype = ttype;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	35 if (strval)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	36 t -> strval = lw_strdup(strval);
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	37 else
304 d85d173ba120 Checkpoint lwcc development - preprocessor is runnable but nonfunctional William Astle <lost@l-w.ca> parents: 299 diff changeset	38 t -> strval = NULL;
295 4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	39 t -> lineno = row;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	40 t -> column = col;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	41 t -> fn = fn;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	42 t -> next = NULL;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	43 t -> prev = NULL;
305 54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	44 t -> list = NULL;
295 4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	45 return t;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	46 }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	47
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	48 void token_free(struct token *t)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	49 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	50 lw_free(t -> strval);
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	51 lw_free(t);
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	52 }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	53
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	54 struct token token_dup(struct token t)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	55 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	56 struct token *t2;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	57
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	58 t2 = lw_alloc(sizeof(struct token));
305 54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	59 t2 -> ttype = t -> ttype;
54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	60 t2 -> lineno = t -> lineno;
54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	61 t2 -> column = t -> column;
54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	62 t2 -> list = NULL;
295 4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	63 t2 -> next = NULL;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	64 t2 -> prev = NULL;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	65 if (t -> strval)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	66 t2 -> strval = lw_strdup(t -> strval);
305 54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	67 else
54f213c8fb81 Various bugfixes and output tuning William Astle <lost@l-w.ca> parents: 304 diff changeset	68 t2 -> strval = NULL;
295 4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	69 return t2;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	70 }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	71
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	72 static struct { int ttype; char *tstr; } tok_strs[] =
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	73 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	74 { TOK_WSPACE, " " },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	75 { TOK_EOL, "\n" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	76 { TOK_DIV, "/" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	77 { TOK_ADD, "+" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	78 { TOK_SUB, "-" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	79 { TOK_OPAREN, "(" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	80 { TOK_CPAREN, ")" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	81 { TOK_NE, "!=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	82 { TOK_EQ, "==" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	83 { TOK_LE, "<=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	84 { TOK_LT, "<" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	85 { TOK_GE, ">=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	86 { TOK_GT, ">" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	87 { TOK_BAND, "&&" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	88 { TOK_BOR, "\|\|" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	89 { TOK_BNOT, "!" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	90 { TOK_MOD, "%"},
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	91 { TOK_COMMA, "," },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	92 { TOK_ELLIPSIS, "..." },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	93 { TOK_QMARK, "?" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	94 { TOK_COLON, ":" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	95 { TOK_OBRACE, "{" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	96 { TOK_CBRACE, "}" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	97 { TOK_OSQUARE, "[" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	98 { TOK_CSQUARE, "]" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	99 { TOK_COM, "~" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	100 { TOK_EOS, ";" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	101 { TOK_HASH, "#" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	102 { TOK_DBLHASH, "##" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	103 { TOK_XOR, "^" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	104 { TOK_XORASS, "^=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	105 { TOK_STAR, "*" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	106 { TOK_MULASS, "*=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	107 { TOK_DIVASS, "/=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	108 { TOK_ASS, "=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	109 { TOK_MODASS, "%=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	110 { TOK_SUBASS, "-=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	111 { TOK_DBLSUB, "--" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	112 { TOK_ADDASS, "+=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	113 { TOK_DBLADD, "++" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	114 { TOK_BWAND, "&" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	115 { TOK_BWANDASS, "&=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	116 { TOK_BWOR, "\|" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	117 { TOK_BWORASS, "\|=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	118 { TOK_LSH, "<<" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	119 { TOK_LSHASS, "<<=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	120 { TOK_RSH, ">>" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	121 { TOK_RSHASS, ">>=" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	122 { TOK_DOT, "." },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	123 { TOK_ARROW, "->" },
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	124 { TOK_NONE, "" }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	125 };
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	126
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	127 void token_print(struct token t, FILE f)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	128 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	129 int i;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	130 for (i = 0; tok_strs[i].ttype != TOK_NONE; i++)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	131 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	132 if (tok_strs[i].ttype == t -> ttype)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	133 {
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	134 fprintf(f, "%s", tok_strs[i].tstr);
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	135 break;
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	136 }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	137 }
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	138 if (t -> strval)
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	139 fprintf(f, "%s", t -> strval);
4b17780f2777 Checkpoint lwcc development William Astle <lost@l-w.ca> parents: diff changeset	140 }
299 856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	141
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	142 /* token list management */
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	143 struct token_list *token_list_create(void)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	144 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	145 struct token_list *tl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	146 tl = lw_alloc(sizeof(struct token_list));
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	147 tl -> head = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	148 tl -> tail = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	149 return tl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	150 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	151
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	152 void token_list_destroy(struct token_list *tl)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	153 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	154 if (tl == NULL)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	155 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	156 while (tl -> head)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	157 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	158 tl -> tail = tl -> head;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	159 tl -> head = tl -> head -> next;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	160 token_free(tl -> tail);
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	161 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	162 lw_free(tl);
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	163 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	164
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	165 void token_list_append(struct token_list tl, struct token tok)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	166 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	167 tok -> list = tl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	168 if (tl -> head == NULL)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	169 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	170 tl -> head = tl -> tail = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	171 tok -> next = tok -> prev = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	172 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	173 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	174 tl -> tail -> next = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	175 tok -> prev = tl -> tail;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	176 tl -> tail = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	177 tok -> next = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	178 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	179 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	180
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	181 void token_list_remove(struct token *tok)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	182 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	183 if (tok -> list == NULL)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	184 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	185
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	186 if (tok -> prev)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	187 tok -> prev -> next = tok -> next;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	188 if (tok -> next)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	189 tok -> next -> prev = tok -> prev;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	190 if (tok == tok -> list -> head)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	191 tok -> list -> head = tok -> next;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	192 if (tok == tok -> list -> tail)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	193 tok -> list -> tail = tok -> prev;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	194 tok -> list = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	195 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	196
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	197 void token_list_prepend(struct token_list tl, struct token tok)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	198 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	199 tok -> list = tl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	200 if (tl -> head == NULL)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	201 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	202 tl -> head = tl -> tail = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	203 tok -> next = tok -> prev = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	204 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	205 tl -> head -> prev = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	206 tok -> next = tl -> head;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	207 tl -> head = tok;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	208 tok -> prev = NULL;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	209 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	210
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	211 void token_list_insert(struct token_list tl, struct token after, struct token *newt)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	212 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	213 struct token *t;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	214
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	215 if (after == NULL \|\| tl -> head == NULL)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	216 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	217 token_list_prepend(tl, newt);
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	218 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	219 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	220
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	221 for (t = tl -> head; t && t != after; t = t -> next)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	222 /* do nothing */ ;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	223 if (!t)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	224 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	225 token_list_append(tl, newt);
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	226 return;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	227 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	228 newt -> prev = t;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	229 newt -> next = t -> next;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	230 if (t -> next)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	231 t -> next -> prev = newt;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	232 else
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	233 tl -> tail = newt;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	234 t -> next = newt;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	235 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	236
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	237 struct token_list token_list_dup(struct token_list tl)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	238 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	239 struct token_list *nl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	240 struct token *t;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	241
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	242 nl = token_list_create();
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	243 for (t = tl -> head; t; t = t -> next)
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	244 {
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	245 token_list_append(nl, token_dup(t));
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	246 }
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	247 return nl;
856caf91ffaa Added token list structure and switched some stuff to use it William Astle <lost@l-w.ca> parents: 295 diff changeset	248 }

Mercurial > hg > index.cgi

annotate lwcc/token.c @ 560:dba08c7dff96