Context Navigation

← Previous Changeset
Next Changeset →

Changeset 2

Timestamp:

04/06/05 21:49:58 (4 years ago)

Author:

gnue

Message:

Location:

NEWT0/trunk

Files:

: 2 added
: 25 modified

Makefile (modified) (6 diffs)
ext.xcode/gnue.mode1 (modified) (4 diffs)
ext.xcode/gnue.pbxuser (modified) (5 diffs)
ext/protoFILE/Makefile (modified) (3 diffs)
ext/protoREGEX/Makefile (modified) (3 diffs)
misc/doxygen.conf (modified) (2 diffs)
newt.xcode/gnue.mode1 (modified) (27 diffs)
newt.xcode/gnue.pbxuser (modified) (51 diffs)
newt.xcode/project.pbxproj (modified) (5 diffs)
sample/basicFns.newt (modified) (1 diff)
src/main.c (modified) (3 diffs)
src/newt_core/NewtBC.c (modified) (1 diff)
src/newt_core/NewtEnv.c (modified) (8 diffs)
src/newt_core/NewtFile.c (modified) (16 diffs)
src/newt_core/NewtFns.c (modified) (2 diffs)
src/newt_core/NewtIO.c (modified) (6 diffs)
src/newt_core/NewtNSOF.c (added)
src/newt_core/NewtParser.c (modified) (1 diff)
src/newt_core/NewtVM.c (modified) (1 diff)
src/newt_core/incs/NewtEnv.h (modified) (2 diffs)
src/newt_core/incs/NewtFile.h (modified) (1 diff)
src/newt_core/incs/NewtLib.h (modified) (1 diff)
src/newt_core/incs/NewtNSOF.h (added)
src/newt_core/incs/NewtParser.h (modified) (1 diff)
src/parser/newt.l (modified) (10 diffs)
src/parser/newt.y (modified) (7 diffs)
src/version.h (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

NEWT0/trunk/Makefile

r1	r2
4	4	parser = $(srcdir)/parser
5	5	core = $(srcdir)/newt_core
	6	objdir = $(build)/obj
	7	yytmp = $(objdir)/yytmp
	8	tardir = $(shell basename `pwd`)_$(shell uname)
	9	docdir = $(build)/html
6	10
7	11
	12	VPATH = $(core)
8	13	DEBUG = # -g
9		INCS = -I$(srcdir) -I$(core)/incs -I$(srcdir)/parser -I$(~~build~~)
	14	INCS = -I$(srcdir) -I$(core)/incs -I$(srcdir)/parser -I$(yytmp)
10	15	EXTLIBS =
11	16	STRIP = strip -x
…	…
19	24
20	25
21		MAINOBJ = $(~~build~~)/main.o
	26	MAINOBJ = $(objdir)/main.o
22	27
23		COREOBJS = $(build)/NewtBC.o \
24		$(build)/NewtEnv.o \
25		$(build)/NewtFile.o \
26		$(build)/NewtFns.o \
27		$(build)/NewtGC.o \
28		$(build)/NewtIO.o \
29		$(build)/NewtMem.o \
30		$(build)/NewtObj.o \
31		$(build)/NewtParser.o \
32		$(build)/NewtPrint.o \
33		$(build)/NewtStr.o \
34		$(build)/NewtVM.o
	28	COREOBJS = $(objdir)/NewtBC.o \
	29	$(objdir)/NewtEnv.o \
	30	$(objdir)/NewtFile.o \
	31	$(objdir)/NewtFns.o \
	32	$(objdir)/NewtGC.o \
	33	$(objdir)/NewtIO.o \
	34	$(objdir)/NewtMem.o \
	35	$(objdir)/NewtNSOF.o \
	36	$(objdir)/NewtObj.o \
	37	$(objdir)/NewtParser.o \
	38	$(objdir)/NewtPrint.o \
	39	$(objdir)/NewtStr.o \
	40	$(objdir)/NewtVM.o
35	41
36		PARSEROBJS = $(~~build~~)/y.tab.o \
37		$(~~build~~)/lex.yy.o \
38		$(~~build~~)/lookup_words.o
	42	PARSEROBJS = $(yytmp)/y.tab.o \
	43	$(yytmp)/lex.yy.o \
	44	$(objdir)/lookup_words.o
39	45
40	46	NEWTLIBS = $(ext)/protoFILE \
…	…
53	59
54	60
55		### m~~kdir build~~
	61	### make directory
56	62
57	63	$(build):
58		mkdir -p $~~(build)~~
	64	mkdir -p $@
59	65
	66	$(objdir):
	67	mkdir -p $@
	68
	69	$(yytmp):
	70	mkdir -p $@
60	71
61	72	### newt
62	73
63		newt: $(build) $(NEWT) $(LDIMPORT)
	74	newt: $(build) $(objdir) $(yytmp) $(NEWT) $(LDIMPORT)
64	75
65	76	$(NEWT): $(MAINOBJ) $(PARSEROBJS) $(COREOBJS)
…	…
76	87	### PARSER
77	88
78		$(~~build)/y.tab.c $(build~~)/y.tab.h: $(parser)/newt.y
	89	$(yytmp)/y.tab.c $(yytmp)/y.tab.h: $(parser)/newt.y
79	90	$(YACC) -o $@ $<
80	91
81		$(~~build)/lex.yy.c: $(parser)/newt.l $(build~~)/y.tab.h
	92	$(yytmp)/lex.yy.c: $(parser)/newt.l $(yytmp)/y.tab.h
82	93	$(LEX) -o$@ $<
83	94
84		$(~~build~~)/lookup_words.o: $(parser)/lookup_words.c $(parser)/lookup_words.h
	95	$(objdir)/lookup_words.o: $(parser)/lookup_words.c $(parser)/lookup_words.h
85	96	$(CC) $(CFLAGS) $(INCS) -c $< -o $@
86	97
…	…
88	99	### CORE
89	100
90		$(build)/NewtBC.o: $(core)/NewtBC.c
91		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
92
93		$(build)/NewtEnv.o: $(core)/NewtEnv.c
94		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
95
96		$(build)/NewtFile.o: $(core)/NewtFile.c
97		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
98
99		$(build)/NewtFns.o: $(core)/NewtFns.c
100		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
101
102		$(build)/NewtGC.o: $(core)/NewtGC.c
103		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
104
105		$(build)/NewtIO.o: $(core)/NewtIO.c
106		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
107
108		$(build)/NewtMem.o: $(core)/NewtMem.c
109		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
110
111		$(build)/NewtObj.o: $(core)/NewtObj.c
112		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
113
114		$(build)/NewtParser.o: $(core)/NewtParser.c
115		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
116
117		$(build)/NewtPrint.o: $(core)/NewtPrint.c
118		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
119
120		$(build)/NewtStr.o: $(core)/NewtStr.c
121		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
122
123		$(build)/NewtVM.o: $(core)/NewtVM.c
124		$(CC) $(CFLAGS) $(INCS) -c $< -o $@
	101	$(COREOBJS)::
	102	$(CC) $(CFLAGS) $(INCS) -c $(core)/$(notdir $*.c) -o $@
125	103
126	104
…	…
133	111
134	112
135		### strip
	113	### strip (for win)
136	114
137	115	strip:
138	116	$(STRIP) $(NEWT) $(build)/*.$(NEWTLIBSUFFIX)
	117
	118
	119	### ARCHIVE
	120
	121	copy:
	122	rm -rf $(build)/$(tardir)
	123	mkdir -p $(build)/$(tardir)
	124	cp $(NEWT) $(build)/$(tardir)
	125	cp $(build)/*.$(NEWTLIBSUFFIX) $(build)/$(tardir)
	126	cp -Rp COPYING README.* documents sample $(build)/$(tardir)
	127
	128
	129	tgz: copy
	130	tar czf $(build)/$(tardir).tgz -C $(build) $(tardir)
	131
	132
	133	### DOCUMENT GENERATE
	134
	135	doc:
	136	rm -rf $(docdir)
	137	mkdir -p $(docdir)
	138	cd misc; doxygen doxygen.conf
139	139
140	140

NEWT0/trunk/ext.xcode/gnue.mode1

r1	r2
206	206	<array>
207	207	<dict>
	208	<key>BecomeActive</key>
	209	<true/>
208	210	<key>ContentConfiguration</key>
209	211	<dict>
…	…
300	302	<string>protoFILE.c</string>
301	303	<key>bookmark</key>
302		<string>F5~~924AE707F7FDAF003781AC~~</string>
	304	<string>F553018407FCA0CB00D34126</string>
303	305	<key>history</key>
304	306	<array>
…	…
309	311	<string>F558618707E0A5D90080D223</string>
310	312	<string>F54F306B07E0E50100EF95BF</string>
311		<string>F5924AE~~307F7FDAE~~003781AC</string>
	313	<string>F5924AE707F7FDAF003781AC</string>
312	314	</array>
313	315	<key>prevStack</key>
…	…
377	379	<key>TableOfContents</key>
378	380	<array>
379		<string>F5~~924AE507F7FDAE003781AC~~</string>
	381	<string>F553018207FCA0CB00D34126</string>
380	382	<string>1CE0B1FE06471DED0097A5F4</string>
381		<string>F5~~924AE607F7FDAE003781AC~~</string>
	383	<string>F553018307FCA0CB00D34126</string>
382	384	<string>1CE0B20306471E060097A5F4</string>
383	385	<string>1CE0B20506471E060097A5F4</string>

NEWT0/trunk/ext.xcode/gnue.pbxuser

r1	r2
120	120	);
121	121	};
122		PBXPerProjectTemplateStateSaveDate = 133~~692788~~;
	122	PBXPerProjectTemplateStateSaveDate = 133996726;
123	123	PBXPrepackagedSmartGroups_v2 = (
124	124	{
…	…
544	544	RubberWindowFrame = "238 139 776 607 0 0 1024 746 ";
545	545	};
546		PBXWorkspaceStateSaveDate = 133~~692788~~;
	546	PBXWorkspaceStateSaveDate = 133996726;
547	547	};
548	548	perUserProjectItems = {
549	549	F54F306B07E0E50100EF95BF = F54F306B07E0E50100EF95BF;
	550	F553018407FCA0CB00D34126 = F553018407FCA0CB00D34126;
550	551	F558617207E0A4520080D223 = F558617207E0A4520080D223;
551	552	F558617307E0A4520080D223 = F558617307E0A4520080D223;
…	…
555	556	F558618707E0A5D90080D223 = F558618707E0A5D90080D223;
556	557	F57AC9D907E0395E001EE610 = F57AC9D907E0395E001EE610;
557		~~F5924AE307F7FDAE003781AC = F5924AE307F7FDAE003781AC;~~
558	558	F5924AE707F7FDAF003781AC = F5924AE707F7FDAF003781AC;
559	559	F5C0D8CB0728AEC100D83D1B = F5C0D8CB0728AEC100D83D1B;
…	…
623	623	vrLoc = 3505;
624	624	};
	625	F553018407FCA0CB00D34126 = {
	626	fRef = F59E6B2D067D0F8500818CDC;
	627	isa = PBXTextBookmark;
	628	name = "protoFILE.c: 166";
	629	rLen = 0;
	630	rLoc = 3334;
	631	rType = 0;
	632	vrLen = 469;
	633	vrLoc = 0;
	634	};
625	635	F558616A07E0A4270080D223 = {
626	636	uiCtxt = {
…	…
767	777	vrLoc = 0;
768	778	};
769		~~F5924AE307F7FDAE003781AC = {~~
770		~~fRef = F59E6B2D067D0F8500818CDC;~~
771		~~isa = PBXTextBookmark;~~
772		~~name = read;~~
773		~~rLen = 4;~~
774		~~rLoc = 3307;~~
775		~~rType = 0;~~
776		~~vrLen = 483;~~
777		~~vrLoc = 3016;~~
778		};
779	779	F5924AE707F7FDAF003781AC = {
780	780	fRef = F59E6B2D067D0F8500818CDC;

NEWT0/trunk/ext/protoFILE/Makefile

r1	r2
4	4	parser = $(srcdir)/parser
5	5	core = $(srcdir)/newt_core
	6	objdir = $(build)/obj
6	7
7	8
…	…
17	18	NEWTEXLIB = $(build)/$(NEWTLIBNAME).$(NEWTLIBSUFFIX)
18	19
19		LIBOBJ = $(~~build~~)/$(NEWTLIBNAME).o
	20	LIBOBJ = $(objdir)/$(NEWTLIBNAME).o
20	21
21	22
…	…
24	25
25	26
26		all: $(build) $(NEWTEXLIB)
	27	all: $(build) $(objdir) $(NEWTEXLIB)
27	28
28	29	$(build):
29		mkdir -p $(build)
	30	mkdir -p $@
	31
	32	$(objdir):
	33	mkdir -p $@
30	34
31	35	$(NEWTEXLIB): $(LIBOBJ)

NEWT0/trunk/ext/protoREGEX/Makefile

r1	r2
4	4	parser = $(srcdir)/parser
5	5	core = $(srcdir)/newt_core
	6	objdir = $(build)/obj
6	7
7	8
…	…
17	18	NEWTEXLIB = $(build)/$(NEWTLIBNAME).$(NEWTLIBSUFFIX)
18	19
19		LIBOBJ = $(~~build~~)/$(NEWTLIBNAME).o
	20	LIBOBJ = $(objdir)/$(NEWTLIBNAME).o
20	21
21	22
…	…
24	25
25	26
26		all: $(build) $(NEWTEXLIB)
	27	all: $(build) $(objdir) $(NEWTEXLIB)
27	28
28	29	$(build):
29		mkdir -p $(build)
	30	mkdir -p $@
	31
	32	$(objdir):
	33	mkdir -p $@
30	34
31	35	$(NEWTEXLIB): $(LIBOBJ)

NEWT0/trunk/misc/doxygen.conf

r1	r2
4	4	# Project related configuration options
5	5	#---------------------------------------------------------------------------
6		PROJECT_NAME = ~~newt~~/0
	6	PROJECT_NAME = NEWT/0
7	7	PROJECT_NUMBER =
8	8	OUTPUT_DIRECTORY = ../build
…	…
32	32	EXTRACT_ALL = NO
33	33	EXTRACT_PRIVATE = NO
34		EXTRACT_STATIC = NO
	34	EXTRACT_STATIC = YES
35	35	EXTRACT_LOCAL_CLASSES = YES
36	36	HIDE_UNDOC_MEMBERS = NO

NEWT0/trunk/newt.xcode/gnue.mode1

r1	r2
259	259	<array>
260	260	<array>
261		<integer>50</integer>
262		<integer>49</integer>
	261	<integer>47</integer>
	262	<integer>1</integer>
263	263	<integer>0</integer>
264	264	</array>
265	265	</array>
266	266	<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
267		<string>{{0, ~~563~~}, {186, 571}}</string>
	267	<string>{{0, 489}, {186, 571}}</string>
268	268	</dict>
269	269	<key>PBXTopSmartGroupGIDs</key>
…	…
280	280	</array>
281	281	<key>RubberWindowFrame</key>
282		<string>9 115 851 631 0 0 1024 746 </string>
	282	<string>55 115 851 631 0 0 1024 746 </string>
283	283	</dict>
284	284	<key>Module</key>
…	…
296	296	<string>1CE0B20306471E060097A5F4</string>
297	297	<key>PBXProjectModuleLabel</key>
298		<string>~~01_howto.txt~~</string>
	298	<string>main.c</string>
299	299	<key>PBXSplitModuleInNavigatorKey</key>
300	300	<dict>
…	…
304	304	<string>1CE0B20406471E060097A5F4</string>
305	305	<key>PBXProjectModuleLabel</key>
306		<string>~~01_howto.txt~~</string>
	306	<string>main.c</string>
307	307	<key>bookmark</key>
308		<string>F5~~924ADF07F7FD70003781AC~~</string>
	308	<string>F54C6EEF07FF8F0B00EF51A5</string>
309	309	<key>history</key>
310	310	<array>
…	…
316	316	<string>F55860DE07E09C540080D223</string>
317	317	<string>F55860DF07E09C540080D223</string>
318		~~<string>F55860E007E09C540080D223</string>~~
319		~~<string>F558619407E0A6630080D223</string>~~
320	318	<string>F55861A307E0A7C30080D223</string>
321	319	<string>F508002D07E0D08400CB6E80</string>
…	…
324	322	<string>F5F193F907E81B6800C58D8F</string>
325	323	<string>F5359ED707E88DEC001BB1C1</string>
326		~~<string>F5359EDF07E88DEC001BB1C1</string>~~
327	324	<string>F5359EE007E88DEC001BB1C1</string>
328	325	<string>F5359EE207E88DEC001BB1C1</string>
329	326	<string>F5359EE507E88DEC001BB1C1</string>
330	327	<string>F5359F3607E892A7001BB1C1</string>
331		~~<string>F59235F807E8D73D0082BC25</string>~~
332	328	<string>F5F69B3907E8DC620086BCEA</string>
333		~~<string>F5F69C0407E8F4960086BCEA</string>~~
334		~~<string>F530774D07E991DA00AC4858</string>~~
335		~~<string>F57FBA3707EB338400887004</string>~~
336	329	<string>F57DA29E07ECB4D800940936</string>
337		~~<string>F5D473F707ED759000A2104A</string>~~
338	330	<string>F5D4741507ED7A9E00A2104A</string>
339	331	<string>F5D4744B07ED80E600A2104A</string>
340		~~<string>F5D4746C07ED83FB00A2104A</string>~~
341	332	<string>F5D4746D07ED83FB00A2104A</string>
342	333	<string>F58B2D5007F0AA5A00605499</string>
343		~~<string>F50149EF07F0ACB000068BFF</string>~~
344		~~<string>F5014A2607F0B0A800068BFF</string>~~
345	334	<string>F5014A6707F0B48700068BFF</string>
346		~~<string>F5014A6807F0B48700068BFF</string>~~
347		~~<string>F5649E5A07F0E16A00D65589</string>~~
348		~~<string>F5BB08D407F596A500681AB6</string>~~
349		~~<string>F5BB08DE07F596ED00681AB6</string>~~
350	335	<string>F5AA5EC707F7F3AF00E97D3C</string>
351	336	<string>F56B0FF707F7F8C000E9D848</string>
352		<string>F56B0FF807F7F8C000E9D848</string>
353		<string>F56B0FF907F7F8C000E9D848</string>
354		<string>F56B101807F7FCE500E9D848</string>
	337	<string>F50811CE07FA1AD1008AE09A</string>
	338	<string>F50811CF07FA1AD1008AE09A</string>
	339	<string>F50811D007FA1AD1008AE09A</string>
	340	<string>F508121A07FA1F6A008AE09A</string>
	341	<string>F508122B07FA20DD008AE09A</string>
	342	<string>F5C37DF907FC1ABA00F92B70</string>
	343	<string>F5C8D89307FC267E00B95CFB</string>
	344	<string>F5C8D8B007FC2A8F00B95CFB</string>
	345	<string>F5895C9907FCCD0A00A0BB4A</string>
	346	<string>F5895C9A07FCCD0A00A0BB4A</string>
	347	<string>F536B77707FCED0A005071A5</string>
	348	<string>F57E7A1807FD36C200256511</string>
	349	<string>F53786C807FD4A7100DB0BA1</string>
	350	<string>F5112A8E07FE1A7500A39213</string>
	351	<string>F5112A9207FE1A9700A39213</string>
	352	<string>F5112A9B07FE1B4F00A39213</string>
	353	<string>F54394F407FE1D1200F32002</string>
	354	<string>F54394F507FE1D1200F32002</string>
	355	<string>F54394F607FE1D1200F32002</string>
	356	<string>F50BE99107FE2F2800D978FE</string>
	357	<string>F50BE99207FE2F2800D978FE</string>
	358	<string>F54C6EEA07FF8F0B00EF51A5</string>
355	359	</array>
356	360	<key>prevStack</key>
…	…
400	404	<string>F58B10E207EB46ED00A4E1FA</string>
401	405	<string>F57DA2A007ECB4D800940936</string>
	406	<string>F508122F07FA20DD008AE09A</string>
	407	<string>F5C37E1307FC1D2E00F92B70</string>
	408	<string>F57E7A1007FD364200256511</string>
	409	<string>F57E7A1A07FD36C200256511</string>
402	410	</array>
403	411	</dict>
…	…
413	421	<string>{{0, 0}, {642, 404}}</string>
414	422	<key>RubberWindowFrame</key>
415		<string>9 115 851 631 0 0 1024 746 </string>
	423	<string>55 115 851 631 0 0 1024 746 </string>
416	424	</dict>
417	425	<key>Module</key>
…	…
433	441	<string>{{0, 411}, {642, 178}}</string>
434	442	<key>RubberWindowFrame</key>
435		<string>9 115 851 631 0 0 1024 746 </string>
	443	<string>55 115 851 631 0 0 1024 746 </string>
436	444	</dict>
437	445	<key>Module</key>
…	…
457	465	<key>TableOfContents</key>
458	466	<array>
459		<string>F5~~924AE007F7FD70003781AC~~</string>
	467	<string>F54C6EEC07FF8F0B00EF51A5</string>
460	468	<string>1CE0B1FE06471DED0097A5F4</string>
461		<string>F5~~924AE107F7FD70003781AC~~</string>
	469	<string>F54C6EED07FF8F0B00EF51A5</string>
462	470	<string>1CE0B20306471E060097A5F4</string>
463	471	<string>1CE0B20506471E060097A5F4</string>
…	…
487	495	<key>WindowOrderList</key>
488	496	<array>
	497	<string>1C530D57069F1CE1000CFCEE</string>
489	498	<string>/Users/gnue/misc/Documents/wk/Newt/NEWT0/newt.xcode</string>
490	499	</array>
491	500	<key>WindowString</key>
492		<string>9 115 851 631 0 0 1024 746 </string>
	501	<string>55 115 851 631 0 0 1024 746 </string>
493	502	<key>WindowTools</key>
494	503	<array>
…	…
509	518	<string>1CD0528F0623707200166675</string>
510	519	<key>PBXProjectModuleLabel</key>
511		<string>Newt~~Obj~~.c</string>
	520	<string>NewtEnv.c</string>