LWTools: lwasm/input.c annotate

annotate lwasm/input.c @ 186:1824cabf25ce

Various enhancements to lwasm

author	lost@l-w.ca
date	Thu, 22 Dec 2011 18:04:13 -0700
parents	a88b04ba5ab8
children	afd50d6b4113

rev	line source
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	1 /*
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	2 input.c
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	3
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	4 Copyright © 2010 William Astle
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	5
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	6 This file is part of LWTOOLS.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	7
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	8 LWTOOLS is free software: you can redistribute it and/or modify it under the
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	9 terms of the GNU General Public License as published by the Free Software
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	10 Foundation, either version 3 of the License, or (at your option) any later
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	11 version.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	12
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	13 This program is distributed in the hope that it will be useful, but WITHOUT
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	16 more details.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	17
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	18 You should have received a copy of the GNU General Public License along with
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	19 this program. If not, see <http://www.gnu.org/licenses/>.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	20 */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	21
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	22 /*
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	23 This file is used to handle reading input files. It serves to encapsulate
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	24 the entire input system to make porting to different media and systems
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	25 less difficult.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	26 */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	27
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	28 #include <errno.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	29 #include <stdio.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	30 #include <string.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	31
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	32 #include <lw_alloc.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	33 #include <lw_stringlist.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	34 #include <lw_string.h>
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	35 #include <lw_error.h>
7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	36
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	37 #include "lwasm.h"
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	38 #include "input.h"
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	39
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	40 /*
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	41 Data type for storing input buffers
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	42 */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	43
73 1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	44 #define IGNOREERROR (errno == ENOENT && (as -> flags & FLAG_DEPENDNOERR))
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	45
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	46 enum input_types_e
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	47 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	48 input_type_file, // regular file, no search path
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	49 input_type_include, // include path, start from "local"
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	50 input_type_string, // input from a string
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	51
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	52 input_type_error // invalid input type
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	53 };
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	54
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	55 struct input_stack_node
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	56 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	57 input_stack_entry *entry;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	58 struct input_stack_node *next;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	59 };
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	60
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	61 struct input_stack
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	62 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	63 struct input_stack *next;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	64 int type;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	65 void *data;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	66 int data2;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	67 char *filespec;
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	68 struct input_stack_node *stack;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	69 };
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	70
10 127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	71 static char make_filename(char p, char *f)
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	72 {
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	73 int l;
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	74 char *r;
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	75 l = strlen(p) + strlen(f) + 1;
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	76 r = lw_alloc(l + 1);
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	77 sprintf(r, "%s/%s", p, f);
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	78 return r;
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	79 }
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	80
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	81 #define IS ((struct input_stack *)(as -> input_data))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	82
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	83 void input_init(asmstate_t *as)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	84 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	85 struct input_stack *t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	86
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	87 if (as -> file_dir)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	88 lw_stack_destroy(as -> file_dir);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	89 as -> file_dir = lw_stack_create(lw_free);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	90 as -> includelist = lw_stack_create(lw_free);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	91 lw_stringlist_reset(as -> input_files);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	92 while (IS)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	93 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	94 t = IS;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	95 as -> input_data = IS -> next;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	96 lw_free(t);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	97 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	98 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	99
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	100 void input_pushpath(asmstate_t as, char fn)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	101 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	102 /* take apart fn into path and filename then push the path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	103 /* onto the current file path stack */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	104
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	105 /* also add it to the list of files included */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	106 char dn, dp;
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	107 // int o;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	108
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	109 dn = lw_strdup(fn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	110 lw_stack_push(as -> includelist, dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	111
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	112 dn = lw_strdup(fn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	113 dp = dn + strlen(dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	114
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	115 while (--dp != dn)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	116 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	117 if (*dp == '/')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	118 break;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	119 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	120 if (*dp == '/')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	121 *dp = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	122
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	123 if (dp == dn)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	124 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	125 lw_free(dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	126 dn = lw_strdup(".");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	127 lw_stack_push(as -> file_dir, dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	128 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	129 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	130 dp = lw_strdup(dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	131 lw_free(dn);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	132 lw_stack_push(as -> file_dir, dp);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	133 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	134
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	135 void input_openstring(asmstate_t as, char s, char *str)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	136 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	137 struct input_stack *t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	138
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	139 t = lw_alloc(sizeof(struct input_stack));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	140 t -> filespec = lw_strdup(s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	141
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	142 t -> type = input_type_string;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	143 t -> data = lw_strdup(str);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	144 t -> data2 = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	145 t -> next = IS;
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	146 t -> stack = NULL;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	147 as -> input_data = t;
93 5bf9edabd661 Squashed the remaining memory leaks revealed by valgrind lost@l-w.ca parents: 74 diff changeset	148 // t -> filespec = lw_strdup(s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	149 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	150
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	151 void input_open(asmstate_t as, char s)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	152 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	153 struct input_stack *t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	154 char *s2;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	155 char p, p2;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	156
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	157 t = lw_alloc(sizeof(struct input_stack));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	158 t -> filespec = lw_strdup(s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	159
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	160 for (s2 = s; s2 && (s2 != ':'); s2++)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	161 /* do nothing */ ;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	162 if (!*s2)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	163 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	164 t -> type = input_type_file;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	165 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	166 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	167 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	168 char *ts;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	169
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	170 ts = lw_strndup(s, s2 - s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	171 s = s2 + 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	172 if (!strcmp(ts, "include"))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	173 t -> type = input_type_include;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	174 else if (!strcmp(ts, "file"))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	175 t -> type = input_type_file;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	176 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	177 t -> type = input_type_error;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	178
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	179 lw_free(ts);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	180 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	181 t -> next = as -> input_data;
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	182 t -> stack = NULL;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	183 as -> input_data = t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	184
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	185 switch (IS -> type)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	186 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	187 case input_type_include:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	188 /* first check for absolute path and if so, skip path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	189 if (*s == '/')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	190 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	191 /* absolute path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	192 IS -> data = fopen(s, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	193 debug_message(as, 1, "Opening (abs) %s", s);
73 1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	194 if (!IS -> data && !IGNOREERROR)
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	195 {
74 e95eaf2f7fe0 Added missing newlines to error messages related to opening files lost@l-w.ca parents: 73 diff changeset	196 lw_error("Cannot open file '%s': %s\n", s, strerror(errno));
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	197 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	198 input_pushpath(as, s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	199 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	200 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	201
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	202 /* relative path, check relative to "current file" directory */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	203 p = lw_stack_top(as -> file_dir);
10 127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	204 p2 = make_filename(p, s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	205 debug_message(as, 1, "Open: (cd) %s\n", p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	206 IS -> data = fopen(p2, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	207 if (IS -> data)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	208 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	209 input_pushpath(as, p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	210 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	211 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	212 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	213 debug_message(as, 2, "Failed to open: (cd) %s (%s)\n", p2, strerror(errno));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	214 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	215
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	216 /* now check relative to entries in the search path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	217 lw_stringlist_reset(as -> include_list);
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	218 while ((p = lw_stringlist_current(as -> include_list)))
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	219 {
10 127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	220 p2 = make_filename(p, s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	221 debug_message(as, 1, "Open (sp): %s\n", p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	222 IS -> data = fopen(p2, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	223 if (IS -> data)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	224 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	225 input_pushpath(as, p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	226 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	227 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	228 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	229 debug_message(as, 2, "Failed to open: (sp) %s (%s)\n", p2, strerror(errno));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	230 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	231 lw_stringlist_next(as -> include_list);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	232 }
73 1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	233 if (IGNOREERROR)
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	234 {
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	235 input_pushpath(as, s);
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	236 return;
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	237 }
74 e95eaf2f7fe0 Added missing newlines to error messages related to opening files lost@l-w.ca parents: 73 diff changeset	238 lw_error("Cannot open include file '%s': %s\n", s, strerror(errno));
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	239 break;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	240
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	241 case input_type_file:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	242 debug_message(as, 1, "Opening (reg): %s\n", s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	243 IS -> data = fopen(s, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	244
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	245 if (!IS -> data)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	246 {
74 e95eaf2f7fe0 Added missing newlines to error messages related to opening files lost@l-w.ca parents: 73 diff changeset	247 lw_error("Cannot open file '%s': %s\n", s, strerror(errno));
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	248 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	249 input_pushpath(as, s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	250 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	251 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	252
74 e95eaf2f7fe0 Added missing newlines to error messages related to opening files lost@l-w.ca parents: 73 diff changeset	253 lw_error("Cannot figure out how to open '%s'.\n", t -> filespec);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	254 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	255
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	256 FILE input_open_standalone(asmstate_t as, char *s)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	257 {
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	258 // char *s2;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	259 FILE *fp;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	260 char p, p2;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	261
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	262 /* first check for absolute path and if so, skip path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	263 if (*s == '/')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	264 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	265 /* absolute path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	266 debug_message(as, 2, "Open file (st abs) %s", s);
186 1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	267 if (as -> flags & FLAG_DEPEND)
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	268 printf("%s\n", s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	269 fp = fopen(s, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	270 if (!fp)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	271 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	272 return NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	273 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	274 return fp;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	275 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	276
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	277 /* relative path, check relative to "current file" directory */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	278 p = lw_stack_top(as -> file_dir);
172 a88b04ba5ab8 Fixed segfault opening relative paths without a current directory on the stack; probably a symptom of another bug somewhere William Astle <lost@l-w.ca> parents: 110 diff changeset	279 p2 = make_filename(p ? p : "", s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	280 debug_message(as, 2, "Open file (st cd) %s", p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	281 fp = fopen(p2, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	282 if (fp)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	283 {
186 1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	284 if (as -> flags & FLAG_DEPEND)
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	285 printf("%s\n", p2);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	286 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	287 return fp;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	288 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	289 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	290
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	291 /* now check relative to entries in the search path */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	292 lw_stringlist_reset(as -> include_list);
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	293 while ((p = lw_stringlist_current(as -> include_list)))
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	294 {
10 127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm lost@l-w.ca parents: 2 diff changeset	295 p2 = make_filename(p, s);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	296 debug_message(as, 2, "Open file (st ip) %s", p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	297 fp = fopen(p2, "rb");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	298 if (fp)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	299 {
186 1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	300 if (as -> flags & FLAG_DEPEND)
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	301 printf("%s\n", p2);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	302 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	303 return fp;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	304 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	305 lw_free(p2);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	306 lw_stringlist_next(as -> include_list);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	307 }
186 1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	308
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	309 // last ditch output for dependencies
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	310 if (as -> flags & FLAG_DEPEND)
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	311 {
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	312 p = lw_stack_top(as -> file_dir);
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	313 p2 = make_filename(p ? p : "", s);
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	314 printf("%s\n", p2);
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	315 lw_free(p2);
1824cabf25ce Various enhancements to lwasm lost@l-w.ca parents: 172 diff changeset	316 }
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	317
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	318 return NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	319 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	320
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	321 char input_readline(asmstate_t as)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	322 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	323 char *s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	324 char linebuff[2049];
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	325 int lbloc;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	326 int eol = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	327
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	328 /* if no file is open, open one */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	329 nextfile:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	330 if (!IS) {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	331 s = lw_stringlist_current(as -> input_files);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	332 if (!s)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	333 return NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	334 lw_stringlist_next(as -> input_files);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	335 input_open(as, s);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	336 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	337
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	338 switch (IS -> type)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	339 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	340 case input_type_file:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	341 case input_type_include:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	342 /* read from a file */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	343 lbloc = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	344 for (;;)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	345 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	346 int c, c2;
73 1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	347 c = EOF;
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	348 if (IS -> data)
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	349 c = fgetc(IS -> data);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	350 if (c == EOF)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	351 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	352 if (lbloc == 0)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	353 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	354 struct input_stack *t;
110 38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	355 struct input_stack_node *n;
73 1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	356 if (IS -> data)
1f77ae5c3590 Added --dependnoerr flag to list dependencies on non-existent files without bailing out; also suppress error reports during dependency generation lost@l-w.ca parents: 10 diff changeset	357 fclose(IS -> data);
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	358 lw_free(lw_stack_pop(as -> file_dir));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	359 lw_free(IS -> filespec);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	360 t = IS -> next;
110 38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	361 while (IS -> stack)
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	362 {
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	363 n = IS -> stack;
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	364 IS -> stack = n -> next;
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	365 lw_free(n -> entry);
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	366 lw_free(n);
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	367 }
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	368 lw_free(IS);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	369 as -> input_data = t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	370 goto nextfile;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	371 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	372 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	373 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	374 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	375 else if (c == '\r')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	376 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	377 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	378 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	379 c2 = fgetc(IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	380 if (c2 == EOF)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	381 c = EOF;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	382 else if (c2 != '\n')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	383 ungetc(c2, IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	384 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	385 else if (c == '\n')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	386 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	387 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	388 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	389 c2 = fgetc(IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	390 if (c2 == EOF)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	391 c = EOF;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	392 else if (c2 != '\r')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	393 ungetc(c2, IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	394 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	395 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	396 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	397 if (lbloc < 2048)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	398 linebuff[lbloc++] = c;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	399 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	400 if (eol)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	401 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	402 s = lw_strdup(linebuff);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	403 return s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	404 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	405 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	406
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	407 case input_type_string:
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	408 /* read from a string */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	409 if (((char *)(IS -> data))[IS -> data2] == '\0')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	410 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	411 struct input_stack *t;
110 38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	412 struct input_stack_node *n;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	413 lw_free(IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	414 lw_free(IS -> filespec);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	415 t = IS -> next;
110 38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	416 while (IS -> stack)
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	417 {
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	418 n = IS -> stack;
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	419 IS -> stack = n -> next;
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	420 lw_free(n -> entry);
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	421 lw_free(n);
38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	422 }
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	423 lw_free(IS);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	424 as -> input_data = t;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	425 goto nextfile;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	426 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	427 s = (char *)(IS -> data);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	428 lbloc = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	429 for (;;)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	430 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	431 int c;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	432 c = s[IS -> data2];
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	433 if (c)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	434 IS -> data2++;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	435 if (c == '\0')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	436 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	437 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	438 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	439 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	440 else if (c == '\r')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	441 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	442 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	443 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	444 if (s[IS -> data2] == '\n')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	445 IS -> data2++;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	446 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	447 else if (c == '\n')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	448 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	449 linebuff[lbloc] = '\0';
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	450 eol = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	451 if (s[IS -> data2] == '\r')
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	452 IS -> data2++;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	453 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	454 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	455 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	456 if (lbloc < 2048)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	457 linebuff[lbloc++] = c;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	458 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	459 if (eol)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	460 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	461 s = lw_strdup(linebuff);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	462 return s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	463 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	464 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	465
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	466 default:
74 e95eaf2f7fe0 Added missing newlines to error messages related to opening files lost@l-w.ca parents: 73 diff changeset	467 lw_error("Problem reading from unknown input type\n");
2 7317fbe024af Clean up insane number of compiler warnings under -Wall lost@l-w.ca parents: 0 diff changeset	468 return NULL;
0 2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	469 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	470 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	471
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	472 char input_curspec(asmstate_t as)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	473 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	474 if (IS)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	475 return IS -> filespec;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	476 return NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization lost@l-w.ca parents: diff changeset	477 }
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	478
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	479 void input_stack_push(asmstate_t as, input_stack_entry e)
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	480 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	481 struct input_stack_node *n;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	482
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	483 n = lw_alloc(sizeof(struct input_stack_node));
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	484 n -> next = IS -> stack;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	485 n -> entry = e;
110 38c1537857ce Pragma stack at parse stage now works lost@l-w.ca parents: 108 diff changeset	486 IS -> stack = n;
108 9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	487 }
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	488
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	489 input_stack_entry input_stack_pop(asmstate_t as, int magic, int (fn)(input_stack_entry e, void data), void data)
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	490 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	491 struct input_stack_node n, n2;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	492 input_stack_entry *e2;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	493
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	494 n2 = NULL;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	495 for (n = IS -> stack; n; n = n -> next)
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	496 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	497 if (n -> entry -> magic == magic)
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	498 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	499 if ((*fn)(n -> entry, data))
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	500 {
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	501 /* we have a match */
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	502 e2 = n -> entry;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	503 if (n2)
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	504 n2 -> next = n -> next;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	505 else
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	506 IS -> stack = n -> next;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	507 lw_free(n);
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	508 return e2;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	509 }
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	510 }
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	511 n2 = n;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	512 }
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	513 return NULL;
9960e05cbe3a Added pragmapush and pragmapop; still seems to be nonfunctional lost@l-w.ca parents: 93 diff changeset	514 }

Mercurial > hg > index.cgi

annotate lwasm/input.c @ 186:1824cabf25ce