pntool-developers Mailing List for A Concurrency Tool Suite (Page 6)
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
pntool-developers — Developers
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(69) |
Jul
(86) |
Aug
(33) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(3) |
Jun
(1) |
Jul
(10) |
Aug
(2) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Drew C. <dr...@se...> - 2009-07-01 22:58:32
|
pntool$ make doesn't work because:
gcc -g -o ct pnheaders/*.o codegen/src/*.o spnbox/*.o \
translator/*.o main_function.o spnbox/*.a
ld: duplicate symbol _main in main_function.o and translator/main.o
collect2: ld returned 1 exit status
make: *** [ct] Error 1
I assume somebody's on this.
Also, cd $(TRANSLATOR); make distclean doesn't always succeed,
because of something to do with incomplete ANTLR builds. Bion should
consider handling this with a test like I do in codegen's make.
--Drew
|
|
From: <com...@us...> - 2009-07-01 22:26:59
|
Revision: 141
http://pntool.svn.sourceforge.net/pntool/?rev=141&view=rev
Author: compaqdrew
Date: 2009-07-01 22:25:49 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Restored mac build; fixed some spnbox makefile problems; cleaned ANTLR
Modified Paths:
--------------
Makefile
spnbox/Makefile
third-party/lp_solve_5.5/Makefile.Linux
Removed Paths:
-------------
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3convertutf.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3cyclicdfa.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3debughandlers.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3encodings.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3exception.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3filestream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3inputstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3intstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3lexer.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3parser.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3rewritestreams.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3string.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3stringstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3tokenstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3treeparser.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3ucs2inputstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3baserecognizer.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3basetree.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3basetreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3bitset.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3collections.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontoken.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontree.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontreenodestream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3convertutf.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3cyclicdfa.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3debughandlers.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3encodings.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3exception.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3filestream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3inputstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3intstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3lexer.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3parser.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3rewritestreams.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3string.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3stringstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3tokenstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3treeparser.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3ucs2inputstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.a
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Info.plist
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Resources/DWARF/libantlr3c.dylib
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.la
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.lai
third-party/lp_solve_5.5/lp_rlp.c
Modified: Makefile
===================================================================
--- Makefile 2009-07-01 20:19:18 UTC (rev 140)
+++ Makefile 2009-07-01 22:25:49 UTC (rev 141)
@@ -43,6 +43,9 @@
rm -f main_function.o
cd codegen; make clean
cd $(TRANSLATOR); make clean
+ cd $(SPNBOX); make clean
+ #my personal feeling is that these next lines should be in some other makefile
+ cd third-party/lp_solve_5.5; make -f Makefile.Linux clean
distclean: clean
cd codegen; make distclean
Modified: spnbox/Makefile
===================================================================
--- spnbox/Makefile 2009-07-01 20:19:18 UTC (rev 140)
+++ spnbox/Makefile 2009-07-01 22:25:49 UTC (rev 141)
@@ -55,3 +55,6 @@
../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
cd ../third-party/lp_solve_5.5; make -f Makefile.linux lib
+
+clean:
+ rm -f *.o *.a
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,210 +0,0 @@
-antlr3baserecognizer.lo antlr3baserecognizer.o: \
- src/antlr3baserecognizer.c include/antlr3baserecognizer.h \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3exception.h \
- include/antlr3input.h include/antlr3string.h \
- include/antlr3collections.h include/antlr3commontoken.h \
- include/antlr3intstream.h include/antlr3tokenstream.h \
- include/antlr3bitset.h include/antlr3debugeventlistener.h \
- include/antlr3basetree.h include/antlr3commontreenodestream.h \
- include/antlr3commontreeadaptor.h include/antlr3basetreeadaptor.h \
- include/antlr3commontree.h include/antlr3recognizersharedstate.h \
- include/antlr3lexer.h include/antlr3parser.h include/antlr3treeparser.h
-
-include/antlr3baserecognizer.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3exception.h:
-
-include/antlr3input.h:
-
-include/antlr3string.h:
-
-include/antlr3collections.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3intstream.h:
-
-include/antlr3tokenstream.h:
-
-include/antlr3bitset.h:
-
-include/antlr3debugeventlistener.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontreenodestream.h:
-
-include/antlr3commontreeadaptor.h:
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3commontree.h:
-
-include/antlr3recognizersharedstate.h:
-
-include/antlr3lexer.h:
-
-include/antlr3parser.h:
-
-include/antlr3treeparser.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,170 +0,0 @@
-antlr3basetree.lo antlr3basetree.o: src/antlr3basetree.c \
- include/antlr3basetree.h include/antlr3defs.h include/antlr3errors.h \
- antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
- /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
- /usr/include/machine/_types.h /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3collections.h \
- include/antlr3string.h
-
-include/antlr3basetree.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3collections.h:
-
-include/antlr3string.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,178 +0,0 @@
-antlr3basetreeadaptor.lo antlr3basetreeadaptor.o: \
- src/antlr3basetreeadaptor.c include/antlr3basetreeadaptor.h \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3collections.h \
- include/antlr3string.h include/antlr3basetree.h \
- include/antlr3commontoken.h include/antlr3debugeventlistener.h
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3collections.h:
-
-include/antlr3string.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3debugeventlistener.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,167 +0,0 @@
-antlr3bitset.lo antlr3bitset.o: src/antlr3bitset.c include/antlr3bitset.h \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3collections.h
-
-include/antlr3bitset.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3collections.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,222 +0,0 @@
-antlr3collections.lo antlr3collections.o: src/antlr3collections.c \
- include/antlr3.h include/antlr3defs.h include/antlr3errors.h \
- antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
- /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
- /usr/include/machine/_types.h /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3exception.h \
- include/antlr3encodings.h include/antlr3string.h \
- include/antlr3collections.h include/antlr3input.h \
- include/antlr3commontoken.h include/antlr3intstream.h \
- include/antlr3cyclicdfa.h include/antlr3baserecognizer.h \
- include/antlr3tokenstream.h include/antlr3bitset.h \
- include/antlr3debugeventlistener.h include/antlr3basetree.h \
- include/antlr3commontreenodestream.h include/antlr3commontreeadaptor.h \
- include/antlr3basetreeadaptor.h include/antlr3commontree.h \
- include/antlr3recognizersharedstate.h include/antlr3lexer.h \
- include/antlr3parser.h include/antlr3treeparser.h \
- include/antlr3filestream.h include/antlr3rewritestreams.h
-
-include/antlr3.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3exception.h:
-
-include/antlr3encodings.h:
-
-include/antlr3string.h:
-
-include/antlr3collections.h:
-
-include/antlr3input.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3intstream.h:
-
-include/antlr3cyclicdfa.h:
-
-include/antlr3baserecognizer.h:
-
-include/antlr3tokenstream.h:
-
-include/antlr3bitset.h:
-
-include/antlr3debugeventlistener.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontreenodestream.h:
-
-include/antlr3commontreeadaptor.h:
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3commontree.h:
-
-include/antlr3recognizersharedstate.h:
-
-include/antlr3lexer.h:
-
-include/antlr3parser.h:
-
-include/antlr3treeparser.h:
-
-include/antlr3filestream.h:
-
-include/antlr3rewritestreams.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,222 +0,0 @@
-antlr3commontoken.lo antlr3commontoken.o: src/antlr3commontoken.c \
- include/antlr3.h include/antlr3defs.h include/antlr3errors.h \
- antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
- /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
- /usr/include/machine/_types.h /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3exception.h \
- include/antlr3encodings.h include/antlr3string.h \
- include/antlr3collections.h include/antlr3input.h \
- include/antlr3commontoken.h include/antlr3intstream.h \
- include/antlr3cyclicdfa.h include/antlr3baserecognizer.h \
- include/antlr3tokenstream.h include/antlr3bitset.h \
- include/antlr3debugeventlistener.h include/antlr3basetree.h \
- include/antlr3commontreenodestream.h include/antlr3commontreeadaptor.h \
- include/antlr3basetreeadaptor.h include/antlr3commontree.h \
- include/antlr3recognizersharedstate.h include/antlr3lexer.h \
- include/antlr3parser.h include/antlr3treeparser.h \
- include/antlr3filestream.h include/antlr3rewritestreams.h
-
-include/antlr3.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3exception.h:
-
-include/antlr3encodings.h:
-
-include/antlr3string.h:
-
-include/antlr3collections.h:
-
-include/antlr3input.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3intstream.h:
-
-include/antlr3cyclicdfa.h:
-
-include/antlr3baserecognizer.h:
-
-include/antlr3tokenstream.h:
-
-include/antlr3bitset.h:
-
-include/antlr3debugeventlistener.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontreenodestream.h:
-
-include/antlr3commontreeadaptor.h:
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3commontree.h:
-
-include/antlr3recognizersharedstate.h:
-
-include/antlr3lexer.h:
-
-include/antlr3parser.h:
-
-include/antlr3treeparser.h:
-
-include/antlr3filestream.h:
-
-include/antlr3rewritestreams.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,175 +0,0 @@
-antlr3commontree.lo antlr3commontree.o: src/antlr3commontree.c \
- include/antlr3commontree.h include/antlr3defs.h include/antlr3errors.h \
- antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
- /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
- /usr/include/machine/_types.h /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3basetree.h \
- include/antlr3collections.h include/antlr3string.h \
- include/antlr3commontoken.h
-
-include/antlr3commontree.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3basetree.h:
-
-include/antlr3collections.h:
-
-include/antlr3string.h:
-
-include/antlr3commontoken.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,183 +0,0 @@
-antlr3commontreeadaptor.lo antlr3commontreeadaptor.o: \
- src/antlr3commontreeadaptor.c include/antlr3commontreeadaptor.h \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3collections.h \
- include/antlr3string.h include/antlr3basetreeadaptor.h \
- include/antlr3basetree.h include/antlr3commontoken.h \
- include/antlr3debugeventlistener.h include/antlr3commontree.h
-
-include/antlr3commontreeadaptor.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3collections.h:
-
-include/antlr3string.h:
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3debugeventlistener.h:
-
-include/antlr3commontree.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,188 +0,0 @@
-antlr3commontreenodestream.lo antlr3commontreenodestream.o: \
- src/antlr3commontreenodestream.c include/antlr3commontreenodestream.h \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3commontreeadaptor.h \
- include/antlr3collections.h include/antlr3string.h \
- include/antlr3basetreeadaptor.h include/antlr3basetree.h \
- include/antlr3commontoken.h include/antlr3debugeventlistener.h \
- include/antlr3commontree.h include/antlr3intstream.h
-
-include/antlr3commontreenodestream.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
-
-include/antlr3convertutf.h:
-
-include/antlr3commontreeadaptor.h:
-
-include/antlr3collections.h:
-
-include/antlr3string.h:
-
-include/antlr3basetreeadaptor.h:
-
-include/antlr3basetree.h:
-
-include/antlr3commontoken.h:
-
-include/antlr3debugeventlistener.h:
-
-include/antlr3commontree.h:
-
-include/antlr3intstream.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3convertutf.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3convertutf.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3convertutf.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,162 +0,0 @@
-antlr3convertutf.lo antlr3convertutf.o: src/antlr3convertutf.c \
- include/antlr3convertutf.h include/antlr3defs.h include/antlr3errors.h \
- antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
- /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
- /usr/include/machine/_types.h /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h
-
-include/antlr3convertutf.h:
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/include/sys/unistd.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/sys/_select.h:
-
-/usr/include/netinet/in.h:
-
-/usr/include/sys/socket.h:
-
-/usr/include/machine/_param.h:
-
-/usr/include/i386/_param.h:
-
-/usr/include/netinet6/in6.h:
-
-/usr/include/netinet/tcp.h:
-
-/usr/include/arpa/nameser.h:
-
-/usr/include/sys/param.h:
-
-/usr/include/sys/syslimits.h:
-
-/usr/include/machine/param.h:
-
-/usr/include/i386/param.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/netdb.h:
-
-/usr/include/sys/malloc.h:
-
-/usr/include/ctype.h:
-
-/usr/include/runetype.h:
-
-include/antlr3interfaces.h:
Deleted: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3cyclicdfa.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3cyclicdfa.Plo 2009-07-01 20:19:18 UTC (rev 140)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3cyclicdfa.Plo 2009-07-01 22:25:49 UTC (rev 141)
@@ -1,212 +0,0 @@
-antlr3cyclicdfa.lo antlr3cyclicdfa.o: src/antlr3cyclicdfa.c \
- include/antlr3defs.h include/antlr3errors.h antlr3config.h \
- /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
- /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
- /usr/include/i386/_types.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
- /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
- /usr/include/machine/types.h /usr/include/i386/types.h \
- /usr/include/machine/endian.h /usr/include/i386/endian.h \
- /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
- /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
- /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
- /usr/include/sys/wait.h /usr/include/sys/signal.h \
- /usr/include/machine/signal.h /usr/include/i386/signal.h \
- /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
- /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
- /usr/include/alloca.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
- /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
- /usr/include/unistd.h /usr/include/sys/unistd.h \
- /usr/include/sys/select.h /usr/include/sys/_select.h \
- /usr/include/netinet/in.h /usr/include/sys/socket.h \
- /usr/include/machine/_param.h /usr/include/i386/_param.h \
- /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
- /usr/include/arpa/nameser.h /usr/include/sys/param.h \
- /usr/include/sys/syslimits.h /usr/include/machine/param.h \
- /usr/include/i386/param.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
- /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
- /usr/include/limits.h /usr/include/machine/limits.h \
- /usr/include/i386/limits.h /usr/include/i386/_limits.h \
- /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
- /usr/include/runetype.h include/antlr3interfaces.h \
- include/antlr3convertutf.h include/antlr3cyclicdfa.h \
- include/antlr3baserecognizer.h include/antlr3exception.h \
- include/antlr3input.h include/antlr3string.h \
- include/antlr3collections.h include/antlr3commontoken.h \
- include/antlr3intstream.h include/antlr3tokenstream.h \
- include/antlr3bitset.h include/antlr3debugeventlistener.h \
- include/antlr3basetree.h include/antlr3commontreenodestream.h \
- include/antlr3commontreeadaptor.h include/antlr3basetreeadaptor.h \
- include/antlr3commontree.h include/antlr3recognizersharedstate.h \
- include/antlr3lexer.h include/antlr3parser.h include/antlr3treeparser.h
-
-include/antlr3defs.h:
-
-include/antlr3errors.h:
-
-antlr3config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/sys/stat.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/alloca.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
-
-/usr/include/string.h:
-
-/usr/include/strings.h:
-
-/usr/include/inttypes.h:
-
-/usr/include/unistd.h:
-
-/usr/inclu...
[truncated message content] |
|
From: <com...@us...> - 2009-07-01 22:25:58
|
Revision: 142
http://pntool.svn.sourceforge.net/pntool/?rev=142&view=rev
Author: compaqdrew
Date: 2009-07-01 22:25:56 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Better mac support; better makefiles
Modified Paths:
--------------
Makefile
third-party/lp_solve_5.5/Makefile.Linux
Added Paths:
-----------
third-party/lp_solve_5.5/lp_rlp.c
Modified: Makefile
===================================================================
--- Makefile 2009-07-01 22:25:49 UTC (rev 141)
+++ Makefile 2009-07-01 22:25:56 UTC (rev 142)
@@ -49,4 +49,6 @@
distclean: clean
cd codegen; make distclean
+ #this line must be last, because occasionally it errors.
+ #bion: consider using a test (like in codegen's distclean) to see if you run antlr's distclean
cd $(TRANSLATOR); make distclean
\ No newline at end of file
Modified: third-party/lp_solve_5.5/Makefile.Linux
===================================================================
--- third-party/lp_solve_5.5/Makefile.Linux 2009-07-01 22:25:49 UTC (rev 141)
+++ third-party/lp_solve_5.5/Makefile.Linux 2009-07-01 22:25:56 UTC (rev 142)
@@ -12,8 +12,10 @@
LEX = flex
YACC = bison
-UNAME = $(shell uname)
+UNAME := $(shell uname)
+
+
INCLUDE = -I. -Ibfp -Ibfp/bfp_LUSOL -Ibfp/bfp_LUSOL/LUSOL -Icolamd -Ishared
# Uncomment any of the following two depending on your profile
@@ -47,6 +49,13 @@
lp_scale.c lp_simplex.c lp_SOS.c lp_utils.c yacc_read.c
LIBRARIES = liblpsolve55.a liblpsolve55.so
+
+ifeq ("$(UNAME)", "Darwin") #there's no concept of an ".so" on a mac. We use dylib for this.
+ LIBRARIES := liblpsolve55.a
+else
+ ADDL_ARGS := liblpsolve55.a liblpsolve55.so
+endif
+
BINARIES = lp_solve demo
ALL = $(BINARIES) $(DEMOS) $(LIBRARIES)
.PHONY=clean lp_solve
@@ -78,12 +87,9 @@
ranlib lpsolve55/$@
liblpsolve55.so: $(OBJECTS)
- ifeq($(UNAME),Darwin)
- $(CC) -fpic -shared -Wl,-soname,$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
- else
- $(CC) -fpic -shared -Wl,-Bsymbolic -Wl,-soname,$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
- endif
+ $(CC) -fpic -shared -Wl,$(ADDL_ARGS)$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
+
clean:
rm -f $(OBJECTS) *.so *.a lp_solve/lp_solve demo/demo lpsolve55/*.so lpsolve55/*.a
Added: third-party/lp_solve_5.5/lp_rlp.c
===================================================================
--- third-party/lp_solve_5.5/lp_rlp.c (rev 0)
+++ third-party/lp_solve_5.5/lp_rlp.c 2009-07-01 22:25:56 UTC (rev 142)
@@ -0,0 +1,2484 @@
+/* A Bison parser, made by GNU Bison 2.3. */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA. */
+
+/* As a special exception, you may create a larger work that contains
+ part or all of the Bison parser skeleton and distribute that work
+ under terms of your choice, so long as that work isn't itself a
+ parser generator using the skeleton or a modified version thereof
+ as a parser skeleton. Alternatively, if you modify or redistribute
+ the parser skeleton itself, you may (at your option) remove this
+ special exception, which will cause the skeleton and the resulting
+ Bison output files to be licensed under the GNU General Public
+ License without this special exception.
+
+ This special exception was added by the Free Software Foundation in
+ version 2.2 of Bison. */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+ simplifying the original so-called "semantic" parser. */
+
+/* All symbols defined below should begin with lp_yy or YY, to avoid
+ infringing on user name space. This should be done even for local
+ variables, as they might otherwise be expanded by user macros.
+ There are some unavoidable exceptions within include files to
+ define necessary library symbols; they are noted "INFRINGES ON
+ USER NAME SPACE" below. */
+
+/* Identify Bison output. */
+#define YYBISON 1
+
+/* Bison version. */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name. */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers. */
+#define YYPURE 1
+
+/* Using locations. */
+#define YYLSP_NEEDED 0
+
+
+
+/* Tokens. */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+ /* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+ enum lp_yytokentype {
+ VAR = 258,
+ CONS = 259,
+ INTCONS = 260,
+ VARIABLECOLON = 261,
+ INF = 262,
+ SEC_INT = 263,
+ SEC_BIN = 264,
+ SEC_SEC = 265,
+ SEC_SOS = 266,
+ SOSDESCR = 267,
+ SEC_FREE = 268,
+ TOK_SIGN = 269,
+ AR_M_OP = 270,
+ RE_OPEQ = 271,
+ RE_OPLE = 272,
+ RE_OPGE = 273,
+ END_C = 274,
+ COMMA = 275,
+ COLON = 276,
+ MINIMISE = 277,
+ MAXIMISE = 278,
+ UNDEFINED = 279
+ };
+#endif
+/* Tokens. */
+#define VAR 258
+#define CONS 259
+#define INTCONS 260
+#define VARIABLECOLON 261
+#define INF 262
+#define SEC_INT 263
+#define SEC_BIN 264
+#define SEC_SEC 265
+#define SEC_SOS 266
+#define SOSDESCR 267
+#define SEC_FREE 268
+#define TOK_SIGN 269
+#define AR_M_OP 270
+#define RE_OPEQ 271
+#define RE_OPLE 272
+#define RE_OPGE 273
+#define END_C 274
+#define COMMA 275
+#define COLON 276
+#define MINIMISE 277
+#define MAXIMISE 278
+#define UNDEFINED 279
+
+
+
+
+/* Copy the first part of user declarations. */
+
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+
+#define scanner lp_yyscanner
+#define PARM lp_yyget_extra(lp_yyscanner)
+#define YYSTYPE int
+#define YY_EXTRA_TYPE parse_parm *
+#define YY_FATAL_ERROR(msg) lex_fatal_error(PARM, lp_yyscanner, msg)
+#undef YY_INPUT
+#define YY_INPUT(buf,result,max_size) result = lp_input((void *) PARM, buf, max_size);
+#define lp_yyerror read_error
+
+#include "lpkit.h"
+#include "yacc_read.h"
+
+typedef struct parse_vars_s
+{
+ read_modeldata_func *lp_input;
+ void *userhandle;
+ char HadVar, HadVar0, HadVar1, HadVar2, HasAR_M_OP, HadConstraint, Had_lineair_sum, Had_lineair_sum0, do_add_row, HadSign, OP, Sign, isign, isign0, make_neg;
+ char state, state0;
+ char Within_int_decl; /* TRUE when we are within an char declaration */
+ char Within_bin_decl; /* TRUE when we are within an bin declaration */
+ char Within_sec_decl; /* TRUE when we are within a sec declaration */
+ char Within_sos_decl; /* TRUE when we are within a sos declaration */
+ char Within_sos_decl1;
+ char Within_free_decl; /* TRUE when we are within a free declaration */
+ short SOStype, SOStype0; /* SOS type */
+ int SOSNr;
+ int SOSweight; /* SOS weight */
+ char *Last_var, *Last_var0;
+ REAL f, f0, f1;
+} parse_vars;
+
+#ifdef FORTIFY
+# include "lp_fortify.h"
+#endif
+
+/* let's please C++ users */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined MSDOS || defined __MSDOS__ || defined WINDOWS || defined _WINDOWS || defined WIN32 || defined _WIN32
+#define YY_NO_UNISTD_H
+
+static int isatty(int f)
+{
+ return(FALSE);
+}
+
+#if !defined _STDLIB_H
+# define _STDLIB_H
+#endif
+#endif
+
+static int __WINAPI lp_input_lp_yyin(void *fpin, char *buf, int max_size)
+{
+ int result;
+
+ result = fread( (char*)buf, sizeof(char), max_size, (FILE *)fpin);
+
+ return(result);
+}
+
+static int __WINAPI lp_input(void *vpp, char *buf, int max_size)
+{
+ parse_parm *pp = (parse_parm *) vpp;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+ int result;
+
+ result = pv->lp_input(pv->userhandle, buf, max_size);
+ if (result < 0)
+ lex_fatal_error(pp, pp->scanner, "read() in flex scanner failed");
+ return(result);
+}
+
+#ifdef __cplusplus
+};
+#endif
+
+#include "lp_rlp.h"
+
+#undef lp_yylval
+
+
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef int YYSTYPE;
+# define lp_yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+
+
+/* Copy the second part of user declarations. */
+
+
+/* Line 216 of yacc.c. */
+
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 lp_yytype_uint8;
+#else
+typedef unsigned char lp_yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 lp_yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+typedef signed char lp_yytype_int8;
+#else
+typedef short int lp_yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 lp_yytype_uint16;
+#else
+typedef unsigned short int lp_yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 lp_yytype_int16;
+#else
+typedef short int lp_yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+# define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+# define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+# else
+# define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+# if ENABLE_NLS
+# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+# define YY_(msgid) dgettext ("bison-runtime", msgid)
+# endif
+# endif
+# ifndef YY_
+# define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E. */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions. */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+ int i;
+#endif
+{
+ return i;
+}
+#endif
+
+#if ! defined lp_yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols. */
+
+# ifdef YYSTACK_USE_ALLOCA
+# if YYSTACK_USE_ALLOCA
+# ifdef __GNUC__
+# define YYSTACK_ALLOC __builtin_alloca
+# elif defined __BUILTIN_VA_ARG_INCR
+# include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+# elif defined _AIX
+# define YYSTACK_ALLOC __alloca
+# elif defined _MSC_VER
+# include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+# define alloca _alloca
+# else
+# define YYSTACK_ALLOC alloca
+# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
+# endif
+# endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+ /* Pacify GCC's `empty if-body' warning. */
+# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+# ifndef YYSTACK_ALLOC_MAXIMUM
+ /* The OS might guarantee only one guard page at the bottom of the stack,
+ and a page size can be as small as 4096 bytes. So we cannot safely
+ invoke alloca (N) if N exceeds 4096. Use a slightly smaller number
+ to allow for a few compiler-allocated temporary stack slots. */
+# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+# endif
+# else
+# define YYSTACK_ALLOC YYMALLOC
+# define YYSTACK_FREE YYFREE
+# ifndef YYSTACK_ALLOC_MAXIMUM
+# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+# endif
+# if (defined __cplusplus && ! defined _STDLIB_H \
+ && ! ((defined YYMALLOC || defined malloc) \
+ && (defined YYFREE || defined free)))
+# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+# ifndef _STDLIB_H
+# define _STDLIB_H 1
+# endif
+# endif
+# ifndef YYMALLOC
+# define YYMALLOC malloc
+# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# ifndef YYFREE
+# define YYFREE free
+# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+# endif
+# endif
+# endif
+#endif /* ! defined lp_yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined lp_yyoverflow \
+ && (! defined __cplusplus \
+ || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member. */
+union lp_yyalloc
+{
+ lp_yytype_int16 lp_yyss;
+ YYSTYPE lp_yyvs;
+ };
+
+/* The size of the maximum gap between one aligned stack and the next. */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union lp_yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+ N elements. */
+# define YYSTACK_BYTES(N) \
+ ((N) * (sizeof (lp_yytype_int16) + sizeof (YYSTYPE)) \
+ + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T lp_yyi; \
+ for (lp_yyi = 0; lp_yyi < (Count); lp_yyi++) \
+ (To)[lp_yyi] = (From)[lp_yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+
+/* Relocate STACK from its old location to the new one. The
+ local variables YYSIZE and YYSTACKSIZE give the old and new number of
+ elements in the stack, and YYPTR gives the new location of the
+ stack. Advance YYPTR to a properly aligned location for the next
+ stack. */
+# define YYSTACK_RELOCATE(Stack) \
+ do \
+ { \
+ YYSIZE_T lp_yynewbytes; \
+ YYCOPY (&lp_yyptr->Stack, Stack, lp_yysize); \
+ Stack = &lp_yyptr->Stack; \
+ lp_yynewbytes = lp_yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ lp_yyptr += lp_yynewbytes / sizeof (*lp_yyptr); \
+ } \
+ while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state. */
+#define YYFINAL 3
+/* YYLAST -- Last index in YYTABLE. */
+#define YYLAST 115
+
+/* YYNTOKENS -- Number of terminals. */
+#define YYNTOKENS 25
+/* YYNNTS -- Number of nonterminals. */
+#define YYNNTS 56
+/* YYNRULES -- Number of rules. */
+#define YYNRULES 89
+/* YYNRULES -- Number of states. */
+#define YYNSTATES 123
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 279
+
+#define YYTRANSLATE(YYX) \
+ ((unsigned int) (YYX) <= YYMAXUTOK ? lp_yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+static const lp_yytype_uint8 lp_yytranslate[] =
+{
+ 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
+ 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+ YYRHS. */
+static const lp_yytype_uint8 lp_yyprhs[] =
+{
+ 0, 0, 3, 4, 5, 10, 13, 16, 18, 21,
+ 23, 25, 27, 29, 31, 34, 36, 37, 41, 42,
+ 43, 44, 53, 55, 56, 57, 63, 65, 67, 69,
+ 70, 74, 75, 78, 80, 83, 86, 88, 89, 93,
+ 95, 97, 99, 102, 104, 106, 108, 110, 112, 114,
+ 116, 118, 120, 122, 124, 127, 129, 131, 133, 135,
+ 137, 138, 142, 143, 149, 151, 154, 156, 157, 161,
+ 163, 164, 169, 171, 174, 176, 178, 180, 184, 186,
+ 188, 190, 191, 193, 195, 198, 202, 205, 208, 211
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS. */
+static const lp_yytype_int8 lp_yyrhs[] =
+{
+ 27, 0, -1, -1, -1, 28, 29, 32, 58, -1,
+ 23, 30, -1, 22, 30, -1, 30, -1, 31, 19,
+ -1, 26, -1, 46, -1, 26, -1, 33, -1, 34,
+ -1, 33, 34, -1, 36, -1, -1, 6, 35, 36,
+ -1, -1, -1, -1, 43, 37, 52, 38, 44, 39,
+ 40, 19, -1, 26, -1, -1, -1, 52, 41, 53,
+ 42, 57, -1, 26, -1, 44, -1, 46, -1, -1,
+ 7, 45, 57, -1, -1, 47, 48, -1, 49, -1,
+ 48, 49, -1, 55, 50, -1, 54, -1, -1, 56,
+ 51, 3, -1, 16, -1, 17, -1, 18, -1, 55,
+ 54, -1, 7, -1, 5, -1, 4, -1, 26, -1,
+ 14, -1, 26, -1, 15, -1, 26, -1, 26, -1,
+ 59, -1, 61, -1, 59, 61, -1, 8, -1, 9,
+ -1, 10, -1, 11, -1, 13, -1, -1, 60, 62,
+ 65, -1, -1, 64, 66, 71, 68, 19, -1, 63,
+ -1, 65, 63, -1, 26, -1, -1, 12, 67, 77,
+ -1, 26, -1, -1, 17, 5, 69, 70, -1, 26,
+ -1, 21, 5, -1, 26, -1, 72, -1, 78, -1,
+ 72, 73, 78, -1, 26, -1, 20, -1, 26, -1,
+ -1, 26, -1, 26, -1, 3, 74, -1, 6, 75,
+ 79, -1, 54, 76, -1, 77, 80, -1, 3, 74,
+ -1, 6, 75, 54, 76, -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+static const lp_yytype_uint16 lp_yyrline[] =
+{
+ 0, 116, 116, 120, 120, 145, 149, 153, 156, 170,
+ 171, 201, 202, 205, 206, 210, 212, 211, 224, 232,
+ 242, 223, 288, 298, 311, 297, 342, 355, 364, 366,
+ 365, 376, 376, 400, 401, 405, 444, 452, 451, 470,
+ 470, 470, 473, 475, 489, 489, 492, 500, 510, 517,
+ 526, 547, 548, 551, 552, 555, 555, 555, 555, 555,
+ 560, 559, 570, 570, 598, 599, 602, 604, 603, 614,
+ 626, 624, 643, 650, 660, 661, 664, 665, 670, 671,
+ 674, 703, 724, 749, 770, 772, 777, 779, 784, 786
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+static const char *const lp_yytname[] =
+{
+ "$end", "error", "$undefined", "VAR", "CONS", "INTCONS",
+ "VARIABLECOLON", "INF", "SEC_INT", "SEC_BIN", "SEC_SEC", "SEC_SOS",
+ "SOSDESCR", "SEC_FREE", "TOK_SIGN", "AR_M_OP", "RE_OPEQ", "RE_OPLE",
+ "RE_OPGE", "END_C", "COMMA", "COLON", "MINIMISE", "MAXIMISE",
+ "UNDEFINED", "$accept", "EMPTY", "inputfile", "@1", "objective_function",
+ "real_of", "lineair_sum", "constraints", "x_constraints", "constraint",
+ "@2", "real_constraint", "@3", "@4", "@5", "optionalrange", "@6", "@7",
+ "x_lineair_sum2", "x_lineair_sum3", "@8", "x_lineair_sum", "@9",
+ "x_lineair_sum1", "x_lineair_term", "x_lineair_term1", "@10", "RE_OP",
+ "cons_term", "REALCONS", "x_SIGN", "optional_AR_M_OP", "RHS_STORE",
+ "int_bin_sec_sos_free_declarations", "real_int_bin_sec_sos_free_decls",
+ "SEC_INT_BIN_SEC_SOS_FREE", "int_bin_sec_sos_free_declaration", "@11",
+ "xx_int_bin_sec_sos_free_declaration", "@12",
+ "x_int_bin_sec_sos_free_declaration", "optionalsos", "@13",
+ "optionalsostype", "@14", "optionalSOSweight", "vars", "x_vars",
+ "optionalcomma", "variable", "variablecolon", "sosweight", "sosdescr",
+ "onevarwithoptionalweight", "INTCONSorVARIABLE",
+ "x_onevarwithoptionalweight", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+ token YYLEX-NUM. */
+static const lp_yytype_uint16 lp_yytoknum[] =
+{
+ 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+ 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+ 275, 276, 277, 278, 279
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const lp_yytype_uint8 lp_yyr1[] =
+{
+ 0, 25, 26, 28, 27, 29, 29, 29, 30, 31,
+ 31, 32, 32, 33, 33, 34, 35, 34, 37, 38,
+ 39, 36, 40, 41, 42, 40, 43, 43, 44, 45,
+ 44, 47, 46, 48, 48, 49, 50, 51, 50, 52,
+ 52, 52, 53, 53, 54, 54, 55, 55, 56, 56,
+ 57, 58, 58, 59, 59, 60, 60, 60, 60, 60,
+ 62, 61, 64, 63, 65, 65, 66, 67, 66, 68,
+ 69, 68, 70, 70, 71, 71, 72, 72, 73, 73,
+ 74, 75, 76, 77, 78, 78, 79, 79, 80, 80
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const lp_yytype_uint8 lp_yyr2[] =
+{
+ 0, 2, 0, 0, 4, 2, 2, 1, 2, 1,
+ 1, 1, 1, 1, 2, 1, 0, 3, 0, 0,
+ 0, 8, 1, 0, 0, 5, 1, 1, 1, 0,
+ 3, 0, 2, 1, 2, 2, 1, 0, 3, 1,
+ 1, 1, 2, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 2, 1, 1, 1, 1, 1,
+ 0, 3, 0, 5, 1, 2, 1, 0, 3, 1,
+ 0, 4, 1, 2, 1, 1, 1, 3, 1, 1,
+ 1, 0, 1, 1, 2, 3, 2, 2, 2, 4
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+ STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+ means the default is an error. */
+static const lp_yytype_uint8 lp_yydefact[] =
+{
+ 3, 0, 31, 1, 31, 31, 9, 2, 7, 0,
+ 10, 2, 6, 5, 16, 29, 11, 2, 12, 13,
+ 15, 18, 27, 28, 8, 47, 46, 2, 33, 2,
+ 31, 2, 55, 56, 57, 58, 59, 51, 4, 52,
+ 60, 53, 26, 14, 0, 34, 45, 44, 49, 48,
+ 35, 36, 37, 17, 50, 30, 54, 62, 39, 40,
+ 41, 19, 0, 64, 2, 61, 31, 38, 67, 66,
+ 2, 65, 20, 2, 2, 81, 74, 2, 2, 76,
+ 2, 83, 68, 80, 84, 2, 0, 69, 0, 79,
+ 78, 0, 22, 0, 23, 2, 0, 85, 70, 63,
+ 77, 21, 2, 82, 86, 2, 81, 87, 2, 43,
+ 24, 0, 88, 0, 0, 72, 71, 2, 42, 2,
+ 73, 25, 89
+};
+
+/* YYDEFGOTO[NTERM-NUM]. */
+static const lp_yytype_int8 lp_yydefgoto[] =
+{
+ -1, 6, 1, 2, 7, 8, 9, 17, 18, 19,
+ 30, 20, 44, 66, 80, 93, 102, 117, 21, 22,
+ 31, 23, 11, 27, 28, 50, 62, 61, 110, 51,
+ 29, 52, 55, 38, 39, 40, 41, 57, 63, 64,
+ 65, 70, 73, 88, 108, 116, 77, 78, 91, 84,
+ 85, 104, 82, 79, 97, 107
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+#define YYPACT_NINF -85
+static const lp_yytype_int8 lp_yypact[] =
+{
+ -85, 13, 46, -85, 2, 2, -85, 32, -85, 7,
+ -85, 26, -85, -85, -85, -85, 64, 40, 27, -85,
+ -85, -85, -85, -85, -85, -85, -85, 42, -85, 3,
+ -2, -85, -85, -85, -85, -85, -85, -85, -85, 40,
+ -85, -85, -85, -85, 67, -85, -85, -85, -85, -85,
+ -85, -85, -85, -85, -85, -85, -85, -85, -85, -85,
+ -85, -85, 59, -85, 52, 0, 84, -85, -85, -85,
+ 22, -85, -85, -85, -85, -85, -85, 60, 35, -85,
+ 67, -85, -85, -85, -85, 82, 87, -85, 74, -85,
+ -85, 22, -85, 75, -85, -85, 73, -85, -85, -85,
+ -85, -85, -5, -85, -85, -85, -85, -85, 76, -85,
+ -85, 82, -85, 82, 91, -85, -85, -85, -85, -85,
+ -85, -85, -85
+};
+
+/* YYPGOTO[NTERM-NUM]. */
+static const lp_yytype_int8 lp_yypgoto[] =
+{
+ -85, -7, -85, -85, -85, 85, -85, -85, -85, 81,
+ -85, 72, -85, -85, -85, -85, -85, -85, -85, 34,
+ -85, 70, -85, -85, 77, -85, -85, 23, -85, -84,
+ 4, -85, -12, -85, -85, -85, 68, -85, 43, -85,
+ -85, -85, -85, -85, -85, -85, -85, -85, -85, 6,
+ 8, -10, 28, 24, -85, -85
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If zero, do what YYDEFACT says.
+ If YYTABLE_NINF, syntax error. */
+#define YYTABLE_NINF -76
+static const lp_yytype_int8 lp_yytable[] =
+{
+ 16, 95, 109, -62, 26, 15, -62, 46, 47, 25,
+ 37, 42, -62, 3, -2, -2, -2, -62, 48, -62,
+ 26, -2, 49, 42, 54, 74, 24, 118, 75, 119,
+ -31, -31, -31, 14, 15, -31, -31, -31, 14, 15,
+ 25, -31, -31, -2, -2, -2, -31, -31, 32, 33,
+ 34, 35, -75, 36, -75, 89, 25, 69, -32, -32,
+ -32, -32, 67, 76, 68, -2, 81, 83, 4, 5,
+ 87, 90, 10, 92, 10, 10, 105, 86, 81, 106,
+ -26, -26, -26, 58, 59, 60, 46, 47, 103, 12,
+ 13, 15, 98, 99, 101, 26, 120, 114, 83, 43,
+ 72, 115, 53, 94, 45, 121, 111, 56, 71, 122,
+ 54, 112, 103, 96, 113, 100
+};
+
+static const lp_yytype_uint8 lp_yycheck[] =
+{
+ 7, 85, 7, 3, 11, 7, 6, 4, 5, 14,
+ 17, 18, 12, 0, 16, 17, 18, 17, 15, 19,
+ 27, 19, 29, 30, 31, 3, 19, 111, 6, 113,
+ 3, 4, 5, 6, 7, 3, 4, 5, 6, 7,
+ 14, 14, 15, 16, 17, 18, 14, 15, 8, 9,
+ 10, 11, 17, 13, 19, 20, 14, 64, 16, 17,
+ 18, 19, 3, 70, 12, 19, 73, 74, 22, 23,
+ 77, 78, 2, 80, 4, 5, 3, 17, 85, 6,
+ 16, 17, 18, 16, 17, 18, 4, 5, 95, 4,
+ 5, 7, 5, 19, 19, 102, 5, 21, 105, 18,
+ 66, 108, 30, 80, 27, 117, 102, 39, 65, 119,
+ 117, 105, 119, 85, 106, 91
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const lp_yytype_uint8 lp_yystos[] =
+{
+ 0, 27, 28, 0, 22, 23, 26, 29, 30, 31,
+ 46, 47, 30, 30, 6, 7, 26, 32, 33, 34,
+ 36, 43, 44, 46, 19, 14, 26, 48, 49, 55,
+ 35, 45, 8, 9, 10, 11, 13, 26, 58, 59,
+ 60, 61, 26, 34, 37, 49, 4, 5, 15, 26,
+ 50, 54, 56, 36, 26, 57, 61, 62, 16, 17,
+ 18, 52, 51, 63, 64, 65, 38, 3, 12, 26,
+ 66, 63, 44, 67, 3, 6, 26, 71, 72, 78,
+ 39, 26, 77, 26, 74, 75, 17, 26, 68, 20,
+ 26, 73, 26, 40, 52, 54, 77, 79, 5, 19,
+ 78, 19, 41, 26, 76, 3, 6, 80, 69, 7,
+ 53, 55, 74, 75, 21, 26, 70, 42, 54, 54,
+ 5, 57, 76
+};
+
+#define lp_yyerrok (lp_yyerrstatus = 0)
+#define lp_yyclearin (lp_yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto lp_yyacceptlab
+#define YYABORT goto lp_yyabortlab
+#define YYERROR goto lp_yyerrorlab
+
+
+/* Like YYERROR except do call lp_yyerror. This remains here temporarily
+ to ease the transition to the new meaning of YYERROR, for GCC.
+ Once GCC version 2 has supplanted version 1, this can go. */
+
+#define YYFAIL goto lp_yyerrlab
+
+#define YYRECOVERING() (!!lp_yyerrstatus)
+
+#define YYBACKUP(Token, Value) \
+do \
+ if (lp_yychar == YYEMPTY && lp_yylen == 1) \
+ { \
+ lp_yychar = (Token); \
+ lp_yylval = (Value); \
+ lp_yytoken = YYTRANSLATE (lp_yychar); \
+ YYPOPSTACK (1); \
+ goto lp_yybackup; \
+ } \
+ else \
+ { \
+ lp_yyerror (parm, scanner, YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+while (YYID (0))
+
+
+#define YYTERROR 1
+#define YYERRCODE 256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+ If N is 0, then set CURRENT to the empty location which ends
+ the previous symbol: RHS[0] (always defined). */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
+ if (YYID (N)) \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
+ while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+ This macro was not mandated originally: define only if we know
+ we won't break user code: when these are the locations we know. */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
+# else
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `lp_yylex' with the right arguments. */
+
+#ifdef YYLEX_PARAM
+# define YYLEX lp_yylex (&lp_yylval, YYLEX_PARAM)
+#else
+# define YYLEX lp_yylex (&lp_yylval, scanner)
+#endif
+
+/* Enable debugging if requested. */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+# define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args) \
+do { \
+ if (lp_yydebug) \
+ YYFPRINTF Args; \
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (lp_yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ lp_yy_symbol_print (stderr, \
+ Type, Value, parm, scanner); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+lp_yy_symbol_value_print (FILE *lp_yyoutput, int lp_yytype, YYSTYPE const * const lp_yyvaluep, parse_parm *parm, void *scanner)
+#else
+static void
+lp_yy_symbol_value_print (lp_yyoutput, lp_yytype, lp_yyvaluep, parm, scanner)
+ FILE *lp_yyoutput;
+ int lp_yytype;
+ YYSTYPE const * const lp_yyvaluep;
+ parse_parm *parm;
+ void *scanner;
+#endif
+{
+ if (!lp_yyvaluep)
+ return;
+ YYUSE (parm);
+ YYUSE (scanner);
+# ifdef YYPRINT
+ if (lp_yytype < YYNTOKENS)
+ YYPRINT (lp_yyoutput, lp_yytoknum[lp_yytype], *lp_yyvaluep);
+# else
+ YYUSE (lp_yyoutput);
+# endif
+ switch (lp_yytype)
+ {
+ default:
+ break;
+ }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT. |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+lp_yy_symbol_print (FILE *lp_yyoutput, int lp_yytype, YYSTYPE const * const lp_yyvaluep, parse_parm *parm, void *scanner)
+#else
+static void
+lp_yy_symbol_print (lp_yyoutput, lp_yytype, lp_yyvaluep, parm, scanner)
+ FILE *lp_yyoutput;
+ int lp_yytype;
+ YYSTYPE const * const lp_yyvaluep;
+ parse_parm *parm;
+ void *scanner;
+#endif
+{
+ if (lp_yytype < YYNTOKENS)
+ YYFPRINTF (lp_yyoutput, "token %s (", lp_yytname[lp_yytype]);
+ else
+ YYFPRINTF (lp_yyoutput, "nterm %s (", lp_yytname[lp_yytype]);
+
+ lp_yy_symbol_value_print (lp_yyoutput, lp_yytype, lp_yyvaluep, parm, scanner);
+ YYFPRINTF (lp_yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| lp_yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included). |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+lp_yy_stack_print (lp_yytype_int16 *bottom, lp_yytype_int16 *top)
+#else
+static void
+lp_yy_stack_print (bottom, top)
+ lp_yytype_int16 *bottom;
+ lp_yytype_int16 *top;
+#endif
+{
+ YYFPRINTF (stderr, "Stack now");
+ for (; bottom <= top; ++bottom)
+ YYFPRINTF (stderr, " %d", *bottom);
+ YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (lp_yydebug) \
+ lp_yy_stack_print ((Bottom), (Top)); \
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced. |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+lp_yy_reduce_print (YYSTYPE *lp_yyvsp, int lp_yyrule, parse_parm *parm, void *scanner)
+#else
+static void
+lp_yy_reduce_print (lp_yyvsp, lp_yyrule, parm, scanner)
+ YYSTYPE *lp_yyvsp;
+ int lp_yyrule;
+ parse_parm *parm;
+ void *scanner;
+#endif
+{
+ int lp_yynrhs = lp_yyr2[lp_yyrule];
+ int lp_yyi;
+ unsigned long int lp_yylno = lp_yyrline[lp_yyrule];
+ YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+ lp_yyrule - 1, lp_yylno);
+ /* The symbols being reduced. */
+ for (lp_yyi = 0; lp_yyi < lp_yynrhs; lp_yyi++)
+ {
+ fprintf (stderr, " $%d = ", lp_yyi + 1);
+ lp_yy_symbol_print (stderr, lp_yyrhs[lp_yyprhs[lp_yyrule] + lp_yyi],
+ &(lp_yyvsp[(lp_yyi + 1) - (lp_yynrhs)])
+ , parm, scanner);
+ fprintf (stderr, "\n");
+ }
+}
+
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (lp_yydebug) \
+ lp_yy_reduce_print (lp_yyvsp, Rule, parm, scanner); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace. It is left uninitialized so that
+ multiple parsers can coexist. */
+int lp_yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks. */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+ if the built-in stack extension method is used).
+
+ Do not make this value too large; the results are undefined if
+ YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+ evaluated with infinite-precision integer arithmetic. */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef lp_yystrlen
+# if defined __GLIBC__ && defined _STRING_H
+# define lp_yystrlen strlen
+# else
+/* Return the length of YYSTR. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+lp_yystrlen (const char *lp_yystr)
+#else
+static YYSIZE_T
+lp_yystrlen (lp_yystr)
+ const char *lp_yystr;
+#endif
+{
+ YYSIZE_T lp_yylen;
+ for (lp_yylen = 0; lp_yystr[lp_yylen]; lp_yylen++)
+ continue;
+ return lp_yylen;
+}
+# endif
+# endif
+
+# ifndef lp_yystpcpy
+# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+# define lp_yystpcpy stpcpy
+# else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+ YYDEST. */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static char *
+lp_yystpcpy (char *lp_yydest, const char *lp_yysrc)
+#else
+static char *
+lp_yystpcpy (lp_yydest, lp_yysrc)
+ char *lp_yydest;
+ const char *lp_yysrc;
+#endif
+{
+ char *lp_yyd = lp_yydest;
+ const char *lp_yys = lp_yysrc;
+
+ while ((*lp_yyd++ = *lp_yys++) != '\0')
+ continue;
+
+ return lp_yyd - 1;
+}
+# endif
+# endif
+
+# ifndef lp_yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+ quotes and backslashes, so that it's suitable for lp_yyerror. The
+ heuristic is that double-quoting is unnecessary unless the string
+ contains an apostrophe, a comma, or backslash (other than
+ backslash-backslash). YYSTR is taken from lp_yytname. If YYRES is
+ null, do not copy; instead, return the length of what the result
+ would have been. */
+static YYSIZE_T
+lp_yytnamerr (char *lp_yyres, const char *lp_yystr)
+{
+ if (*lp_yystr == '"')
+ {
+ YYSIZE_T lp_yyn = 0;
+ char const *lp_yyp = lp_yystr;
+
+ for (;;)
+ switch (*++lp_yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++lp_yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (lp_yyres)
+ lp_yyres[lp_yyn] = *lp_yyp;
+ lp_yyn++;
+ break;
+
+ case '"':
+ if (lp_yyres)
+ lp_yyres[lp_yyn] = '\0';
+ return lp_yyn;
+ }
+ do_not_strip_quotes: ;
+ }
+
+ if (! lp_yyres)
+ return lp_yystrlen (lp_yystr);
+
+ return lp_yystpcpy (lp_yyres, lp_yystr) - lp_yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+ YYCHAR while in state YYSTATE. Return the number of bytes copied,
+ including the terminating null byte. If YYRESULT is null, do not
+ copy anything; just return the number of bytes that would be
+ copied. As a special case, return 0 if an ordinary "syntax error"
+ message will do. Return YYSIZE_MAXIMUM if overflow occurs during
+ size calculation. */
+static YYSIZE_T
+lp_yysyntax_error (char *lp_yyresult, int lp_yystate, int lp_yychar)
+{
+ int lp_yyn = lp_yypact[lp_yystate];
+
+ if (! (YYPACT_NINF < lp_yyn && lp_yyn <= YYLAST))
+ return 0;
+ else
+ {
+ int lp_yytype = YYTRANSLATE (lp_yychar);
+ YYSIZE_T lp_yysize0 = lp_yytnamerr (0, lp_yytname[lp_yytype]);
+ YYSIZE_T lp_yysize = lp_yysize0;
+ YYSIZE_T lp_yysize1;
+ int lp_yysize_overflow = 0;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ char const *lp_yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ int lp_yyx;
+
+# if 0
+ /* This is so xgettext sees the translatable formats that are
+ constructed on the fly. */
+ YY_("syntax error, unexpected %s");
+ YY_("syntax error, unexpected %s, expecting %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+ YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+ char *lp_yyfmt;
+ char const *lp_yyf;
+ static char const lp_yyunexpected[] = "syntax error, unexpected %s";
+ static char const lp_yyexpecting[] = ", expecting %s";
+ static char const lp_yyor[] = " or %s";
+ char lp_yyformat[sizeof lp_yyunexpected
+ + sizeof lp_yyexpecting - 1
+ + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+ * (sizeof lp_yyor - 1))];
+ char const *lp_yyprefix = lp_yyexpecting;
+
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. */
+ int lp_yyxbegin = lp_yyn < 0 ? -lp_yyn : 0;
+
+ /* Stay within bounds of both lp_yycheck and lp_yytname. */
+ int lp_yychecklim = YYLAST - lp_yyn + 1;
+ int lp_yyxend = lp_yychecklim < YYNTOKENS ? lp_yychecklim : YYNTOKENS;
+ int lp_yycount = 1;
+
+ lp_yyarg[0] = lp_yytname[lp_yytype];
+ lp_yyfmt = lp_yystpcpy (lp_yyformat, lp_yyunexpected);
+
+ for (lp_yyx = lp_yyxbegin; lp_yyx < lp_yyxend; ++lp_yyx)
+ if (lp_yycheck[lp_yyx + lp_yyn] == lp_yyx && lp_yyx != YYTERROR)
+ {
+ if (lp_yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ lp_yycount = 1;
+ lp_yysize = lp_yysize0;
+ lp_yyformat[sizeof lp_yyunexpected - 1] = '\0';
+ break;
+ }
+ lp_yyarg[lp_yycount++] = lp_yytname[lp_yyx];
+ lp_yysize1 = lp_yysize + lp_yytnamerr (0, lp_yytname[lp_yyx]);
+ lp_yysize_overflow |= (lp_yysize1 < lp_yysize);
+ lp_yysize = lp_yysize1;
+ lp_yyfmt = lp_yystpcpy (lp_yyfmt, lp_yyprefix);
+ lp_yyprefix = lp_yyor;
+ }
+
+ lp_yyf = YY_(lp_yyformat);
+ lp_yysize1 = lp_yysize + lp_yystrlen (lp_yyf);
+ lp_yysize_overflow |= (lp_yysize1 < lp_yysize);
+ lp_yysize = lp_yysize1;
+
+ if (lp_yysize_overflow)
+ return YYSIZE_MAXIMUM;
+
+ if (lp_yyresult)
+ {
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ char *lp_yyp = lp_yyresult;
+ int lp_yyi = 0;
+ while ((*lp_yyp = *lp_yyf) != '\0')
+ {
+ if (*lp_yyp == '%' && lp_yyf[1] == 's' && lp_yyi < lp_yycount)
+ {
+ lp_yyp += lp_yytnamerr (lp_yyp, lp_yyarg[lp_yyi++]);
+ lp_yyf += 2;
+ }
+ else
+ {
+ lp_yyp++;
+ lp_yyf++;
+ }
+ }
+ }
+ return lp_yysize;
+ }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol. |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+static void
+lp_yydestruct (const char *lp_yymsg, int lp_yytype, YYSTYPE *lp_yyvaluep, parse_parm *parm, void *scanner)
+#else
+static void
+lp_yydestruct (lp_yymsg, lp_yytype, lp_yyvaluep, parm, scanner)
+ const char *lp_yymsg;
+ int lp_yytype;
+ YYSTYPE *lp_yyvaluep;
+ parse_parm *parm;
+ void *scanner;
+#endif
+{
+ YYUSE (lp_yyvaluep);
+ YYUSE (parm);
+ YYUSE (scanner);
+
+ if (!lp_yymsg)
+ lp_yymsg = "Deleting";
+ YY_SYMBOL_PRINT (lp_yymsg, lp_yytype, lp_yyvaluep, lp_yylocationp);
+
+ switch (lp_yytype)
+ {
+
+ default:
+ break;
+ }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes. */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int lp_yyparse (void *YYPARSE_PARAM);
+#else
+int lp_yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int lp_yyparse (parse_parm *parm, void *scanner);
+#else
+int lp_yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+
+
+
+/*----------.
+| lp_yyparse. |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+int
+lp_yyparse (void *YYPARSE_PARAM)
+#else
+int
+lp_yyparse (YYPARSE_PARAM)
+ void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
+int
+lp_yyparse (parse_parm *parm, void *scanner)
+#else
+int
+lp_yyparse (parm, scanner)
+ parse_parm *parm;
+ void *scanner;
+#endif
+#endif
+{
+ /* The look-ahead symbol. */
+int lp_yychar;
+
+/* The semantic value of the look-ahead symbol. */
+YYSTYPE lp_yylval;
+
+/* Number of syntax errors so far. */
+int lp_yynerrs;
+
+ int lp_yystate;
+ int lp_yyn;
+ int lp_yyresult;
+ /* Number of tokens to shift before error messages enabled. */
+ int lp_yyerrstatus;
+ /* Look-ahead token as an internal (translated) token number. */
+ int lp_yytoken = 0;
+#if YYERROR_VERBOSE
+ /* Buffer for error messages, and its allocated size. */
+ char lp_yymsgbuf[128];
+ char *lp_yymsg = lp_yymsgbuf;
+ YYSIZE_T lp_yymsg_alloc = sizeof lp_yymsgbuf;
+#endif
+
+ /* Three stacks and their tools:
+ `lp_yyss': related to states,
+ `lp_yyvs': related to semantic values,
+ `lp_yyls': related to locations.
+
+ Refer to the stacks thru separate pointers, to allow lp_yyoverflow
+ to reallocate them elsewhere. */
+
+ /* The state stack. */
+ lp_yytype_int16 lp_yyssa[YYINITDEPTH];
+ lp_yytype_int16 *lp_yyss = lp_yyssa;
+ lp_yytype_int16 *lp_yyssp;
+
+ /* The semantic value stack. */
+ YYSTYPE lp_yyvsa[YYINITDEPTH];
+ YYSTYPE *lp_yyvs = lp_yyvsa;
+ YYSTYPE *lp_yyvsp;
+
+
+
+#define YYPOPSTACK(N) (lp_yyvsp -= (N), lp_yyssp -= (N))
+
+ YYSIZE_T lp_yystacksize = YYINITDEPTH;
+
+ /* The variables used to return semantic value and location from the
+ action routines. */
+ YYSTYPE lp_yyval;
+
+
+ /* The number of symbols on the RHS of the reduced rule.
+ Keep to zero when no symbol should be popped. */
+ int lp_yylen = 0;
+
+ YYDPRINTF ((stderr, "Starting parse\n"));
+
+ lp_yystate = 0;
+ lp_yyerrstatus = 0;
+ lp_yynerrs = 0;
+ lp_yychar = YYEMPTY; /* Cause a token to be read. */
+
+ /* Initialize stack pointers.
+ Waste one element of value and location stack
+ so that they stay on the same level as the state stack.
+ The wasted elements are never initialized. */
+
+ lp_yyssp = lp_yyss;
+ lp_yyvsp = lp_yyvs;
+
+ goto lp_yysetstate;
+
+/*------------------------------------------------------------.
+| lp_yynewstate -- Push a new state, which is found in lp_yystate. |
+`------------------------------------------------------------*/
+ lp_yynewstate:
+ /* In all cases, when you get here, the value and location stacks
+ have just been pushed. So pushing a state here evens the stacks. */
+ lp_yyssp++;
+
+ lp_yysetstate:
+ *lp_yyssp = lp_yystate;
+
+ if (lp_yyss + lp_yystacksize - 1 <= lp_yyssp)
+ {
+ /* Get the current used size of the three stacks, in elements. */
+ YYSIZE_T lp_yysize = lp_yyssp - lp_yyss + 1;
+
+#ifdef lp_yyoverflow
+ {
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *lp_yyvs1 = lp_yyvs;
+ lp_yytype_int16 *lp_yyss1 = lp_yyss;
+
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if lp_yyoverflow is a macro. */
+ lp_yyoverflow (YY_("memory exhausted"),
+ &lp_yyss1, lp_yysize * sizeof (*lp_yyssp),
+ &lp_yyvs1, lp_yysize * sizeof (*lp_yyvsp),
+
+ &lp_yystacksize);
+
+ lp_yyss = lp_yyss1;
+ lp_yyvs = lp_yyvs1;
+ }
+#else /* no lp_yyoverflow */
+# ifndef YYSTACK_RELOCATE
+ goto lp_yyexhaustedlab;
+# else
+ /* Extend the stack our own way. */
+ if (YYMAXDEPTH <= lp_yystacksize)
+ goto lp_yyexhaustedlab;
+ lp_yystacksize *= 2;
+ if (YYMAXDEPTH < lp_yystacksize)
+ lp_yystacksize = YYMAXDEPTH;
+
+ {
+ lp_yytype_int16 *lp_yyss1 = lp_yyss;
+ union lp_yyalloc *lp_yyptr =
+ (union lp_yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (lp_yystacksize));
+ if (! lp_yyptr)
+ goto lp_yyexhaustedlab;
+ YYSTACK_RELOCATE (lp_yyss);
+ YYSTACK_RELOCATE (lp_yyvs);
+
+# undef YYSTACK_RELOCATE
+ if (lp_yyss1 != lp_yyssa)
+ YYSTACK_FREE (lp_yyss1);
+ }
+# endif
+#endif /* no lp_yyoverflow */
+
+ lp_yyssp = lp_yyss + lp_yysize - 1;
+ lp_yyvsp = lp_yyvs + lp_yysize - 1;
+
+
+ YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+ (unsigned long int) lp_yystacksize));
+
+ if (lp_yyss + lp_yystacksize - 1 <= lp_yyssp)
+ YYABORT;
+ }
+
+ YYDPRINTF ((stderr, "Entering state %d\n", lp_yystate));
+
+ goto lp_yybackup;
+
+/*-----------.
+| lp_yybackup. |
+`-----------*/
+lp_yybackup:
+
+ /* Do appropriate processing given the current state. Read a
+ look-ahead token if we need one and don't already have one. */
+
+ /* First try to decide what to do without reference to look-ahead token. */
+ lp_yyn = lp_yypact[lp_yystate];
+ if (lp_yyn == YYPACT_NINF)
+ goto lp_yydefault;
+
+ /* Not known => get a look-ahead token if don't already have one. */
+
+ /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */
+ if (lp_yychar == YYEMPTY)
+ {
+ YYDPRINTF ((stderr, "Reading a token: "));
+ lp_yychar = YYLEX;
+ }
+
+ if (lp_yychar <= YYEOF)
+ {
+ lp_yychar = lp_yytoken = YYEOF;
+ YYDPRINTF ((stderr, "Now at end of input.\n"));
+ }
+ else
+ {
+ lp_yytoken = YYTRANSLATE (lp_yychar);
+ YY_SYMBOL_PRINT ("Next token is", lp_yytoken, &lp_yylval, &lp_yylloc);
+ }
+
+ /* If the proper action on seeing token YYTOKEN is to reduce or to
+ detect an error, take that action. */
+ lp_yyn += lp_yytoken;
+ if (lp_yyn < 0 || YYLAST < lp_yyn || lp_yycheck[lp_yyn] != lp_yytoken)
+ goto lp_yydefault;
+ lp_yyn = lp_yytable[lp_yyn];
+ if (lp_yyn <= 0)
+ {
+ if (lp_yyn == 0 || lp_yyn == YYTABLE_NINF)
+ goto lp_yyerrlab;
+ lp_yyn = -lp_yyn;
+ goto lp_yyreduce;
+ }
+
+ if (lp_yyn == YYFINAL)
+ YYACCEPT;
+
+ /* Count tokens shifted since error; after three, turn off error
+ status. */
+ if (lp_yyerrstatus)
+ lp_yyerrstatus--;
+
+ /* Shift the look-ahead token. */
+ YY_SYMBOL_PRINT ("Shifting", lp_yytoken, &lp_yylval, &lp_yylloc);
+
+ /* Discard the shifted token unless it is eof. */
+ if (lp_yychar != YYEOF)
+ lp_yychar = YYEMPTY;
+
+ lp_yystate = lp_yyn;
+ *++lp_yyvsp = lp_yylval;
+
+ goto lp_yynewstate;
+
+
+/*-----------------------------------------------------------.
+| lp_yydefault -- do the default action for the current state. |
+`-----------------------------------------------------------*/
+lp_yydefault:
+ lp_yyn = lp_yydefact[lp_yystate];
+ if (lp_yyn == 0)
+ goto lp_yyerrlab;
+ goto lp_yyreduce;
+
+
+/*-----------------------------.
+| lp_yyreduce -- Do a reduction. |
+`-----------------------------*/
+lp_yyreduce:
+ /* lp_yyn is the number of a rule to reduce with. */
+ lp_yylen = lp_yyr2[lp_yyn];
+
+ /* If YYLEN is nonzero, implement the default value of the action:
+ `$$ = $1'.
+
+ Otherwise, the following line sets YYVAL to garbage.
+ This behavior is undocumented and Bison
+ users should not rely upon it. Assigning to YYVAL
+ unconditionally makes the parser a bit smaller, and it avoids a
+ GCC warning that YYVAL may be used uninitialized. */
+ lp_yyval = lp_yyvsp[1-lp_yylen];
+
+
+ YY_REDUCE_PRINT (lp_yyn);
+ switch (lp_yyn)
+ {
+ case 3:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->isign = 0;
+ pv->make_neg = 0;
+ pv->Sign = 0;
+ pv->HadConstraint = FALSE;
+ pv->HadVar = pv->HadVar0 = FALSE;
+}
+ break;
+
+ case 5:
+
+ {
+ set_obj_dir(PARM, TRUE);
+}
+ break;
+
+ case 6:
+
+ {
+ set_obj_dir(PARM, FALSE);
+}
+ break;
+
+ case 8:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ add_row(pp);
+ pv->HadConstraint = FALSE;
+ pv->HadVar = pv->HadVar0 = FALSE;
+ pv->isign = 0;
+ pv->make_neg = 0;
+}
+ break;
+
+ case 16:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if(!add_constraint_name(pp, pv->Last_var))
+ YYABORT;
+ pv->HadConstraint = TRUE;
+}
+ break;
+
+ case 18:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->HadVar1 = pv->HadVar0;
+ pv->HadVar0 = FALSE;
+}
+ break;
+
+ case 19:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if(!store_re_op(pp, pv->OP, (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum))
+ YYABORT;
+ pv->make_neg = 1;
+ pv->f1 = 0;
+}
+ break;
+
+ case 20:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->Had_lineair_sum0 = pv->Had_lineair_sum;
+ pv->Had_lineair_sum = TRUE;
+ pv->HadVar2 = pv->HadVar0;
+ pv->HadVar0 = FALSE;
+ pv->do_add_row = FALSE;
+ if(pv->HadConstraint && !pv->HadVar ) {
+ /* it is a range */
+ /* already handled */
+ }
+ else if(!pv->HadConstraint && pv->HadVar) {
+ /* it is a bound */
+
+ if(!store_bounds(pp, TRUE))
+ YYABORT;
+ }
+ else {
+ /* it is a row restriction */
+ if(pv->HadConstraint && pv->HadVar)
+ store_re_op(pp, '\0', (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum); /* makes sure that data stored in temporary buffers is treated correctly */
+ pv->do_add_row = TRUE;
+ }
+}
+ break;
+
+ case 21:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if((!pv->HadVar) && (!pv->HadConstraint)) {
+ lp_yyerror(pp, pp->scanner, "parse error");
+ YYABORT;
+ }
+ if(pv->do_add_row)
+ add_row(pp);
+ pv->HadConstraint = FALSE;
+ pv->HadVar = pv->HadVar0 = FALSE;
+ pv->isign = 0;
+ pv->make_neg = 0;
+ null_tmp_store(pp, TRUE);
+}
+ break;
+
+ case 22:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if((!pv->HadVar1) && (pv->Had_lineair_sum0))
+ if(!negate_constraint(pp))
+ YYABORT;
+}
+ break;
+
+ case 23:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->make_neg = 0;
+ pv->isign = 0;
+ if(pv->HadConstraint)
+ pv->HadVar = pv->Had_lineair_sum = FALSE;
+ pv->HadVar0 = FALSE;
+ if(!store_re_op(pp, (char) ((pv->OP == '<') ? '>' : (pv->OP == '>') ? '<' : pv->OP), (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum))
+ YYABORT;
+}
+ break;
+
+ case 24:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->f -= pv->f1;
+}
+ break;
+
+ case 25:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if((pv->HadVar1) || (!pv->HadVar2) || (pv->HadVar0)) {
+ lp_yyerror(pp, pp->scanner, "parse error");
+ YYABORT;
+ }
+
+ if(pv->HadConstraint && !pv->HadVar ) {
+ /* it is a range */
+ /* already handled */
+ if(!negate_constraint(pp))
+ YYABORT;
+ }
+ else if(!pv->HadConstraint && pv->HadVar) {
+ /* it is a bound */
+
+ if(!store_bounds(pp, TRUE))
+ YYABORT;
+ }
+}
+ break;
+
+ case 26:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ /* to allow a range */
+ /* constraint: < max */
+ if(!pv->HadConstraint) {
+ lp_yyerror(pp, pp->scanner, "parse error");
+ YYABORT;
+ }
+ pv->Had_lineair_sum = FALSE;
+}
+ break;
+
+ case 27:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->Had_lineair_sum = TRUE;
+}
+ break;
+
+ case 29:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->isign = pv->Sign;
+}
+ break;
+
+ case 31:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->state = pv->state0 = 0;
+}
+ break;
+
+ case 32:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if (pv->state == 1) {
+ /* RHS_STORE */
+ if ( (pv->isign0 || !pv->make_neg)
+ && !(pv->isign0 && !pv->make_neg)) /* but not both! */
+ pv->f0 = -pv->f0;
+ if(pv->make_neg)
+ pv->f1 += pv->f0;
+ if(!rhs_store(pp, pv->f0, (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum))
+ YYABORT;
+ }
+}
+ break;
+
+ case 35:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ if ((pv->HadSign || pv->state == 1) && (pv->state0 == 1)) {
+ /* RHS_STORE */
+ if ( (pv->isign0 || !pv->make_neg)
+ && !(pv->isign0 && !pv->make_neg)) /* but not both! */
+ pv->f0 = -pv->f0;
+ if(pv->make_neg)
+ pv->f1 += pv->f0;
+ if(!rhs_store(pp, pv->f0, (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum))
+ YYABORT;
+ }
+ if (pv->state == 1) {
+ pv->f0 = pv->f;
+ pv->isign0 = pv->isign;
+ }
+ if (pv->state == 2) {
+ if((pv->HadSign) || (pv->state0 != 1)) {
+ pv->isign0 = pv->isign;
+ pv->f0 = 1.0;
+ }
+ if ( (pv->isign0 || pv->make_neg)
+ && !(pv->isign0 && pv->make_neg)) /* but not both! */
+ pv->f0 = -pv->f0;
+ if(!var_store(pp, pv->Last_var, pv->f0, (int) pv->HadConstraint, (int) pv->HadVar, (int) pv->Had_lineair_sum)) {
+ lp_yyerror(pp, pp->scanner, "var_store failed");
+ YYABORT;
+ }
+ pv->HadConstraint |= pv->HadVar;
+ pv->HadVar = pv->HadVar0 = TRUE;
+ }
+ pv->state0 = pv->state;
+}
+ break;
+
+ case 36:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_vars *) pp->parse_vars;
+
+ pv->state = 1;
+}
+ break;
+
+ case 37:
+
+ {
+ parse_parm *pp = PARM;
+ parse_vars *pv = (parse_va...
[truncated message content] |
|
From: <Ste...@us...> - 2009-07-01 20:50:23
|
Revision: 139
http://pntool.svn.sourceforge.net/pntool/?rev=139&view=rev
Author: StephenCamp
Date: 2009-07-01 19:39:53 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Fixed bug in ipsolve.
Cleaned up comments in almost all spnbox source files.
Rewrote test programs for all spnbox routines to use the StructuredIO and test.c test frameworks.
Added/altered some test scripts.
Cleaned up makefiles for test programs.
Modified Paths:
--------------
spnbox/actn.c
spnbox/chkcons.c
spnbox/ilpadm.c
spnbox/ipsolve.c
spnbox/isadm.c
spnbox/nltrans.c
spnbox/pn2acpn.c
spnbox/pn2eacpn.c
spnbox/reduce.c
spnbox/spnbox.h
spnbox/supervis.c
spnbox/tests/test-actn.c
spnbox/tests/test-actn.mak
spnbox/tests/test-ilpadm.mak
spnbox/tests/test-ipsolve.mak
spnbox/tests/test-isadm.c
spnbox/tests/test-isadm.mak
spnbox/tests/test-isadm.txt
spnbox/tests/test-linenf.c
spnbox/tests/test-linenf.mak
spnbox/tests/test-msplit.c
spnbox/tests/test-msplit.mak
spnbox/tests/test-nltrans.c
spnbox/tests/test-nltrans.mak
spnbox/tests/test-pn2acpn.c
spnbox/tests/test-pn2acpn.mak
spnbox/tests/test-pn2eacpn.c
spnbox/tests/test-pn2eacpn.mak
spnbox/tests/test-reduce.c
spnbox/tests/test-reduce.mak
spnbox/tests/test.c
spnbox/tests/test.h
Added Paths:
-----------
spnbox/tests/test-linenf.txt
spnbox/tests/test-supervis.c
spnbox/tests/test-supervis.mak
spnbox/tests/test-supervis.txt
Removed Paths:
-------------
spnbox/tests/lintst.txt
spnbox/tests/readpns.c
spnbox/tests/readpns.h
spnbox/tests/test-supervise.c
spnbox/tests/test-supervise.mak
Modified: spnbox/actn.c
===================================================================
--- spnbox/actn.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/actn.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -85,6 +85,10 @@
return result;
}
+/*******************************************************************************
+isUnique examines the petri net and the given set of unraisable transitions to
+determine if the live subnet that will be returned is unique. It is only called
+when the actn caller requests it.*/
int isUnique(matrix* D, int* X, int XCount)
{
/*We will be doing a linear programming problem for each raisable transition.
@@ -169,6 +173,11 @@
return 1;
}
+/*******************************************************************************
+BuildResult takes the list of places and transitions to cull from the total net
+and builds the active subnet. It returns the result structure that will be
+returned by actn.
+*/
actn_r BuildResult(matrix* Dm, matrix* Dp, int* cullPlace, int* cullTrans)
{
int Places = 0, Transitions = 0, i, j, k, l;
@@ -221,7 +230,11 @@
}
return result;
}
-
+/*******************************************************************************
+cullPlaces examines the Petri net and the list of transitions to cull and
+returns an array of integer flags, one for each place, indicating whether that
+place should be culled.
+*/
int* cullPlaces(matrix* Dm, int* cullTransition)
{
int i, j;
@@ -250,6 +263,11 @@
return cull;
}
+/*******************************************************************************
+updateURT examines the Petri net and the predefined active subnet if given and
+returns an array of transitions that are unraisable given the active subnet.
+This is used to determine transitions to cull if in update mode.
+*/
int* updateURT(matrix* Dm, matrix* Dp, matrix* Dcm, matrix* Dcp)
{
/*This function builds a list of unraisable transitions in Dm/Dp by examining
@@ -382,6 +400,10 @@
return URT;
}
+/*******************************************************************************
+CheckParams checks the parameters to make sure required parameters are present,
+checks some basic validity, and makes sure that all array pointers are null if
+their counts are zero and vice-versa.*/
int CheckParams(matrix* Dm, matrix* Dp, int** X, int* XCount, matrix *Dcm, matrix *Dcp, int update)
{
int Rows0, Cols0, Rows1, Cols1;
Modified: spnbox/chkcons.c
===================================================================
--- spnbox/chkcons.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/chkcons.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -58,7 +58,8 @@
return result;
}
-/*This function fills L1 with L0 if present concatenated rowwise with l0 if
+/*******************************************************************************
+This function fills L1 with L0 if present concatenated rowwise with l0 if
present, and B1 with B0 if present followed by b0 if l0 is present*/
void BuildProblem(matrix* L0, int* B0, matrix* l0, int b0, matrix** L1, double** B1)
{
@@ -111,7 +112,9 @@
(*B1)[Cons - 1] = (double) (1 - b0);
}
}
-
+/*******************************************************************************
+CheckParams makes sure that required parameters are present and does some basic
+validity checking.*/
int CheckParams(matrix* L0, int* B0, matrix* l0)
{
/*One of L0 or l0 is required.*/
Modified: spnbox/ilpadm.c
===================================================================
--- spnbox/ilpadm.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/ilpadm.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -162,6 +162,11 @@
return result;
}
+/*******************************************************************************
+CheckParams examines the parameters passed to ilpadm to make sure that required
+parameters are present, does some basic validity checking such as making sure
+matrix dimensions agree, and makes sure that all array pointers are null if
+array lengths are zero and vice-versa.*/
int CheckParams(matrix* L, matrix* D, int** Tuc, int* TucCount, int** Tuo, int* TuoCount)
{
int Constraints, Places, Transitions;
@@ -209,6 +214,14 @@
return 1;
}
+/*******************************************************************************
+This function initializes the various parameters of the two alternate linear
+programming problems, one of which will be solved for every constraint that has
+to be transformed. The first group of parameters are pointers to the linear
+programming parameters. The last 6 parameters are the uncontrollable transition
+index list and index list length, the unraisable transition index list and index
+list length, the incidence matrix, and the memory manager.
+*/
void InitLPProblems(matrix *M1, matrix* M2, double** N1, double** N2, short** CType1, short** CType2, double** LoBounds, double** Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, matrix *D, MemoryManager * mem)
{
int Places, i;
@@ -281,6 +294,13 @@
TransposeMatrix(M2);
}
+/*******************************************************************************
+This function initializes parts of the return value ilpadm will use and various
+intermediate variables used by the algorithm. CDeltas is a pointer to a matrix
+with a row for each constraint and a column for each transition, each element of
+which is the change in marking constraint satisfaction (negative being more
+satisfied, positive being less) that occurs when the corresponding transition
+fires.*/
ilpadm_r InitOther(matrix* CDeltas, matrix *L, matrix* D, int *Tuc, int TucCount, int* Tuo, int TuoCount, MemoryManager* mem)
{
int Constraints, Places, i, j;
@@ -322,6 +342,16 @@
return result;
}
+/*******************************************************************************
+TransformType examines the current constraint row and returns an integer
+indicating what type of action should be taken. Return codes are:
+-1 Transformation is infeasible.
+ 0 No transformation is necessary.
+ 1 A type-1 transformation, one ignoring the initial marking constraint, should
+ be carried out.
+ 2 A type-2 transformation, one accounting for the initial marking constraint,
+ should be carried out.
+*/
int TransformType(matrix* CDeltas, matrix* L, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
{
int UCTDeltasNegative = 1, UOTDeltasZero = 1, i;
@@ -388,6 +418,14 @@
}
}
+/*******************************************************************************
+This function builds the final parts of the linear programming problem for a
+type-1 transformation, those parts that vary from constraint row to constraint
+row.
+M1 and Cost are the constraint matrix and the cost vector the lp problem.
+CDeltas, Tuc, TucCount, Tuo, and TuoCount are all the same as in ilpadm.
+Constraint is the index of the current constraint row.
+*/
void BuildLP1(matrix *M1, matrix* CDeltas, double* Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
{
int i, Places;
@@ -408,6 +446,13 @@
}
}
+/*******************************************************************************
+This function examines the results of a type-1 transformation and returns a 1 if
+the conditions under which the transformation needs to be redone with an
+additional constraint are met.
+L is the constraint matrix, b is the constraint vector, solution is the
+structure returned by the initial ipsolve call for the type-1 transformation,
+and Constraint is the index of the current constraint row.*/
int RedoLP1(matrix* L, int* b, ipsolve_r* solution, int Constraint)
{
/*We want to run a check. If b is nonempty and if the algorithm below
@@ -430,6 +475,12 @@
return 0;
}
+/*******************************************************************************
+This function builds the alternate form of the linear programming problem
+that is sometimes required for a type-1 transformation. Because this alternate
+employs an extra constraint row in the lp problem, it actually uses those
+lp parameters intended for a type-2 transformation since they all have an one
+more constraint row than those of a type-1 transformation.*/
void BuildLP1Alternate(matrix* M2, matrix* CDeltas, matrix* L, int *Tuc, int TucCount, int *Tuo, int TuoCount, int Constraint)
{
int i, j, Places;
@@ -458,6 +509,14 @@
}
}
+/*******************************************************************************
+This function builds the final parts of the linear programming problem for a
+type-2 transformation, those parts that vary from constraint row to constraint
+row.
+M2 and Cost are the parameters of the linear programming problem.
+Constraint is the index of the current constraint row.
+The rest of the parameters have the same meaning as used in ilpadm.
+*/
void BuildLP2(matrix* M2, matrix* L, matrix* CDeltas, double* Cost, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
{
int i, Places;
@@ -491,6 +550,10 @@
SetMatrixEl(M2, TucCount + TuoCount, Places, Cost[Places]);
}
+/*******************************************************************************
+This function applies the results of an ipsolve call used to make a
+transformation to the transformation matrices held in the ilpadm_r result
+structure.*/
void ApplySolution(ilpadm_r* result, ipsolve_r* LPSolution, int Constraint, int Places, int Constraints)
{
int i;
@@ -519,6 +582,10 @@
}
}
+/*******************************************************************************
+This function does the actual constraint transformation using the transformation
+matrices built earlier. It also fills in the rest of the result structure
+parameters.*/
FinalizeSolution(ilpadm_r* result, matrix* L, int* b, int Places, int Constraints)
{
int i, j, x;
@@ -562,6 +629,15 @@
}
}
+/*******************************************************************************
+disp displays debugging messages if the global is_verbose function indicates a
+sufficiently high verbosity level. Otherwise it does nothing. Parameters are:
+beginning, parameter, end - pointers to null-terminated strings that are
+displayed on after another in the display string. Useful for adding beginning
+and ending formats to ipsolve result message.
+i - the current constraint row index.
+p - the number of constraint rows. If this is 1 or less than the message will
+not display constraint index information.*/
void disp(char* beginning, char* parameter, char* end, int i, int p)
{
if(is_verbose() >= VRB_ILPADM)
Modified: spnbox/ipsolve.c
===================================================================
--- spnbox/ipsolve.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/ipsolve.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -19,17 +19,17 @@
} ipslv_problem;
/*Function prototypes. See the definitions for comments as to purpose.*/
-int CheckParams(MemoryManager* mem, matrix* L0, double** B0, double** Cost0, short**IntList, double** HiBound, double **LoBound, short** ctype);
+static int CheckParams(MemoryManager* mem, matrix* L0, double** B0, double** Cost0, short**IntList, double** HiBound, double **LoBound, short** ctype);
-int ProcessCols(MemoryManager* mem, matrix* L, int** ColKeys, double* Cost, double* HiBound, double* LoBound, ipsolve_r* result);
+static int ProcessCols(MemoryManager* mem, matrix* L, int** ColKeys, double* Cost, double* HiBound, double* LoBound, ipsolve_r* result);
-int ProcessRows(MemoryManager* mem, matrix* L0, int** RowKeys, short* ctype, double* B0, ipsolve_r* result);
+static int ProcessRows(MemoryManager* mem, matrix* L0, int** RowKeys, short* ctype, double* B0, ipsolve_r* result);
-ipslv_problem ConvertProblem(MemoryManager* mem, int* RowKeys, int* ColKeys, int Rows, int Cols, matrix* L, double* B, double* Cost, double* HiBound, double* LoBound, short* IntList, short* ctype);
+static ipslv_problem ConvertProblem(MemoryManager* mem, int* RowKeys, int* ColKeys, int Rows, int Cols, matrix* L, double* B, double* Cost, double* HiBound, double* LoBound, short* IntList, short* ctype);
-void SetMessage(ipsolve_r* result, ipslv_r* lpresult, int Variables);
+static void SetMessage(ipsolve_r* result, ipslv_r* lpresult, int Variables);
-int CheckSolution(matrix* L, double* B, short* ctype, ipsolve_r* result);
+static int CheckSolution(matrix* L, double* B, short* ctype, ipsolve_r* result);
ipsolve_r ipsolve(matrix *L0, double* B0, double *Cost0, short int *IntList0, double *HiBound0, double *LoBound0, short int *ctype0)
{
@@ -451,7 +451,7 @@
{
if (RowKeys[i])
{
- result.L[i] = mcalloc(mem, Cols, sizeof(REAL));
+ result.L[k] = mcalloc(mem, Cols, sizeof(REAL));
l = 0;
for (j = 0; j < NumberOfColumns(*L); j++)
{
Modified: spnbox/isadm.c
===================================================================
--- spnbox/isadm.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/isadm.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -63,6 +63,14 @@
return v;
}
+/*******************************************************************************
+StructuralAnalysis performs an algorithmic examination of the given set of
+constraints to determine which ones are admissible, returning an integer flag
+array of the same format as that returned by isadm itself.
+StructuralAnalysis is the workhorse portion of the isadm function. If isadm is
+ever extended to employ also tests based on a reachability graph, those tests
+will be implemented as another function like StructuralAnalysis and isadm will
+make the decision as to which one to call.*/
int* StructuralAnalysis(matrix* D, matrix* L, matrix* F, matrix* C, int TucCount, int* Tuc, int TuoCount, int* Tuo)
{
int i, j, k, Constraints, Transition;
@@ -130,7 +138,10 @@
}
return v;
}
-
+
+/*******************************************************************************
+CheckParams makes sure that necessary parameters have been provided and does
+some basic validity checking.*/
int CheckParam(matrix* Dm, matrix* Dp, matrix* L, matrix* F, matrix* C)
{
int Constraints;
Modified: spnbox/nltrans.c
===================================================================
--- spnbox/nltrans.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/nltrans.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -94,9 +94,11 @@
}
/*******************************************************************************
-Utility Functions and Subroutines
-*******************************************************************************/
-
+BuildIntegerProblem builds a portion of the linear programming problem used to
+determine if a given transition is raisable. The portion it builds is that
+portion which does not change from transition to transition. It takes incidence
+matrix, the list of predefined unraisable transitions, and pointers to the
+various parameters that will be used to defined the linear programming problem.*/
int BuildIntegerProblem(MemoryManager* mem, matrix* D, int* URT, int urtCount, matrix* M, double** F, double** B, short int** IntList, short int** ctype)
{
int Constraints, Vars, i, j;
@@ -154,6 +156,9 @@
return NumberOfColumns(*D);
}
+/*******************************************************************************
+CheckParams checks the parameters for validity and makes sure that the URT
+pointer is null if the urtCount is zero and vice-versa.*/
int CheckParams(matrix* D, int** URT, int* urtCount)
{
int i;
Modified: spnbox/pn2acpn.c
===================================================================
--- spnbox/pn2acpn.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/pn2acpn.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -101,11 +101,7 @@
return result;
}
-
-/**************************************************
- Subroutines
-**************************************************/
-/*
+/*******************************************************************************
FinalizeResult takes the result structure and fills in values that are not
computed during the main processing loop: the incidence matrix Df, the new
marking constraint matrix Lf, and the new independent place list iplf.
@@ -143,7 +139,7 @@
}
}
-/*
+/*******************************************************************************
AddPlaces is responsible for filling in the values in the transitions and
places that are added during each iteration of the main processing loop. It
fills in values in the Petri net matrices, in the initial marking constraint
@@ -271,7 +267,8 @@
}
}
-/*GetQPlace examines the pair of place indices in the U matrix that is
+/*******************************************************************************
+GetQPlace examines the pair of place indices in the U matrix that is
currently being processed and selects and returns on of the indicies, to be used
to set a Q-flag and perform operations on the cardbtx flag vector.
It requires the U matrix, the pair number ot process, the vector of Q-flags,
@@ -349,7 +346,8 @@
return -1;
}
-/*GetU creates and returns a 2 x n matrix, each column of which is a pair of
+/*******************************************************************************
+GetU creates and returns a 2 x n matrix, each column of which is a pair of
place indices such that the places exhibit some special relationship. The U
matrix is specific to the transition currently being investigated. Its
calculation requires the cardbt flag vector, the result structure for access
@@ -471,7 +469,7 @@
return U;
}
-/*
+/*******************************************************************************
InitParts initializes intermediate variables cardbt and cardbtx, flag arrays,
Qflag, a flag array, and the Petri net matrices in the result structure.
*/
@@ -529,7 +527,7 @@
return res;
}
-/*
+/*******************************************************************************
CheckParams examines the parameters to make sure that required parameters are
present and dimensions and array counts are consistent. It also fills in default
values where appropriate.
Modified: spnbox/pn2eacpn.c
===================================================================
--- spnbox/pn2eacpn.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/pn2eacpn.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -102,11 +102,7 @@
return result;
}
-
-/**************************************************
- Subroutines
-**************************************************/
-/*
+/*******************************************************************************
FinalizeResult takes the result structure and fills in values that are not
computed during the main processing loop: the incidence matrix Df, the new
marking constraint matrix Lf, and the new independent place list iplf.
@@ -145,7 +141,7 @@
}
-/*
+/*******************************************************************************
AddPlaces is responsible for filling in the values in the transitions and
places that are added during each iteration of the main processing loop. It
fills in values in the Petri net matrices, in the initial marking constraint
@@ -308,7 +304,8 @@
}
}
-/*GetQPlace examines the pair of place indices in the U matrix that is
+/*******************************************************************************
+GetQPlace examines the pair of place indices in the U matrix that is
currently being processed and selects and returns on of the indicies, to be used
to set a Q-flag and perform operations on the cardbtx flag vector.
It requires the U matrix, the pair number ot process, the vector of Q-flags,
@@ -386,7 +383,8 @@
return -1;
}
-/*GetU creates and returns a 2 x n matrix, each column of which is a pair of
+/*******************************************************************************
+GetU creates and returns a 2 x n matrix, each column of which is a pair of
place indices such that the places exhibit some special relationship. The U
matrix is specific to the transition currently being investigated. Its
calculation requires the cardbt flag vector, the result structure for access
@@ -487,7 +485,7 @@
return U;
}
-/*
+/*******************************************************************************
ProcessPlace returns a nonzero value for a place that should be processed in the
current transition. Any place should be processed which is both a parent and a
grandparent of the current transition, where the grandparent status is via a
@@ -530,7 +528,7 @@
return 0;
}
-/*
+/*******************************************************************************
InitParts initializes intermediate variables cardbt and cardbtx, flag arrays,
Qflag, a flag array, and the Petri net matrices in the result structure.
*/
@@ -604,7 +602,7 @@
return res;
}
-/*
+/*******************************************************************************
CheckParams examines the parameters to make sure that required parameters are
present and dimensions and array counts are consistent. It also fills in default
values where appropriate.
Modified: spnbox/reduce.c
===================================================================
--- spnbox/reduce.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/reduce.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -97,7 +97,10 @@
return result;
}
-
+/*******************************************************************************
+ExtractConstraint takes the given constraint row from L and B, copies it to the
+single-row parameters l and b, and zeros it in L in preparation for redundancy
+tests with chkcons.*/
void ExtractConstraint(matrix* L, matrix* l, int* B, int* b, int Constraint)
{
int i;
@@ -110,6 +113,9 @@
B[Constraint] = 0;
}
+/*******************************************************************************
+RestoreConstraint reverses the operations carried out in ExtractConstraint. Used
+when the given constraint is determined to be non-redundant.*/
void RestoreConstraint(matrix* L, matrix* l, int* B, int b, int Constraint)
{
int i;
Modified: spnbox/spnbox.h
===================================================================
--- spnbox/spnbox.h 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/spnbox.h 2009-07-01 19:39:53 UTC (rev 139)
@@ -195,7 +195,7 @@
Written for Matlab by Marian V. Iordache, mar...@le....
Converted to C by Marian V. Iordache and Stephen Camp, ste...@le....*/
-supervis_r supervis(matrix PlantIn, matrix PlantOut, matrix L);
+supervis_r supervis(matrix* PlantIn, matrix* PlantOut, matrix* L);
/* supervis_r supervis(const matrix PlantIn, const matrix PlantOut, const matrix L)
This function creates the structure that enforces L*M >= b, where M is
Modified: spnbox/supervis.c
===================================================================
--- spnbox/supervis.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/supervis.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -2,7 +2,7 @@
#include "../pnheaders/matrix.h"
#include "matrixmath.h"
-supervis_r supervis(matrix PlantIn, matrix PlantOut, matrix L)
+supervis_r supervis(matrix* PlantIn, matrix* PlantOut, matrix* L)
{
/*Variables:
Sizes of various matrices.
@@ -25,25 +25,23 @@
AllocateMatrix(&toReturn.Dfm, 0, 0);
AllocateMatrix(&toReturn.Dfp, 0, 0);
+ /*Check the parameters for validity.*/
+ if (! CheckParams(PlantIn, PlantOut, L))
+ {
+ return toReturn;
+ }
+
//Get the size of the petri net input/output matrices
- m = NumberOfRows(PlantIn);
- n = NumberOfColumns(PlantIn);
+ m = NumberOfRows(*PlantIn);
+ n = NumberOfColumns(*PlantIn);
//Get the size of the constraint matrix.
- k = NumberOfRows(L);
- m2 = NumberOfColumns(L);
+ k = NumberOfRows(*L);
+ m2 = NumberOfColumns(*L);
/*Since we are going to be multiplying the constraints * the incidence matrix,
constraints must have the same number of columns as the incidence matrix does
- rows.*/
-
- if (m < m2)
+ rows. Pad if necesary.*/
+ if (m > m2)
{
- /*If there are more constraint columns than rows in the incidence matrix,
- fail.*/
- merror(0, "Dimensions of incidence matrices and constraints do not agree");
- return toReturn;
- }
- else if (m > m2)
- {
/*If there are more rows in the incidence matrix, we can just pad the
constraint matrix with extra columns of zeros. Since a new matrix is filled
with zeros when it is created, we can just create a new matrix of the
@@ -52,22 +50,22 @@
constraints = tmalloc(sizeof(matrix));
AllocateMatrixType(2, constraints, k, m);
//Copy l to L(1:k, 1:m2)
- CopyBlock(k, m2, &L, 0, 0, constraints, 0, 0);
+ CopyBlock(k, m2, L, 0, 0, constraints, 0, 0);
}
else
{
//We need to make sure that L is a type-2 matrix for optimization purposes.
- if (L.type == 2)
+ if (L->type == 2)
{
//If l is already type 2, just duplicate the pointer.
- constraints = &L;
+ constraints = L;
}
else
{
//If not, then allocate a new type-2 matrix and copy it.
constraints = tmalloc(sizeof(matrix));
AllocateMatrixType(2, constraints, k, m);
- CopyMatrix(&L, constraints);
+ CopyMatrix(L, constraints);
}
}
/*Now, constraints contains a constraint matrix of proper dimensions, stored
@@ -75,7 +73,7 @@
/*Get the incidence matrix corresponding to the input/output matrices of the
plant. The result should be stored in a type-2 matrix.*/
- plantD = SubtractMatrix(&PlantIn, &PlantOut, (matrix*) 2);
+ plantD = SubtractMatrix(PlantIn, PlantOut, (matrix*) 2);
/*Now multiply the constraints matrix with the plant incidence matrix. The
result is a supervisor net stored as an incidence matrix in D. Store it as a type-2.*/
@@ -93,15 +91,15 @@
/*Concatenate the columns of the output matrices. The result should be stored
in a type-2 matrix.*/
- toReturn.Dfm = ConcatenateMatrixCols(&PlantOut, &supervisorDm, (matrix*) 2);
+ toReturn.Dfm = ConcatenateMatrixCols(PlantOut, &supervisorDm, (matrix*) 2);
/*Concatenate the columns of the input matrices. The result should be stored
in a type-2 matrix.*/
- toReturn.Dfp = ConcatenateMatrixCols(&PlantIn, &supervisorDp, (matrix*) 2);
+ toReturn.Dfp = ConcatenateMatrixCols(PlantIn, &supervisorDp, (matrix*) 2);
/*Free any memory that was allocated. If we allocated new space for
constraints, then a new matrix was allocated for it*/
- if (constraints != &L)
+ if (constraints != L)
{
DeallocateMatrix(constraints);
free(constraints);
@@ -113,3 +111,38 @@
return toReturn;
}
+
+int CheckParams(matrix* PlantIn, matrix* PlantOut, matrix* L)
+{
+ int m, n, k, m2;
+ //All pointers are required.
+ if (! (PlantIn && PlantOut && L))
+ {
+ merror(0, "SUPERVIS: A pointer to a required parameter was null");
+ return 0;
+ }
+ //Get the size of the petri net input/output matrices
+ m = NumberOfRows(*PlantIn);
+ n = NumberOfColumns(*PlantIn);
+
+ //The petri net matrices need to be the same size.
+ if (NumberOfRows(*PlantOut) != m || NumberOfColumns(*PlantOut) != n)
+ {
+ merror(0, "SUPERVIS: The plant i/o matrices are not the same size");
+ return 0;
+ }
+ //Get the size of the constraint matrix.
+ k = NumberOfRows(*L);
+ m2 = NumberOfColumns(*L);
+ /*Since we are going to be multiplying the constraints * the incidence matrix,
+ constraints must have the same number of columns as the incidence matrix does
+ rows. We will be padding the constraint matrix if it has too few columns -
+ fail only if it has too many.*/
+
+ if (m < m2)
+ {
+ merror(0, "Dimensions of incidence matrices and constraints do not agree");
+ return 0;
+ }
+ return 1;
+}
Deleted: spnbox/tests/lintst.txt
===================================================================
--- spnbox/tests/lintst.txt 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/lintst.txt 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,467 +0,0 @@
-
-ID Example1
-
-D 3 3
--1 0 1
-1 -1 0
-0 1 -1
-
-m0 3
-3 0 0
-
-Tuc 1
-1
-
-L 1 3
-0 0 1
-
-b 1
-1
-
-enforce
-
-ID Example2
-
-D 4 3
--1 0 1
-1 -1 0
-1 -1 0
- 0 1 -1
-
-m0 4
-3 0 0 0
-
-Tuc 1
-1
-
-L 1 4
-0 0 0 1
-
-b 1
-1
-
-enforce
-
-ID Example3
-
-D 4 4
--1 -1 0 1
-1 0 -1 0
-0 1 -1 0
-0 0 1 -1
-
-m0 4
-3 0 0 0
-
-Tuc 1
-2
-
-L 1 4
-0 0 0 1
-
-b 1
-1
-
-enforce
-
-ID Example4
-
-D 4 4
--1 0 0 1
-0 -1 0 2
-2 1 -2 0
-0 0 1 -2
-
-m0 4
-1 2 0 2
-
-Tuc 1
-2
-
-L 1 4
-0 0 0 1
-
-b 1
-2
-
-enforce
-
-ID Example5
-
-D 3 3
--1 1 0
--1 0 1
-2 -1 -1
-
-m0 3
-1 1 0
-
-Tuo 1
-0
-
-L 2 3
--1 0 -1
-0 -1 -1
-
-b 2
--1 -1
-
-enforce
-
-ID Example6
-
-D 3 3
--1 0 1
-1 -1 0
-0 1 -1
-
-m0 3
-3 0 0
-
-Tuc 1
-2
-
-L 1 3
-0 1 0
-
-F 1 3
-0 0 1
-
-b 1
-1
-
-enforce
-
-ID Example7A
-
-D 3 4
--1 -1 1 1
-1 0 -1 0
-0 1 0 -1
-
-m0 3
-2 0 0
-
-C 1 4
-1 -1 0 0
-
-b 1
-2
-
-enforce
-
-ID Example7B
-
-D 3 4
--1 -1 1 1
-1 0 -1 0
-0 1 0 -1
-
-m0 3
-2 0 0
-
-C 1 4
-1 -1 0 0
-
-b 1
-2
-
-Tuo 2
-0 1
-
-enforce
-
-ID Example7C
-
-D 3 4
--1 -1 1 1
-1 0 -1 0
-0 1 0 -1
-
-C 1 4
-1 -1 0 0
-
-b 1
-2
-
-Tuo 2
-0 1
-
-m0 3
-4 0 0
-
-enforce
-
-ID Example7D
-
-D 3 4
--1 -1 1 1
-1 0 -1 0
-0 1 0 -1
-
-m0 3
-2 0 0
-
-C 1 4
-1 -1 0 0
-
-b 1
-2
-
-Tuo 2
-0 1
-
-enforce
-
-ID ATMSW
-
-D 5 11
- 1 0 0 -1 0 0 -1 0 0 0 0
- 0 1 0 0 -1 0 0 -1 0 0 0
- 0 0 1 0 0 -1 0 0 -1 0 0
- 0 0 0 1 1 1 0 0 0 -1 0
- 0 0 0 0 0 0 1 1 1 0 -1
-
-L 4 5
- 0 0 0 1 0
- 0 0 0 0 1
- 0 0 0 0 0
- 0 0 0 0 0
-
-F 4 11
- 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1 1 1 0 0 0 0 0
- 0 0 0 0 0 0 1 1 1 0 0
-
-b 4
-5 5 2 2
-
-Tuc 5
-0 1 2 9 10
-
-enforce
-
-ID CATMOUSEA
-
-D 10 14
--1 0 1 -1 0 1 0 0 0 0 0 0 0 0
- 1 -1 0 0 0 0 -1 1 0 0 0 0 0 0
- 0 1 -1 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1 -1 0 1 -1 0 0 0 0 0 0
- 0 0 0 0 1 -1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 -1 0 1 -1 0 1
- 0 0 0 0 0 0 0 0 0 1 -1 0 0 0
- 0 0 0 0 0 0 0 0 1 -1 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 1 -1
- 0 0 0 0 0 0 0 0 0 0 0 1 -1 0
-
-L 5 10
- 1 0 0 0 0 1 0 0 0 0
- 0 1 0 0 0 0 1 0 0 0
- 0 0 1 0 0 0 0 1 0 0
- 0 0 0 1 0 0 0 0 1 0
- 0 0 0 0 1 0 0 0 0 1
-
-b 5
-1 1 1 1 1
-
-m0 10
-0 0 1 0 0 0 0 0 0 1
-
-enforce
-
-ID CATMOUSEB
-
-D 10 14
--1 0 1 -1 0 1 0 0 0 0 0 0 0 0
- 1 -1 0 0 0 0 -1 1 0 0 0 0 0 0
- 0 1 -1 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 1 -1 0 1 -1 0 0 0 0 0 0
- 0 0 0 0 1 -1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 -1 0 1 -1 0 1
- 0 0 0 0 0 0 0 0 0 1 -1 0 0 0
- 0 0 0 0 0 0 0 0 1 -1 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0 1 -1
- 0 0 0 0 0 0 0 0 0 0 0 1 -1 0
-
-L 5 10
- 1 0 0 0 0 1 0 0 0 0
- 0 1 0 0 0 0 1 0 0 0
- 0 0 1 0 0 0 0 1 0 0
- 0 0 0 1 0 0 0 0 1 0
- 0 0 0 0 1 0 0 0 0 1
-
-b 5
-1 1 1 1 1
-
-m0 10
-0 0 1 0 0 0 0 0 0 1
-
-Tuc 2
-6 7
-
-enforce
-
-ID PRRACTSTA
-
-D 7 8
--1 0 0 0 0 0 0 1
- 1 -1 0 0 0 0 0 0
- 0 1 -1 0 0 0 0 0
- 0 0 0 1 -1 0 0 0
- 0 0 0 0 1 -1 0 0
- 0 0 0 0 0 1 -1 0
- 0 0 0 0 0 0 1 -1
-
-m0 7
-1 0 0 0 0 0 0
-
-L 7 7
- 0 1 1 0 0 0 0
- 0 0 0 1 1 1 1
- 1 1 1 0 1 1 1
- 0 0 1 0 0 0 0
- 0 0 0 1 1 0 0
- 0 0 0 0 0 1 0
- 0 0 0 0 0 0 1
-
-b 7
-1 1 1 1 1 1 1
-
-Tuc 3
-5 7 7
-
-enforce
-
-ID PRRACTSTB
-
-D 7 8
--1 0 0 0 0 0 0 1
- 1 -1 0 0 0 0 0 0
- 0 1 -1 0 0 0 0 0
- 0 0 0 1 -1 0 0 0
- 0 0 0 0 1 -1 0 0
- 0 0 0 0 0 1 -1 0
- 0 0 0 0 0 0 1 -1
-
-m0 7
-1 0 0 0 0 0 0
-
-L 7 7
- 0 1 1 0 0 0 0
- 0 0 0 1 1 1 1
- 1 1 1 0 1 1 1
- 0 0 1 0 0 0 0
- 0 0 0 1 1 0 0
- 0 0 0 0 0 1 0
- 0 0 0 0 0 0 1
-
-b 7
-1 1 1 1 1 1 1
-
-Tuc 3
-5 6 7
-
-Tuo 3
-4 5 6
-
-enforce
-
-ID THRTANK
-
-D 9 15
- 0 0 0 1 -1 0 0 0 0 0 0 0 0 0 0
- 0 0 0 -1 1 -1 1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 1 -1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 1 -1 0 0 0 0 0 0
- 0 0 0 0 0 0 0 -1 1 -1 1 0 0 0 0
- 0 0 0 0 0 0 0 0 0 1 -1 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 1 -1 0 0
- 0 0 0 0 0 0 0 0 0 0 0 -1 1 -1 1
- 0 0 0 0 0 0 0 0 0 0 0 0 0 1 -1
-
-Tuc 12
-3 4 5 6 7 8 9 10 11 12 13 14
-
-L 7 9
- 0 0 0 0 0 0 0 0 0
- 1 0 0 0 0 0 0 0 0
- 0 0 0 1 0 0 0 0 0
- 0 0 0 0 0 0 1 0 0
- 0 0 -1 0 0 1 0 0 1
- 0 0 1 0 0 -2 0 0 1
- 0 0 1 0 0 1 0 0 -2
-
-F 7 15
- 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0
- 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0
- 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0
-
-b 7
-1 1 1 1 2 2 2
-
-enforce
-
-ID UNRELTST
-
-D 10 10
- 1 -1 0 0 0 -1 0 0 0 0
- 0 1 -1 0 0 0 0 0 0 0
- 0 0 1 -1 0 0 0 0 0 0
- 0 0 0 1 -1 0 0 0 0 0
- 0 0 -1 0 1 0 0 0 0 0
- 0 0 0 0 0 1 -1 0 0 0
- 0 0 0 0 0 1 0 0 0 -1
- 0 0 0 0 0 0 1 -1 0 0
- 0 0 0 0 0 0 0 1 -1 0
- 0 0 0 0 0 0 -1 0 1 0
-
-
-Tuc 2
-1 5
-
-L 3 10
- 0 0 0 0 1 0 0 0 0 1
- 0 1 0 0 0 1 0 0 0 0
- 1 0 0 0 0 0 1 0 0 0
-
-b 3
-1 1 1
-
-enforce
-
-ID HSDINT
-Dm 5 10
- 0 0 1 1 0 0 0 0 0 0
- 0 0 0 0 0 0 1 1 0 0
- 1 0 0 0 1 0 0 0 0 0
- 0 0 0 0 0 1 0 0 0 1
- 0 1 0 0 0 0 0 0 1 0
-
-Dp 5 10
- 1 1 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 1 1
- 0 0 0 0 1 0 1 0 0 0
- 0 0 0 1 0 1 0 0 0 0
- 0 0 1 0 0 0 0 1 0 0
-
-L 2 5
- 0 0 0 0 0
- -1 -1 0 0 -1
-
-F 2 10
- 0 0 0 0 1 1 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0
-
-b 2
-0 -1
-
-enforce
-
-quit
-
Deleted: spnbox/tests/readpns.c
===================================================================
--- spnbox/tests/readpns.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/readpns.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,294 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "../matrixmath.h"
-#include "../MemoryManager.h"
-#include "readpns.h"
-
-int* ReadIntArray(FILE* file, int length);
-int GetVector(FILE* file, MemoryManager *mem, char* name, int** v);
-void GetMatrix(FILE* file, MemoryManager *mem, char* name, matrix** m);
-int HasSelfLoops(matrix* Dm, matrix* Dp);
-int NullMatrix(matrix* m);
-int NullArray(int* Array, int Length);
-
-void DisplayConstrainedNet(constrained_net *p)
-{
- int i, j = 0, Places, Transitions, Constraints;
-
- Places = NumberOfRows(*(p->D));
- Transitions = NumberOfColumns(*(p->D));
- Constraints = p->F ? NumberOfRows(*(p->F)) : (p->C ? NumberOfRows(*(p->C)) : (p->L ? NumberOfRows(*(p->L)) : 0));
- if (p->ID[0])
- {
- printf("Problem: %s\n", p->ID);
- }
- if (HasSelfLoops(p->Dm, p->Dp))
- {
- ShowMatrix(p->Dm, "Dm");
- ShowMatrix(p->Dp, "Dp");
- }
- else
- {
- ShowMatrix(p->D, "D");
- }
- if (p->TucCount)
- {
- for (i = 0; i < Transitions; i++)
- {
- if (p->Tuc[j] == i)
- {
- printf("X\t");
- j++;
- }
- else
- {
- printf("\t");
- }
- }
- printf("(UCT)\n");
- }
- if (p->TuoCount)
- {
- j = 0;
- for (i = 0; i < Transitions; i++)
- {
- if (p->Tuo[j] == i)
- {
- printf("X\t");
- j++;
- }
- else
- {
- printf("\t");
- }
- }
- printf("(UOT)\n");
- }
- if (! NullMatrix(p->L))
- {
- ShowMatrix(p->L, "L");
- }
- if (! NullMatrix(p->C))
- {
- ShowMatrix(p->C, "C");
- }
- if (! NullMatrix(p->F))
- {
- ShowMatrix(p->F, "F");
- }
- if (! NullArray(p->b, Constraints))
- {
- printf("b: ");
- for (i = 0; i < Constraints; i++)
- {
- printf("%d\t", p->b[i]);
- }
- printf("\n");
- }
- if (! NullArray(p->m0, Places))
- {
- printf("m0: ");
- for (i = 0; i < Places; i++)
- {
- printf("%d\t", p->m0[i]);
- }
- }
- printf("\n");
-}
-
-int ParseConstrainedNet(FILE* file, MemoryManager* memory, constrained_net* ret)
-{
- int rows;
- char Token[128];
- char Comment[256];
- //Set the structure to zero.
- memset(ret, 0, sizeof(constrained_net));
- do
- {
- fscanf(file, "%s", Token);
- if (! strcmp(Token, "ID"))
- {
- fscanf(file, "%s", ret->ID);
- }
- else if (! strcmp(Token, "echo"))
- {
- fscanf(file, " ");
- fgets(Comment, 256, file);
- printf("%s", Comment);
- }
- else if (! strcmp(Token, "D"))
- {
- GetMatrix(file, memory, "D", &ret->D);
- ret->Dm = mmalloc(memory, sizeof(matrix));
- ret->Dp = mmalloc(memory, sizeof(matrix));
- MAllocateMatrixType(memory, 2, ret->Dm, NumberOfRows(*ret->D), NumberOfColumns(*ret->D));
- MAllocateMatrixType(memory, 2, ret->Dp, NumberOfRows(*ret->D), NumberOfColumns(*ret->D));
- d2dd(ret->D, ret->Dm, ret->Dp);
- }
- else if (! strcmp(Token, "Dm"))
- {
- if (ret->D)
- {
- printf("Warning: Incidence matrix has already been defined. Ignoring new definition of Dm...\n");
- }
- else
- {
- GetMatrix(file, memory, "Dm", &ret->Dm);
- if (ret->Dm && ret->Dp)
- {
- ret->D = mmalloc(memory, sizeof(matrix));
- (*ret->D) = SubtractMatrix(ret->Dp, ret->Dm, (matrix*) 2);
- ManageMatrix(memory, ret->D);
- }
- }
- }
- else if (! strcmp(Token, "Dp"))
- if (ret->D)
- {
- printf("Warning: Incidence matrix has already been defined. Ignoring new definition of Dp...\n");
- }
- else
- {
- GetMatrix(file, memory, "Dp", &ret->Dp);
- if (ret->Dm && ret->Dp)
- {
- ret->D = mmalloc(memory, sizeof(matrix));
- (*ret->D) = SubtractMatrix(ret->Dp, ret->Dm, (matrix*) 2);
- ManageMatrix(memory, ret->D);
- }
- }
- else if (! strcmp(Token, "L"))
- {
- GetMatrix(file, memory, "L", &ret->L);
- }
- else if (! strcmp(Token, "C"))
- {
- GetMatrix(file, memory, "C", &ret->C);
- }
- else if (! strcmp(Token, "F"))
- {
- GetMatrix(file, memory, "F", &ret->F);
- }
- else if (! strcmp(Token, "m0"))
- {
- GetVector(file, memory, "m0", &ret->m0);
- }
- else if (! strcmp(Token, "b"))
- {
- GetVector(file, memory, "b", &ret->b);
- }
- else if (! strcmp(Token, "Tuc"))
- {
- if (rows = GetVector(file, memory, "Tuc", &ret->Tuc))
- {
- ret->TucCount = rows;
- }
- }
- else if (! strcmp(Token, "Tuo"))
- {
- if (rows = GetVector(file, memory, "Tuo", &ret->Tuo))
- {
- ret->TuoCount = rows;
- }
- }
- else if (! strcmp(Token, "quit"))
- {
- memset(ret, 0, sizeof(constrained_net));
- return 0;
- }
- else if (strcmp(Token, "endnet"))
- {
- printf("Warning: Could not parse token '%s'!\n", Token);
- }
- } while (strcmp(Token, "endnet"));
- return 1;
-}
-
-int* ReadIntArray(FILE* file, int length)
-{
- int* ret;
- int i;
- ret = tcalloc(length, sizeof(int));
- for (i = 0; i < length; i++)
- {
- fscanf(file, "%d", ret + i);
- }
- return ret;
-}
-
-int HasSelfLoops(matrix* Dm, matrix* Dp)
-{
- int i, j;
- for (i = 0; i < NumberOfRows(*Dm); i++)
- {
- for (j = 0; j < NumberOfColumns(*Dm); j++)
- {
- if (GetMatrixEl(Dm, i, j) && GetMatrixEl(Dp, i, j)) return 1;
- }
- }
- return 0;
-}
-
-int NullMatrix(matrix* m)
-{
- int i, j;
- if (! m) return 1;
- for (i = 0; i < NumberOfRows(*m); i++)
- {
- for (j = 0; j < NumberOfColumns(*m); j++)
- {
- if (GetMatrixEl(m, i, j)) return 0;
- }
- }
- return 1;
-}
-
-int NullArray(int* Array, int Length)
-{
- int i;
- if (! Array) return 1;
- for (i = 0; i < Length; i++)
- {
- if (Array[i])
- {
- return 0;
- }
- }
- return 1;
-}
-
-void GetMatrix(FILE* file, MemoryManager *mem, char* name, matrix** m)
-{
- int* data;
- int rows, cols;
- fscanf(file, "%d %d", &rows, &cols);
- data = ReadIntArray(file, rows * cols);
- if (*m)
- {
- printf("Warning: matrix '%s' has already been defined. Ignoring new definition...\n", name);
- free(data);
- return;
- }
- (*m) = mmalloc(mem, sizeof(matrix));
- (**m) = vector2matrix(data, rows, cols);
- ManageMatrix(mem, (*m));
- free(data);
- return;
-}
-
-int GetVector(FILE* file, MemoryManager *mem, char* name, int** v)
-{
- int rows;
- int *data;
- fscanf(file, "%d", &rows);
- data = ReadIntArray(file, rows);
- if (*v)
- {
- printf("Warning: vector '%s' has already been defined. Ignoring new definition...\n", name);
- free(data);
- return 0;
- }
- ManageMemory(mem, data);
- (*v) = data;
- return rows;
-}
Deleted: spnbox/tests/readpns.h
===================================================================
--- spnbox/tests/readpns.h 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/readpns.h 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,27 +0,0 @@
-#ifndef READPNS
-#define READPNS
-
-#include <stdio.h>
-#include "../../pnheaders/matrix.h"
-
-typedef struct constrained_net
-{
- char ID[32];
- matrix* D;
- matrix* Dm;
- matrix* Dp;
- matrix* L;
- int* b;
- int* m0;
- matrix* F;
- matrix* C;
- int TucCount;
- int* Tuc;
- int TuoCount;
- int* Tuo;
-} constrained_net;
-
-void DisplayConstrainedNet(constrained_net *p);
-int ParseConstrainedNet(FILE* file, MemoryManager* memory, constrained_net* ret);
-
-#endif
Modified: spnbox/tests/test-actn.c
===================================================================
--- spnbox/tests/test-actn.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-actn.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,19 +1,5 @@
-#include "../../pnheaders/matrix.h"
-#include "../spnbox.h"
-#include "../matrixmath.h"
-#include "../MemoryManager.h"
-#include "StructuredIO.h"
+#include "test.h"
-/*Define the is_verbose function appropriately for testing.*/
-int is_verbose()
-{
- return 3;
-}
-
-static FILE* GetInput(int argc, char* argv[]);
-static int HasSelfLoops(matrix* Dm, matrix* Dp);
-static void FillDmDp(int* Filled, matrix* D, matrix* Dm, matrix* Dp);
-
int main(int argc, char* argv[])
{
FILE* input;
@@ -38,8 +24,8 @@
/*See whether incidence or separate i/o matrices were provided and if the
former, then fill the i/o matrices.*/
- FillDmDp(InFilled, &D, &Dm, &Dp);
- FillDmDp(InFilled + 3, &Dc, &Dcm, &Dcp);
+ FillDmDp(InFilled, &D, &Dm, &Dp, &memory);
+ FillDmDp(InFilled + 3, &Dc, &Dcm, &Dcp, &memory);
/*Solve the problem*/
//actn_r actn(matrix* Dm, matrix* Dp, int* X, int XCount, matrix *Dcm, matrix *Dcp, int update)
@@ -84,67 +70,3 @@
FreeMemory(&memory);
return 0;
}
-
-int HasSelfLoops(matrix* Dm, matrix* Dp)
-{
- int i, j;
- for (i = 0; i < NumberOfRows(*Dm); i++)
- {
- for (j = 0; j < NumberOfColumns(*Dm); j++)
- {
- if (GetMatrixEl(Dm, i, j) && GetMatrixEl(Dp, i, j))
- {
- return 1;
- }
- }
- }
- return 0;
-}
-
-void FillDmDp(int* Filled, matrix* D, matrix* Dm, matrix* Dp)
-{
- /*If D has been filled...*/
- if (Filled[0])
- {
- /*We want to ignore any given Dm and Dp and instead fill Dm and Dp with
- matrices developed from D.*/
- if (Filled[1])
- {
- DeallocateMatrix(Dm);
- }
- if (Filled[2])
- {
- DeallocateMatrix(Dp);
- }
- AllocateMatrixType(2, Dm, NumberOfRows(*D), NumberOfColumns(*D));
- AllocateMatrixType(2, Dp, NumberOfRows(*D), NumberOfColumns(*D));
- d2dd(D, Dm, Dp);
- Filled[0] = 0;
- Filled[1] = 1;
- Filled[2] = 1;
- }
-}
-
-FILE* GetInput(int argc, char* argv[])
-{
- FILE* file;
- if (argc > 1)
- {
- if (file = fopen(argv[1], "r"))
- {
- printf("Taking input from file '%s'...\n", argv[1]);
- return file;
- }
- else
- {
- printf("Failed to open file '%s' for read access!\n", argv[1]);
- return 0;
- }
- }
- else
- {
- printf("Taking input from console...\n");
- return stdin;
- }
-}
-
Modified: spnbox/tests/test-actn.mak
===================================================================
--- spnbox/tests/test-actn.mak 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-actn.mak 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-actn: test-actn.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o actn.o
- $(COMPILER) -o test-actn.exe pns.o matrix.o general.o matrixmath.o test-actn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o actn.o ../liblpsolve55.a
+test-actn: test-actn.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o actn.o test.o ../liblpsolve55.a
+ $(COMPILER) -o test-actn.exe pns.o matrix.o general.o matrixmath.o test-actn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o actn.o test.o ../liblpsolve55.a
matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
$(COMPILER) -c ../../pnheaders/matrix.c
@@ -24,7 +24,7 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
-test-actn.o: test-actn.c ../spnbox.h ../MemoryManager.h
+test-actn.o: test-actn.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
$(COMPILER) -c test-actn.c
StructuredIO.o: StructuredIO.c StructuredIO.h ../../pnheaders/matrix.h
@@ -35,3 +35,12 @@
actn.o: ../actn.c ../spnbox.h ../../pnheaders/matrix.h ../../pnheaders/pns.h ../matrixmath.h ../MemoryManager.h
$(COMPILER) -c ../actn.c
+
+test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
+ $(COMPILER) -c test.c
+
+../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
+ cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
+
+../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
+ cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Modified: spnbox/tests/test-ilpadm.mak
===================================================================
--- spnbox/tests/test-ilpadm.mak 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-ilpadm.mak 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,6 +1,6 @@
COMPILER=gcc -g -ggdb
-test-ilpadm: test-ilpadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm.o ipsolve.o ipslv.o StructuredIO.o test.o
+test-ilpadm: test-ilpadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm.o ipsolve.o ipslv.o StructuredIO.o test.o ../liblpsolve55.a
$(COMPILER) -o test-ilpadm.exe pns.o matrix.o general.o matrixmath.o test-ilpadm.o ilpadm.o ipsolve.o MemoryManager.o StructuredIO.o test.o ipslv.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
@@ -27,11 +27,17 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
-test.o: test.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
$(COMPILER) -c test.c
StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
$(COMPILER) -c StructuredIO.c
-test-ilpadm.o: test-ilpadm.c ../spnbox.h ../../pnheaders/general.h
+test-ilpadm.o: test-ilpadm.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
$(COMPILER) -c test-ilpadm.c
+
+../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
+ cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
+
+../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
+ cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Modified: spnbox/tests/test-ipsolve.mak
===================================================================
--- spnbox/tests/test-ipsolve.mak 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-ipsolve.mak 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-ipsolve-new: test-ipsolve-new.o pns.o matrix.o general.o matrixmath.o ipsolve-new.o MemoryManager.o ipslv.o StructuredIO.o test.o
- $(COMPILER) -o test-ipsolve-new.exe pns.o matrix.o general.o matrixmath.o test-ipsolve-new.o ipsolve-new.o ipslv.o MemoryManager.o StructuredIO.o test.o ../liblpsolve55.a
+test-ipsolve: test-ipsolve.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o test.o ../liblpsolve55.a
+ $(COMPILER) -o test-ipsolve.exe pns.o matrix.o general.o matrixmath.o test-ipsolve.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o test.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
@@ -15,8 +15,8 @@
matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../matrixmath.c
-ipsolve-new.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve-new.c
- $(COMPILER) -c ../ipsolve-new.c
+ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
+ $(COMPILER) -c ../ipsolve.c
ipslv.o: ../spnbox.h ../ipslv.c
$(COMPILER) -c ../ipslv.c
@@ -24,12 +24,17 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
-test-ipsolve-new.o: test-ipsolve-new.c ../spnbox.h ../../pnheaders/general.h
- $(COMPILER) -c test-ipsolve-new.c
+test-ipsolve.o: test-ipsolve.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
+ $(COMPILER) -c test-ipsolve.c
-test.o: test.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
$(COMPILER) -c test.c
StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
$(COMPILER) -c StructuredIO.c
+../liblpsolve55.a: ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
+ cp ../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a ../liblpsolve55.a
+
+../../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
+ cd ../../third-party/lp_solve_5.5; make -f Makefile.linux lib
Modified: spnbox/tests/test-isadm.c
===================================================================
--- spnbox/tests/test-isadm.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-isadm.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,59 +1,61 @@
-#include <stdio.h>
-#include <string.h>
-#include "../../pnheaders/pns.h"
-#include "../../pnheaders/general.h"
-#include "../spnbox.h"
-#include "../matrixmath.h"
-#include "../MemoryManager.h"
-#include "readpns.h"
+#include "test.h"
int main(int argc, char *argv[])
{
- constrained_net problem;
MemoryManager memory;
- FILE* file;
- int* Result;
- int Constraints, i;
+ FILE* input;
+ int *Result, *Filled;
+ int Constraints, Transitions, i;
- if (argc > 1)
+ char IDesc[] = "matrix D, matrix Dm, matrix Dp, indexarray Tuc, indexarray Tuo, matrix L, matrix F, matrix C, arrayi b, arrayi m0";
+
+ matrix D, Dm, Dp, L, F, C;
+ int *b, *m0, *Tuc, *Tuo;
+ int bCount, m0Count, TucCount, TuoCount;
+
+ /*Get a pointer to the input file.*/
+ if (! (input = GetInput(argc, argv)))
{
- if (! (file = fopen(argv[1], "r")))
- {
- merror(0, "Could not open problem file");
- return 1;
- }
- printf("Taking input from problem file %s.\n", argv[1]);
+ return 1;
}
- else
- {
- file = stdin;
- printf("Taking input from console.\n");
- }
+
+ memory = CreateMemoryManager(5, 6, 0, 0);
+
+ while (ParseStructure(input, IDesc, &Filled, &memory, &D, &Dm, &Dp, &Tuc, &TucCount, &Tuo, &TuoCount, &L, &F, &C, &b, &bCount, &m0, &m0Count))
+ { /*Find out how many constraints and transitions have been defined.*/
+ Constraints = Filled[5] ? NumberOfRows(L) : (Filled[6] ? NumberOfRows(F) : (Filled[7] ? NumberOfRows(C) : 0));
+ Transitions = Filled[0] ? NumberOfColumns(D) : (Filled[1] ? NumberOfColumns(Dm) : (Filled[2] ? NumberOfColumns(Dp) : 0));
- while (1)
- {
- memory = CreateMemoryManager(4, 4, 0, 0);
+ /*Display the problem.*/
+ DisplayStructure(IDesc, Filled, &D, &Dm, &Dp, Tuc, TucCount, Transitions, Tuo, TuoCount, Transitions, &L, &F, &C, b, bCount, m0, m0Count);
+
+ /*If an incidence matrix was supplied fill in the i/o matrices.*/
+ FillDmDp(Filled, &D, &Dm, &Dp, &memory);
+
+ /*Solve the problem.*/
+ Result = isadm(Filled[1] ? &Dm : 0, Filled[2] ? &Dp : 0, Filled[5] ? &L : 0, Filled[8] ? b : 0, Filled[9] ? m0 : 0, Filled[6] ? &F : 0, Filled[7] ? &C : 0, Filled[3] ? TucCount : 0, Tuc, Filled[4] ? TuoCount : 0, Tuo);
- if (ParseConstrainedNet(file, &memory, &problem))
+ /*Display the solution.*/
+ if (Result)
{
- DisplayConstrainedNet(&problem);
- //(matrix* Dm, matrix* Dp, matrix* L, int* b, int* m0, matrix* F, matrix* C, int TucCount, int* Tuc, int TuoCount, int* Tuo)
- Result = isadm(problem.Dm, problem.Dp, problem.L, problem.b, problem.m0, problem.F, problem.C, problem.TucCount, problem.Tuc, problem.TuoCount, problem.Tuo);
- Constraints = problem.L ? NumberOfRows(*problem.L) : (problem.F ? NumberOfRows(*problem.F) : (problem.C ? NumberOfRows(*problem.C) : 0));
- printf("ILPADM Result: ");
+ printf("ILPADM Result:\n");
for (i = 0; i < Constraints; i++)
{
printf("%d\t", Result[i]);
- }
- printf("\nPress any key to continue...\n");
- fscanf(file, " ");
- FreeMemory(&memory);
+ }
+ ManageMemory(&memory, Result);
+ printf("\n");
}
else
{
+ merror(0, "TEST-ILPADM: ilpadm call returned null!");
FreeMemory(&memory);
- break;
+ return 1;
}
+ printf("---------------------------------------------------------------\n");
+ FreeMemory(&memory);
+ memory = CreateMemoryManager(5, 6, 0, 0);
}
+ FreeMemory(&memory);
return 0;
}
Modified: spnbox/tests/test-isadm.mak
===================================================================
--- spnbox/tests/test-isadm.mak 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-isadm.mak 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-isadm: test-isadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o isadm.o readpns.o
- $(COMPILER) -o test-isadm.exe pns.o matrix.o general.o matrixmath.o test-isadm.o MemoryManager.o readpns.o isadm.o ../liblpsolve55.a
+test-isadm: test-isadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o isadm.o test.o StructuredIO.o
+ $(COMPILER) -o test-isadm.exe pns.o matrix.o general.o matrixmath.o test-isadm.o MemoryManager.o test.o StructuredIO.o isadm.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
@@ -18,11 +18,14 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
-test-isadm.o: test-isadm.c ../spnbox.h ../../pnheaders/general.h ../MemoryManager.h ../../pnheaders/pns.h ../matrixmath.h readpns.h
+test-isadm.o: test-isadm.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
$(COMPILER) -c test-isadm.c
isadm.o: ../isadm.c ../spnbox.h ../../pnheaders/general.h ../MemoryManager.h ../../pnheaders/pns.h ../matrixmath.h
$(COMPILER) -c ../isadm.c
-readpns.o: readpns.c readpns.h ../matrixmath.h ../MemoryManager.h
- $(COMPILER) -c readpns.c
+test.o: test.c test.h ../../pnheaders/pns.h ../../pnheaders/matrix.h ../matrixmath.h ../spnbox.h ../MemoryManager.h StructuredIO.h
+ $(COMPILER) -c test.c
+
+StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
+ $(COMPILER) -c StructuredIO.c
Modified: spnbox/tests/test-isadm.txt
===================================================================
--- spnbox/tests/test-isadm.txt 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-isadm.txt 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,4 +1,4 @@
-echo -----------------Problem 1------------------
+echo Problem 1
echo Three Tank Problem A
echo The constraints should fail the structural admissibility test.
@@ -23,9 +23,9 @@
0 0 -1 0 0 -1 0 0 2
-endnet
+done
-echo -----------------Problem 2------------------
+echo Problem 2
echo Three Tank Problem B
echo The constraint should fail the structural admissibility test.
@@ -46,9 +46,9 @@
L 1 9
0 -1 0 0 -1 0 0 -1 0
-endnet
+done
-echo -----------------Problem 3------------------
+echo Problem 3
echo Using marking constraints only.
echo The first constraint should be structurally admissible
echo and the second inadmissible.
@@ -68,9 +68,9 @@
1 2 5 5
2 1 5 5
-endnet
+done
-echo -----------------Problem 4------------------
+echo Problem 4
echo Using C constraints only.
echo The first constraint should be structurally admissible
echo and the second inadmissible.
@@ -90,9 +90,9 @@
1 2 0 5
1 2 1 5
-endnet
+done
-echo -----------------Problem 5------------------
+echo Problem 5
echo The first constraint should be structurally admissible
echo and the second inadmissible.
D 4 4
@@ -111,6 +111,6 @@
0 10 3 5
1 10 3 5
-endnet
+done
quit
Modified: spnbox/tests/test-linenf.c
===================================================================
--- spnbox/tests/test-linenf.c 2009-07-01 19:19:23 UTC (rev 138)
+++ spnbox/tests/test-linenf.c 2009-07-01 19:39:53 UTC (rev 139)
@@ -1,385 +1,111 @@
-#include <stdio.h>
-#include <string.h>
-#include "../../pnheaders/pns.h"
-#include "../../pnheaders/general.h"
-#include "../spnbox.h"
-#include "../matrixmath.h"
-#include "../MemoryManager.h"
+#include "test.h"
-
-typedef struct linenf_problem
-{
- char ID[32];
- matrix* D;
- matrix* Dm;
- matrix* Dp;
- matrix* L;
- int* b;
- int* m0;
- matrix* F;
- matrix* C;
- int TucCount;
- int* Tuc;
- int TuoCount;
- int* Tuo;
-} linenf_problem;
-
-int* ReadIntArray(int length);
-void DisplayProblem(linenf_problem *p);
-int GetVector(MemoryManager *mem, char* name, int** v);
-int ParseProblem(MemoryManager* memory, linenf_problem* ret);
-int HasSelfLoops(matrix* Dm, matrix* Dp);
-int NullMatrix(matrix* m);
-int NullArray(int* Array, int Length);
-
-int is_verbose()
-{
- return VRB_MAX;
-}
-
-int main()
+int main(int argc, char* argv[])
{
- linenf_problem problem, solution;
+ FILE* input;
+ char IDesc[] = "matrix D, matrix Dm, matrix Dp, indexarray Tuc, indexarray Tuo, matrix L, matrix F, matrix C, arrayi b, arrayi m0";
+ char ODesc[] = "matrix Df, matrix Dfm, matrix Dfp, arrayi mso, string how, matrix Lf, matrix Cf";
+ int *IFilled;
+ int OFilled[8];
+ int Transitions;
+ matrix D, Dm, Dp, L, F, C, DNew;
+ int *b, *m0, *Tuc, *Tuo;
+ int bnum, m0num, TucCount, TuoCount;
+
linenf_r sol;
- char dummy[10];
- matrix dm, dp, D;
MemoryManager memory;
- int i, Constraints;
- while (1)
- {
- memory = CreateMemoryManager(4, 4, 0, 0);
- if (ParseProblem(&memory, &problem))
- {
- DisplayProblem(&problem);
- MAllocateMatrixType(&memory, 2, &dm, NumberOfRows(*problem.D), NumberOfColumns(*problem.D));
- MAllocateMatrixType(&memory, 2, &dp, NumberOfRows(*problem.D), NumberOfColumns(*problem.D));
- d2dd(problem.D, &dm, &dp);
- sol = linenf(&dm, &dp, problem.L, problem.b, problem.m0, problem.F, problem.C, problem.TucCount, problem.Tuc, problem.TuoCount, problem.Tuo);
- D = SubtractMatrix(&sol.Dfp, &sol.Dfm, (matrix*) 2);
- solution.Dm = &sol.Dfm;
- solution.Dp = &sol.Dfp;
- solution.ID[0] = '\0';
- solution.F = 0;
- solution.D = &D;
- solution.L = &sol.Lf;
...
[truncated message content] |
|
From: <Ste...@us...> - 2009-07-01 20:19:25
|
Revision: 140
http://pntool.svn.sourceforge.net/pntool/?rev=140&view=rev
Author: StephenCamp
Date: 2009-07-01 20:19:18 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Updated overall makefile to include spnbox libraries.
Modified Paths:
--------------
Makefile
Modified: Makefile
===================================================================
--- Makefile 2009-07-01 19:39:53 UTC (rev 139)
+++ Makefile 2009-07-01 20:19:18 UTC (rev 140)
@@ -33,7 +33,7 @@
objectfiles:
cd $(PNHEADERS); make
cd $(CODEGEN); make static
-# cd $(SPNBOX); make
+ cd $(SPNBOX); make
cd $(TRANSLATOR); make
main_function.o: $(PNHEADERS)/main_function.c $(PNHEADERS)/pns.h $(SPNBOX)/spnbox.h $(CODEGEN)/src/codegen.h
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 19:19:36
|
Revision: 138
http://pntool.svn.sourceforge.net/pntool/?rev=138&view=rev
Author: thecodeweasel
Date: 2009-07-01 19:19:23 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Cleaning up a lingering directory
Removed Paths:
-------------
translator/clibs/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 19:18:53
|
Revision: 137
http://pntool.svn.sourceforge.net/pntool/?rev=137&view=rev
Author: thecodeweasel
Date: 2009-07-01 19:18:27 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Populating pn_array on the specs structure
Modified Paths:
--------------
translator/docs/TODO.rtf
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/docs/TODO.rtf
===================================================================
--- translator/docs/TODO.rtf 2009-07-01 18:58:51 UTC (rev 136)
+++ translator/docs/TODO.rtf 2009-07-01 19:18:27 UTC (rev 137)
@@ -34,5 +34,8 @@
Type isn't being specified on constraint expressions\
\strike \strikec0 Apparently the constraint list was supposed to be a linked list. Change to use that.\strike0\striked0 \
Implement a tree walker to "balance" the equations\
+\strike \strikec0 reorganize to new directory structure\strike0\striked0 \
+\strike \strikec0 tie into main makefile\strike0\striked0 \
add is_verbose() support\
-update documentation}
\ No newline at end of file
+update documentation\
+get Drew his list of pn's}
\ No newline at end of file
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-01 18:58:51 UTC (rev 136)
+++ translator/pngenerator.c 2009-07-01 19:18:27 UTC (rev 137)
@@ -2,7 +2,7 @@
* This C source file was generated by $ANTLR version 3.1.2
*
* - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- * - On : 2009-07-01 03:22:05
+ * - On : 2009-07-01 14:17:31
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -1435,11 +1435,15 @@
void** list;
int i;
+ output->pn_num = threads->size(threads);
+ output->pn_array = tcalloc(output->pn_num, sizeof(pns*));
+
output->process_num = threads->size(threads);
output->process_array = tcalloc(output->process_num, sizeof(process));
for(i = 0; i < output->process_num; i++) {
list = (void**) threads->iter(threads, i);
output->process_array[i] = (process*) list[kPROC];
+ output->pn_array[i] = output->process_array[i]->pn;
}
output->constraint_list = constraintList;
ret= output;
@@ -1468,7 +1472,7 @@
/**
* $ANTLR start proc_definitions
- * /Users/bion/projects/iordache/translator/pngenerator.g:166:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:170:1: proc_definitions : ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) ;
*/
static void
proc_definitions(ppngenerator ctx)
@@ -1478,8 +1482,8 @@
ctx->ppngenerator_proc_definitionsTop = ppngenerator_proc_definitionsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:2: ( ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:4: ^( def_start ( trans_defs )* ( select_functions )* ( nondeterm )? )
{
FOLLOWPUSH(FOLLOW_def_start_in_proc_definitions98);
def_start(ctx);
@@ -1499,7 +1503,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:16: ( trans_defs )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:16: ( trans_defs )*
for (;;)
{
@@ -1517,7 +1521,7 @@
switch (alt5)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:16: trans_defs
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:16: trans_defs
{
FOLLOWPUSH(FOLLOW_trans_defs_in_proc_definitions100);
trans_defs(ctx);
@@ -1540,7 +1544,7 @@
loop5: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:28: ( select_functions )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:28: ( select_functions )*
for (;;)
{
@@ -1558,7 +1562,7 @@
switch (alt6)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:28: select_functions
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:28: select_functions
{
FOLLOWPUSH(FOLLOW_select_functions_in_proc_definitions103);
select_functions(ctx);
@@ -1581,7 +1585,7 @@
loop6: ; /* Jump out to here if this rule does not match */
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:46: ( nondeterm )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:46: ( nondeterm )?
{
int alt7=2;
{
@@ -1594,7 +1598,7 @@
switch (alt7)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:172:46: nondeterm
+ // /Users/bion/projects/iordache/translator/pngenerator.g:176:46: nondeterm
{
FOLLOWPUSH(FOLLOW_nondeterm_in_proc_definitions106);
nondeterm(ctx);
@@ -1644,7 +1648,7 @@
/**
* $ANTLR start def_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:173:1: def_start : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:177:1: def_start : ID ;
*/
static void
def_start(ppngenerator ctx)
@@ -1661,8 +1665,8 @@
ID1 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:177:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:177:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:181:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:181:4: ID
{
ID1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_def_start122);
if (HASEXCEPTION())
@@ -1718,7 +1722,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:200:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:204:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1729,7 +1733,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:201:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:205:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1762,7 +1766,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:201:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:205:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1777,7 +1781,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:202:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:206:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1814,7 +1818,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:203:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:207:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1837,11 +1841,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:209:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:209:4: ^( ( TO | FROM ) ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:213:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:213:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:209:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:213:6: ( TO | FROM )
{
int alt9=2;
@@ -1871,7 +1875,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:209:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:213:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1889,7 +1893,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:212:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:216:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1916,7 +1920,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:215:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:219:6: ( ID )+
{
int cnt10=0;
@@ -1936,7 +1940,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:215:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:219:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2003,7 +2007,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:219:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:223:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
*/
static void
trans_def(ppngenerator ctx)
@@ -2040,7 +2044,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:230:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:234:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
ANTLR3_UINT32 alt15;
@@ -2134,7 +2138,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:230:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:234:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2176,7 +2180,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:239:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:243:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2197,7 +2201,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:241:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:245:5: (place= ID )+
{
int cnt11=0;
@@ -2217,7 +2221,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:241:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:245:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2271,7 +2275,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:257:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:261:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2284,7 +2288,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:257:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:261:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2319,7 +2323,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:263:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:267:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2361,7 +2365,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:267:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:271:5: (place= ID )*
for (;;)
{
@@ -2379,7 +2383,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:267:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:271:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def249);
if (HASEXCEPTION())
@@ -2420,7 +2424,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:282:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:286:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2433,7 +2437,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:282:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:286:6: CODE_BLOCK
{
CODE_BLOCK8 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def258);
if (HASEXCEPTION())
@@ -2498,7 +2502,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:287:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:291:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2514,8 +2518,8 @@
CODE_BLOCK10 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:288:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:288:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:292:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:292:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions275);
if (HASEXCEPTION())
@@ -2581,7 +2585,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:295:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:299:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2595,8 +2599,8 @@
ID11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(45, &FOLLOW_45_in_nondeterm292);
if (HASEXCEPTION())
@@ -2611,7 +2615,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:34: ( ID )+
{
int cnt16=0;
@@ -2631,7 +2635,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:300:35: ID
{
ID11 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm295);
if (HASEXCEPTION())
@@ -2699,7 +2703,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:302:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:306:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2709,11 +2713,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:2: ( ( proc_init | sync_def | proc_start ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:4: ( proc_init | sync_def | proc_start )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2748,7 +2752,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations315);
proc_init(ctx);
@@ -2763,7 +2767,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations319);
sync_def(ctx);
@@ -2778,7 +2782,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:308:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:312:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations323);
proc_start(ctx);
@@ -2820,7 +2824,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:309:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:313:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2846,7 +2850,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:319:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -2898,7 +2902,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:315:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:319:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init340);
if (HASEXCEPTION())
@@ -2927,7 +2931,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:330:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:334:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init350);
if (HASEXCEPTION())
@@ -2958,7 +2962,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:342:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:346:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -2978,7 +2982,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:342:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:346:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init355);
numbered_ID12=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3068,7 +3072,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:361:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:365:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3088,8 +3092,8 @@
group_elements13 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:366:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:366:4: ^( SYNC_TOK ( group_elements )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:370:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:370:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def381);
if (HASEXCEPTION())
@@ -3104,7 +3108,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:366:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:370:15: ( group_elements )+
{
int cnt20=0;
@@ -3124,7 +3128,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:366:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:370:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def384);
group_elements13=group_elements(ctx);
@@ -3240,7 +3244,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:413:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:417:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3254,8 +3258,8 @@
ID14 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:414:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:414:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:418:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:418:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start401);
if (HASEXCEPTION())
@@ -3270,7 +3274,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:414:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:418:12: ( ID )+
{
int cnt21=0;
@@ -3290,7 +3294,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:414:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:418:13: ID
{
ID14 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start404);
if (HASEXCEPTION())
@@ -3360,7 +3364,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:422:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:426:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3374,8 +3378,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints424);
constraint_block(ctx);
@@ -3395,7 +3399,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3429,10 +3433,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:429:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:433:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints428);
eq15=eq(ctx);
@@ -3474,7 +3478,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:450:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:454:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints433);
live_def(ctx);
@@ -3489,7 +3493,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:450:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:454:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints435);
uncontrol(ctx);
@@ -3504,7 +3508,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:450:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:454:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints437);
unobserve(ctx);
@@ -3559,7 +3563,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:451:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:455:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3573,8 +3577,8 @@
ID16 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:452:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:452:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:456:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:456:4: ID
{
ID16 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block448);
if (HASEXCEPTION())
@@ -3625,7 +3629,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:471:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( EQS_OP leq= eq req= eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:475:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( EQS_OP leq= eq req= eq ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3658,7 +3662,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:475:2: ( relationalExpression | ^( EQS_OP leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:479:2: ( relationalExpression | ^( EQS_OP leq= eq req= eq ) )
ANTLR3_UINT32 alt23;
@@ -3691,7 +3695,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:475:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:479:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq471);
relationalExpression17=relationalExpression(ctx);
@@ -3709,7 +3713,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:476:4: ^( EQS_OP leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:480:4: ^( EQS_OP leq= eq req= eq )
{
MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq479);
if (HASEXCEPTION())
@@ -3806,7 +3810,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:497:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:501:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -3829,8 +3833,8 @@
NUM18 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:505:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:505:9: ^( EQ_OP additiveExpression[list, false] NUM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:509:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:509:9: ^( EQ_OP additiveExpression[list, false] NUM )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression522);
if (HASEXCEPTION())
@@ -3904,7 +3908,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:518:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:522:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
*/
static void
additiveExpression(ppngenerator ctx, pANTLR3_VECTOR list, bool flip)
@@ -3921,7 +3925,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:519:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:523:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
ANTLR3_UINT32 alt24;
@@ -3960,7 +3964,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:519:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:523:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression546);
primary19=primary(ctx, flip);
@@ -3978,7 +3982,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:520:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:524:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression558);
if (HASEXCEPTION())
@@ -4022,7 +4026,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:521:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:525:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression574);
if (HASEXCEPTION())
@@ -4088,7 +4092,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:523:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:527:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
*/
static variable*
primary(ppngenerator ctx, bool flip)
@@ -4114,7 +4118,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:524:5: ( group_elements | ^( MULT NUM group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:528:5: ( group_elements | ^( MULT NUM group_elements ) )
ANTLR3_UINT32 alt25;
@@ -4147,7 +4151,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:524:9: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:528:9: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary601);
group_elements20=group_elements(ctx);
@@ -4171,7 +4175,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:531:7: ^( MULT NUM group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:535:7: ^( MULT NUM group_elements )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary612);
if (HASEXCEPTION())
@@ -4243,7 +4247,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:538:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:542:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4260,7 +4264,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:539:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:543:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt28;
@@ -4331,7 +4335,7 @@
switch (alt28)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:539:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:543:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def629);
if (HASEXCEPTION())
@@ -4366,7 +4370,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:549:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:553:5: ( ID )*
for (;;)
{
@@ -4384,7 +4388,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:549:6: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:553:6: ID
{
ID23 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def636);
if (HASEXCEPTION())
@@ -4422,7 +4426,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:555:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:559:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def647);
if (HASEXCEPTION())
@@ -4437,7 +4441,7 @@
goto rulelive_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:555:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:559:11: ( ID )+
{
int cnt27=0;
@@ -4457,7 +4461,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:555:12: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:559:12: ID
{
ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def650);
if (HASEXCEPTION())
@@ -4528,7 +4532,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:560:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:564:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4542,8 +4546,8 @@
ID25 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:561:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:561:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:565:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:565:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol665);
if (HASEXCEPTION())
@@ -4558,7 +4562,7 @@
goto ruleuncontrolEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:561:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:565:16: ( ID )+
{
int cnt29=0;
@@ -4578,7 +4582,7 @@
switch (alt29)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:561:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:565:17: ID
{
ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol668);
if (HASEXCEPTION())
@@ -4646,7 +4650,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:566:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:570:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4660,8 +4664,8 @@
ID26 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:567:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:567:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:571:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:571:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve683);
if (HASEXCEPTION())
@@ -4676,7 +4680,7 @@
goto ruleunobserveEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:567:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:571:16: ( ID )+
{
int cnt30=0;
@@ -4696,7 +4700,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:567:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:571:17: ID
{
ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_unobserve686);
if (HASEXCEPTION())
@@ -4764,7 +4768,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:573:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:577:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4774,8 +4778,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:574:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:574:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:578:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:578:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands701);
print(ctx);
@@ -4809,7 +4813,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:575:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:579:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4819,8 +4823,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:576:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:576:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:580:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:580:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print712);
if (HASEXCEPTION())
@@ -4880,7 +4884,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:578:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:582:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
*/
static pANTLR3_VECTOR
group_elements(ppngenerator ctx)
@@ -4899,8 +4903,8 @@
ID27 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:582:2: ( ^( GROUP ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:582:4: ^( GROUP ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:2: ( ^( GROUP ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:4: ^( GROUP ( ID )+ )
{
MATCHT(GROUP, &FOLLOW_GROUP_in_group_elements737);
if (HASEXCEPTION())
@@ -4915,7 +4919,7 @@
goto rulegroup_elementsEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:582:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:12: ( ID )+
{
int cnt31=0;
@@ -4935,7 +4939,7 @@
switch (alt31)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:582:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:13: ID
{
ID27 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_group_elements740);
if (HASEXCEPTION())
@@ -5001,7 +5005,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:585:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:589:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
*/
static int*
numbered_ID(ppngenerator ctx, ASSOC_ARRAY* places)
@@ -5022,7 +5026,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:590:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt32;
@@ -5074,7 +5078,7 @@
switch (alt32)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:590:4: ID
{
ID28 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID759);
if (HASEXCEPTION())
@@ -5093,7 +5097,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:591:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:595:4: ^( ID INT )
{
ID29 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID767);
if (HASEXCEPTION())
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-07-01 18:58:51 UTC (rev 136)
+++ translator/pngenerator.g 2009-07-01 19:18:27 UTC (rev 137)
@@ -153,11 +153,15 @@
void** list;
int i;
+ output->pn_num = threads->size(threads);
+ output->pn_array = tcalloc(output->pn_num, sizeof(pns*));
+
output->process_num = threads->size(threads);
output->process_array = tcalloc(output->process_num, sizeof(process));
for(i = 0; i < output->process_num; i++) {
list = (void**) threads->iter(threads, i);
output->process_array[i] = (process*) list[kPROC];
+ output->pn_array[i] = output->process_array[i]->pn;
}
output->constraint_list = constraintList;
$ret = output;
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-01 18:58:51 UTC (rev 136)
+++ translator/pngenerator.h 2009-07-01 19:18:27 UTC (rev 137)
@@ -2,7 +2,7 @@
* This C header file was generated by $ANTLR version 3.1.2
*
* - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- * - On : 2009-07-01 03:22:05
+ * - On : 2009-07-01 14:17:31
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 18:59:12
|
Revision: 136
http://pntool.svn.sourceforge.net/pntool/?rev=136&view=rev
Author: thecodeweasel
Date: 2009-07-01 18:58:51 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Cygwin caught a bug
Modified Paths:
--------------
translator/Makefile
translator/docs/TODO.rtf
Modified: translator/Makefile
===================================================================
--- translator/Makefile 2009-07-01 18:47:53 UTC (rev 135)
+++ translator/Makefile 2009-07-01 18:58:51 UTC (rev 136)
@@ -1,5 +1,5 @@
COMPILER=gcc -g -Wall -O0
-INCLUDES=-iquote../pnheaders -Iclibs -I../third-party/ANTLR3_ctarget_3_1_3/include
+INCLUDES=-iquote../pnheaders -I../third-party/ANTLR3_ctarget_3_1_3 -I../third-party/ANTLR3_ctarget_3_1_3/include
pnscript : dataStructures.o main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o
$(COMPILER) -o pnscript dataStructures.o main.o pnscriptParser.o pnscriptLexer.o pncompactor.o pngenerator.o ../pnheaders/*.o ../third-party/ANTLR3_ctarget_3_1_3/*.o
Modified: translator/docs/TODO.rtf
===================================================================
--- translator/docs/TODO.rtf 2009-07-01 18:47:53 UTC (rev 135)
+++ translator/docs/TODO.rtf 2009-07-01 18:58:51 UTC (rev 136)
@@ -34,7 +34,5 @@
Type isn't being specified on constraint expressions\
\strike \strikec0 Apparently the constraint list was supposed to be a linked list. Change to use that.\strike0\striked0 \
Implement a tree walker to "balance" the equations\
-reorganize to new directory structure\
-tie into main makefile\
add is_verbose() support\
update documentation}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 18:47:58
|
Revision: 135
http://pntool.svn.sourceforge.net/pntool/?rev=135&view=rev
Author: thecodeweasel
Date: 2009-07-01 18:47:53 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Sorry, forgot to run distclean first
Removed Paths:
-------------
third-party/ANTLR3_ctarget_3_1_3/Makefile
third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.o
third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.o
third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.o
third-party/ANTLR3_ctarget_3_1_3/antlr3collections.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3collections.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3config.h
third-party/ANTLR3_ctarget_3_1_3/antlr3convertutf.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3convertutf.o
third-party/ANTLR3_ctarget_3_1_3/antlr3cyclicdfa.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3cyclicdfa.o
third-party/ANTLR3_ctarget_3_1_3/antlr3debughandlers.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3debughandlers.o
third-party/ANTLR3_ctarget_3_1_3/antlr3encodings.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3encodings.o
third-party/ANTLR3_ctarget_3_1_3/antlr3exception.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3exception.o
third-party/ANTLR3_ctarget_3_1_3/antlr3filestream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3filestream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3inputstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3inputstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3intstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3intstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3lexer.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3lexer.o
third-party/ANTLR3_ctarget_3_1_3/antlr3parser.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3parser.o
third-party/ANTLR3_ctarget_3_1_3/antlr3rewritestreams.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3rewritestreams.o
third-party/ANTLR3_ctarget_3_1_3/antlr3string.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3string.o
third-party/ANTLR3_ctarget_3_1_3/antlr3stringstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3stringstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3tokenstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3tokenstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3treeparser.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3treeparser.o
third-party/ANTLR3_ctarget_3_1_3/antlr3ucs2inputstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3ucs2inputstream.o
third-party/ANTLR3_ctarget_3_1_3/config.log
third-party/ANTLR3_ctarget_3_1_3/config.status
third-party/ANTLR3_ctarget_3_1_3/libantlr3c.la
third-party/ANTLR3_ctarget_3_1_3/libtool
third-party/ANTLR3_ctarget_3_1_3/stamp-h1
Deleted: third-party/ANTLR3_ctarget_3_1_3/Makefile
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/Makefile 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/Makefile 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,923 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-
-pkgdatadir = $(datadir)/libantlr3c
-pkglibdir = $(libdir)/libantlr3c
-pkgincludedir = $(includedir)/libantlr3c
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.7.0
-host_triplet = i386-apple-darwin9.7.0
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/antlr3config.h.in $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
- install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = antlr3config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libantlr3c_la_LIBADD =
-am__objects_1 = antlr3baserecognizer.lo antlr3basetree.lo \
- antlr3basetreeadaptor.lo antlr3bitset.lo antlr3collections.lo \
- antlr3commontoken.lo antlr3commontree.lo \
- antlr3commontreeadaptor.lo antlr3commontreenodestream.lo \
- antlr3convertutf.lo antlr3cyclicdfa.lo antlr3debughandlers.lo \
- antlr3encodings.lo antlr3exception.lo antlr3filestream.lo \
- antlr3inputstream.lo antlr3intstream.lo antlr3lexer.lo \
- antlr3parser.lo antlr3rewritestreams.lo antlr3string.lo \
- antlr3stringstream.lo antlr3tokenstream.lo antlr3treeparser.lo \
- antlr3ucs2inputstream.lo
-am_libantlr3c_la_OBJECTS = $(am__objects_1)
-libantlr3c_la_OBJECTS = $(am_libantlr3c_la_OBJECTS)
-libantlr3c_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libantlr3c_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(libantlr3c_la_SOURCES)
-DIST_SOURCES = $(libantlr3c_la_SOURCES)
-includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d $(distdir) \
- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run aclocal-1.10
-AMTAR = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run autoconf
-AUTOHEADER = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run autoheader
-AUTOMAKE = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run automake-1.10
-AWK = awk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -m32 -O2 -Wall
-CPP = gcc -E
-CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DSYMUTIL = dsymutil
-ECHO = /bin/echo
-ECHO_C = \c
-ECHO_N =
-ECHO_T =
-EGREP = /usr/bin/grep -E
-EXEEXT =
-F77 =
-FFLAGS =
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS =
-LIBOBJS =
-LIBS =
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS =
-MAINT = #
-MAKEINFO = ${SHELL} /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/missing --run makeinfo
-MKDIR_P = ./install-sh -c -d
-NMEDIT = nmedit
-OBJECT_MODE =
-OBJEXT = o
-PACKAGE = libantlr3c
-PACKAGE_BUGREPORT = ji...@id...
-PACKAGE_NAME = libantlr3c
-PACKAGE_STRING = libantlr3c 3.1.3
-PACKAGE_TARNAME = libantlr3c
-PACKAGE_VERSION = 3.1.3
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SED = /usr/bin/sed
-SET_MAKE =
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 3.1.3
-abs_builddir = /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3
-abs_srcdir = /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3
-abs_top_builddir = /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3
-abs_top_srcdir = /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.7.0
-build_alias =
-build_cpu = i386
-build_os = darwin9.7.0
-build_vendor = apple
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i386-apple-darwin9.7.0
-host_alias =
-host_cpu = i386
-host_os = darwin9.7.0
-host_vendor = apple
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /Users/bion/projects/iordache/third-party/ANTLR3_ctarget_3_1_3/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(top_builddir)/./install-sh -c -d
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix =
-top_builddir = .
-top_srcdir = .
-AUTOMAKE_OPTIONS = gnu
-AM_LIBTOOLFLAGS =
-lib_LTLIBRARIES = libantlr3c.la
-LIBSOURCES = src/antlr3baserecognizer.c \
- src/antlr3basetree.c \
- src/antlr3basetreeadaptor.c \
- src/antlr3bitset.c \
- src/antlr3collections.c \
- src/antlr3commontoken.c \
- src/antlr3commontree.c \
- src/antlr3commontreeadaptor.c \
- src/antlr3commontreenodestream.c \
- src/antlr3convertutf.c \
- src/antlr3cyclicdfa.c \
- src/antlr3debughandlers.c \
- src/antlr3encodings.c \
- src/antlr3exception.c \
- src/antlr3filestream.c \
- src/antlr3inputstream.c \
- src/antlr3intstream.c \
- src/antlr3lexer.c \
- src/antlr3parser.c \
- src/antlr3rewritestreams.c \
- src/antlr3string.c \
- src/antlr3stringstream.c \
- src/antlr3tokenstream.c \
- src/antlr3treeparser.c \
- src/antlr3ucs2inputstream.c
-
-libantlr3c_la_SOURCES = $(LIBSOURCES)
-include_HEADERS = include/antlr3.h \
- include/antlr3baserecognizer.h \
- include/antlr3basetree.h \
- include/antlr3basetreeadaptor.h \
- include/antlr3bitset.h \
- include/antlr3collections.h \
- include/antlr3commontoken.h \
- include/antlr3commontree.h \
- include/antlr3commontreeadaptor.h \
- include/antlr3commontreenodestream.h \
- include/antlr3convertutf.h \
- include/antlr3cyclicdfa.h \
- include/antlr3debugeventlistener.h \
- include/antlr3defs.h \
- include/antlr3encodings.h \
- include/antlr3errors.h \
- include/antlr3exception.h \
- include/antlr3filestream.h \
- include/antlr3input.h \
- include/antlr3interfaces.h \
- include/antlr3intstream.h \
- include/antlr3lexer.h \
- include/antlr3memory.h \
- include/antlr3parser.h \
- include/antlr3parsetree.h \
- include/antlr3recognizersharedstate.h \
- include/antlr3rewritestreams.h \
- include/antlr3string.h \
- include/antlr3stringstream.h \
- include/antlr3tokenstream.h \
- include/antlr3treeparser.h \
- antlr3config.h
-
-libantlr3c_la_LDFLAGS = -avoid-version
-INCLUDES = -Iinclude -Iinclude
-EXTRA_DIST = \
- vsrulefiles/antlr3lexerandparser.rules \
- vsrulefiles/antlr3lexer.rules \
- vsrulefiles/antlr3parser.rules \
- vsrulefiles/antlr3treeparser.rules \
- C.sln C.vcproj C.vcproj.vspscc \
- C.vssscc
-
-all: antlr3config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-am--refresh:
- @:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
- cd $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- echo ' $(SHELL) ./config.status'; \
- $(SHELL) ./config.status;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: # $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-antlr3config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- else :; fi
-
-stamp-h1: $(srcdir)/antlr3config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status antlr3config.h
-$(srcdir)/antlr3config.h.in: # $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f antlr3config.h stamp-h1
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- else :; fi; \
- done
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- p=$(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libantlr3c.la: $(libantlr3c_la_OBJECTS) $(libantlr3c_la_DEPENDENCIES)
- $(libantlr3c_la_LINK) -rpath $(libdir) $(libantlr3c_la_OBJECTS) $(libantlr3c_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-include ./$(DEPDIR)/antlr3baserecognizer.Plo
-include ./$(DEPDIR)/antlr3basetree.Plo
-include ./$(DEPDIR)/antlr3basetreeadaptor.Plo
-include ./$(DEPDIR)/antlr3bitset.Plo
-include ./$(DEPDIR)/antlr3collections.Plo
-include ./$(DEPDIR)/antlr3commontoken.Plo
-include ./$(DEPDIR)/antlr3commontree.Plo
-include ./$(DEPDIR)/antlr3commontreeadaptor.Plo
-include ./$(DEPDIR)/antlr3commontreenodestream.Plo
-include ./$(DEPDIR)/antlr3convertutf.Plo
-include ./$(DEPDIR)/antlr3cyclicdfa.Plo
-include ./$(DEPDIR)/antlr3debughandlers.Plo
-include ./$(DEPDIR)/antlr3encodings.Plo
-include ./$(DEPDIR)/antlr3exception.Plo
-include ./$(DEPDIR)/antlr3filestream.Plo
-include ./$(DEPDIR)/antlr3inputstream.Plo
-include ./$(DEPDIR)/antlr3intstream.Plo
-include ./$(DEPDIR)/antlr3lexer.Plo
-include ./$(DEPDIR)/antlr3parser.Plo
-include ./$(DEPDIR)/antlr3rewritestreams.Plo
-include ./$(DEPDIR)/antlr3string.Plo
-include ./$(DEPDIR)/antlr3stringstream.Plo
-include ./$(DEPDIR)/antlr3tokenstream.Plo
-include ./$(DEPDIR)/antlr3treeparser.Plo
-include ./$(DEPDIR)/antlr3ucs2inputstream.Plo
-
-.c.o:
- $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(COMPILE) -c $<
-
-.c.obj:
- $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
- $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-# source='$<' object='$@' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LTCOMPILE) -c -o $@ $<
-
-antlr3baserecognizer.lo: src/antlr3baserecognizer.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3baserecognizer.lo -MD -MP -MF $(DEPDIR)/antlr3baserecognizer.Tpo -c -o antlr3baserecognizer.lo `test -f 'src/antlr3baserecognizer.c' || echo '$(srcdir)/'`src/antlr3baserecognizer.c
- mv -f $(DEPDIR)/antlr3baserecognizer.Tpo $(DEPDIR)/antlr3baserecognizer.Plo
-# source='src/antlr3baserecognizer.c' object='antlr3baserecognizer.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3baserecognizer.lo `test -f 'src/antlr3baserecognizer.c' || echo '$(srcdir)/'`src/antlr3baserecognizer.c
-
-antlr3basetree.lo: src/antlr3basetree.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3basetree.lo -MD -MP -MF $(DEPDIR)/antlr3basetree.Tpo -c -o antlr3basetree.lo `test -f 'src/antlr3basetree.c' || echo '$(srcdir)/'`src/antlr3basetree.c
- mv -f $(DEPDIR)/antlr3basetree.Tpo $(DEPDIR)/antlr3basetree.Plo
-# source='src/antlr3basetree.c' object='antlr3basetree.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3basetree.lo `test -f 'src/antlr3basetree.c' || echo '$(srcdir)/'`src/antlr3basetree.c
-
-antlr3basetreeadaptor.lo: src/antlr3basetreeadaptor.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3basetreeadaptor.lo -MD -MP -MF $(DEPDIR)/antlr3basetreeadaptor.Tpo -c -o antlr3basetreeadaptor.lo `test -f 'src/antlr3basetreeadaptor.c' || echo '$(srcdir)/'`src/antlr3basetreeadaptor.c
- mv -f $(DEPDIR)/antlr3basetreeadaptor.Tpo $(DEPDIR)/antlr3basetreeadaptor.Plo
-# source='src/antlr3basetreeadaptor.c' object='antlr3basetreeadaptor.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3basetreeadaptor.lo `test -f 'src/antlr3basetreeadaptor.c' || echo '$(srcdir)/'`src/antlr3basetreeadaptor.c
-
-antlr3bitset.lo: src/antlr3bitset.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3bitset.lo -MD -MP -MF $(DEPDIR)/antlr3bitset.Tpo -c -o antlr3bitset.lo `test -f 'src/antlr3bitset.c' || echo '$(srcdir)/'`src/antlr3bitset.c
- mv -f $(DEPDIR)/antlr3bitset.Tpo $(DEPDIR)/antlr3bitset.Plo
-# source='src/antlr3bitset.c' object='antlr3bitset.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3bitset.lo `test -f 'src/antlr3bitset.c' || echo '$(srcdir)/'`src/antlr3bitset.c
-
-antlr3collections.lo: src/antlr3collections.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3collections.lo -MD -MP -MF $(DEPDIR)/antlr3collections.Tpo -c -o antlr3collections.lo `test -f 'src/antlr3collections.c' || echo '$(srcdir)/'`src/antlr3collections.c
- mv -f $(DEPDIR)/antlr3collections.Tpo $(DEPDIR)/antlr3collections.Plo
-# source='src/antlr3collections.c' object='antlr3collections.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3collections.lo `test -f 'src/antlr3collections.c' || echo '$(srcdir)/'`src/antlr3collections.c
-
-antlr3commontoken.lo: src/antlr3commontoken.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3commontoken.lo -MD -MP -MF $(DEPDIR)/antlr3commontoken.Tpo -c -o antlr3commontoken.lo `test -f 'src/antlr3commontoken.c' || echo '$(srcdir)/'`src/antlr3commontoken.c
- mv -f $(DEPDIR)/antlr3commontoken.Tpo $(DEPDIR)/antlr3commontoken.Plo
-# source='src/antlr3commontoken.c' object='antlr3commontoken.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3commontoken.lo `test -f 'src/antlr3commontoken.c' || echo '$(srcdir)/'`src/antlr3commontoken.c
-
-antlr3commontree.lo: src/antlr3commontree.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3commontree.lo -MD -MP -MF $(DEPDIR)/antlr3commontree.Tpo -c -o antlr3commontree.lo `test -f 'src/antlr3commontree.c' || echo '$(srcdir)/'`src/antlr3commontree.c
- mv -f $(DEPDIR)/antlr3commontree.Tpo $(DEPDIR)/antlr3commontree.Plo
-# source='src/antlr3commontree.c' object='antlr3commontree.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3commontree.lo `test -f 'src/antlr3commontree.c' || echo '$(srcdir)/'`src/antlr3commontree.c
-
-antlr3commontreeadaptor.lo: src/antlr3commontreeadaptor.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3commontreeadaptor.lo -MD -MP -MF $(DEPDIR)/antlr3commontreeadaptor.Tpo -c -o antlr3commontreeadaptor.lo `test -f 'src/antlr3commontreeadaptor.c' || echo '$(srcdir)/'`src/antlr3commontreeadaptor.c
- mv -f $(DEPDIR)/antlr3commontreeadaptor.Tpo $(DEPDIR)/antlr3commontreeadaptor.Plo
-# source='src/antlr3commontreeadaptor.c' object='antlr3commontreeadaptor.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3commontreeadaptor.lo `test -f 'src/antlr3commontreeadaptor.c' || echo '$(srcdir)/'`src/antlr3commontreeadaptor.c
-
-antlr3commontreenodestream.lo: src/antlr3commontreenodestream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3commontreenodestream.lo -MD -MP -MF $(DEPDIR)/antlr3commontreenodestream.Tpo -c -o antlr3commontreenodestream.lo `test -f 'src/antlr3commontreenodestream.c' || echo '$(srcdir)/'`src/antlr3commontreenodestream.c
- mv -f $(DEPDIR)/antlr3commontreenodestream.Tpo $(DEPDIR)/antlr3commontreenodestream.Plo
-# source='src/antlr3commontreenodestream.c' object='antlr3commontreenodestream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3commontreenodestream.lo `test -f 'src/antlr3commontreenodestream.c' || echo '$(srcdir)/'`src/antlr3commontreenodestream.c
-
-antlr3convertutf.lo: src/antlr3convertutf.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3convertutf.lo -MD -MP -MF $(DEPDIR)/antlr3convertutf.Tpo -c -o antlr3convertutf.lo `test -f 'src/antlr3convertutf.c' || echo '$(srcdir)/'`src/antlr3convertutf.c
- mv -f $(DEPDIR)/antlr3convertutf.Tpo $(DEPDIR)/antlr3convertutf.Plo
-# source='src/antlr3convertutf.c' object='antlr3convertutf.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3convertutf.lo `test -f 'src/antlr3convertutf.c' || echo '$(srcdir)/'`src/antlr3convertutf.c
-
-antlr3cyclicdfa.lo: src/antlr3cyclicdfa.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3cyclicdfa.lo -MD -MP -MF $(DEPDIR)/antlr3cyclicdfa.Tpo -c -o antlr3cyclicdfa.lo `test -f 'src/antlr3cyclicdfa.c' || echo '$(srcdir)/'`src/antlr3cyclicdfa.c
- mv -f $(DEPDIR)/antlr3cyclicdfa.Tpo $(DEPDIR)/antlr3cyclicdfa.Plo
-# source='src/antlr3cyclicdfa.c' object='antlr3cyclicdfa.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3cyclicdfa.lo `test -f 'src/antlr3cyclicdfa.c' || echo '$(srcdir)/'`src/antlr3cyclicdfa.c
-
-antlr3debughandlers.lo: src/antlr3debughandlers.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3debughandlers.lo -MD -MP -MF $(DEPDIR)/antlr3debughandlers.Tpo -c -o antlr3debughandlers.lo `test -f 'src/antlr3debughandlers.c' || echo '$(srcdir)/'`src/antlr3debughandlers.c
- mv -f $(DEPDIR)/antlr3debughandlers.Tpo $(DEPDIR)/antlr3debughandlers.Plo
-# source='src/antlr3debughandlers.c' object='antlr3debughandlers.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3debughandlers.lo `test -f 'src/antlr3debughandlers.c' || echo '$(srcdir)/'`src/antlr3debughandlers.c
-
-antlr3encodings.lo: src/antlr3encodings.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3encodings.lo -MD -MP -MF $(DEPDIR)/antlr3encodings.Tpo -c -o antlr3encodings.lo `test -f 'src/antlr3encodings.c' || echo '$(srcdir)/'`src/antlr3encodings.c
- mv -f $(DEPDIR)/antlr3encodings.Tpo $(DEPDIR)/antlr3encodings.Plo
-# source='src/antlr3encodings.c' object='antlr3encodings.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3encodings.lo `test -f 'src/antlr3encodings.c' || echo '$(srcdir)/'`src/antlr3encodings.c
-
-antlr3exception.lo: src/antlr3exception.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3exception.lo -MD -MP -MF $(DEPDIR)/antlr3exception.Tpo -c -o antlr3exception.lo `test -f 'src/antlr3exception.c' || echo '$(srcdir)/'`src/antlr3exception.c
- mv -f $(DEPDIR)/antlr3exception.Tpo $(DEPDIR)/antlr3exception.Plo
-# source='src/antlr3exception.c' object='antlr3exception.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3exception.lo `test -f 'src/antlr3exception.c' || echo '$(srcdir)/'`src/antlr3exception.c
-
-antlr3filestream.lo: src/antlr3filestream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3filestream.lo -MD -MP -MF $(DEPDIR)/antlr3filestream.Tpo -c -o antlr3filestream.lo `test -f 'src/antlr3filestream.c' || echo '$(srcdir)/'`src/antlr3filestream.c
- mv -f $(DEPDIR)/antlr3filestream.Tpo $(DEPDIR)/antlr3filestream.Plo
-# source='src/antlr3filestream.c' object='antlr3filestream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3filestream.lo `test -f 'src/antlr3filestream.c' || echo '$(srcdir)/'`src/antlr3filestream.c
-
-antlr3inputstream.lo: src/antlr3inputstream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3inputstream.lo -MD -MP -MF $(DEPDIR)/antlr3inputstream.Tpo -c -o antlr3inputstream.lo `test -f 'src/antlr3inputstream.c' || echo '$(srcdir)/'`src/antlr3inputstream.c
- mv -f $(DEPDIR)/antlr3inputstream.Tpo $(DEPDIR)/antlr3inputstream.Plo
-# source='src/antlr3inputstream.c' object='antlr3inputstream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3inputstream.lo `test -f 'src/antlr3inputstream.c' || echo '$(srcdir)/'`src/antlr3inputstream.c
-
-antlr3intstream.lo: src/antlr3intstream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3intstream.lo -MD -MP -MF $(DEPDIR)/antlr3intstream.Tpo -c -o antlr3intstream.lo `test -f 'src/antlr3intstream.c' || echo '$(srcdir)/'`src/antlr3intstream.c
- mv -f $(DEPDIR)/antlr3intstream.Tpo $(DEPDIR)/antlr3intstream.Plo
-# source='src/antlr3intstream.c' object='antlr3intstream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3intstream.lo `test -f 'src/antlr3intstream.c' || echo '$(srcdir)/'`src/antlr3intstream.c
-
-antlr3lexer.lo: src/antlr3lexer.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3lexer.lo -MD -MP -MF $(DEPDIR)/antlr3lexer.Tpo -c -o antlr3lexer.lo `test -f 'src/antlr3lexer.c' || echo '$(srcdir)/'`src/antlr3lexer.c
- mv -f $(DEPDIR)/antlr3lexer.Tpo $(DEPDIR)/antlr3lexer.Plo
-# source='src/antlr3lexer.c' object='antlr3lexer.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3lexer.lo `test -f 'src/antlr3lexer.c' || echo '$(srcdir)/'`src/antlr3lexer.c
-
-antlr3parser.lo: src/antlr3parser.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3parser.lo -MD -MP -MF $(DEPDIR)/antlr3parser.Tpo -c -o antlr3parser.lo `test -f 'src/antlr3parser.c' || echo '$(srcdir)/'`src/antlr3parser.c
- mv -f $(DEPDIR)/antlr3parser.Tpo $(DEPDIR)/antlr3parser.Plo
-# source='src/antlr3parser.c' object='antlr3parser.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3parser.lo `test -f 'src/antlr3parser.c' || echo '$(srcdir)/'`src/antlr3parser.c
-
-antlr3rewritestreams.lo: src/antlr3rewritestreams.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3rewritestreams.lo -MD -MP -MF $(DEPDIR)/antlr3rewritestreams.Tpo -c -o antlr3rewritestreams.lo `test -f 'src/antlr3rewritestreams.c' || echo '$(srcdir)/'`src/antlr3rewritestreams.c
- mv -f $(DEPDIR)/antlr3rewritestreams.Tpo $(DEPDIR)/antlr3rewritestreams.Plo
-# source='src/antlr3rewritestreams.c' object='antlr3rewritestreams.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3rewritestreams.lo `test -f 'src/antlr3rewritestreams.c' || echo '$(srcdir)/'`src/antlr3rewritestreams.c
-
-antlr3string.lo: src/antlr3string.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3string.lo -MD -MP -MF $(DEPDIR)/antlr3string.Tpo -c -o antlr3string.lo `test -f 'src/antlr3string.c' || echo '$(srcdir)/'`src/antlr3string.c
- mv -f $(DEPDIR)/antlr3string.Tpo $(DEPDIR)/antlr3string.Plo
-# source='src/antlr3string.c' object='antlr3string.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3string.lo `test -f 'src/antlr3string.c' || echo '$(srcdir)/'`src/antlr3string.c
-
-antlr3stringstream.lo: src/antlr3stringstream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3stringstream.lo -MD -MP -MF $(DEPDIR)/antlr3stringstream.Tpo -c -o antlr3stringstream.lo `test -f 'src/antlr3stringstream.c' || echo '$(srcdir)/'`src/antlr3stringstream.c
- mv -f $(DEPDIR)/antlr3stringstream.Tpo $(DEPDIR)/antlr3stringstream.Plo
-# source='src/antlr3stringstream.c' object='antlr3stringstream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3stringstream.lo `test -f 'src/antlr3stringstream.c' || echo '$(srcdir)/'`src/antlr3stringstream.c
-
-antlr3tokenstream.lo: src/antlr3tokenstream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3tokenstream.lo -MD -MP -MF $(DEPDIR)/antlr3tokenstream.Tpo -c -o antlr3tokenstream.lo `test -f 'src/antlr3tokenstream.c' || echo '$(srcdir)/'`src/antlr3tokenstream.c
- mv -f $(DEPDIR)/antlr3tokenstream.Tpo $(DEPDIR)/antlr3tokenstream.Plo
-# source='src/antlr3tokenstream.c' object='antlr3tokenstream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3tokenstream.lo `test -f 'src/antlr3tokenstream.c' || echo '$(srcdir)/'`src/antlr3tokenstream.c
-
-antlr3treeparser.lo: src/antlr3treeparser.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3treeparser.lo -MD -MP -MF $(DEPDIR)/antlr3treeparser.Tpo -c -o antlr3treeparser.lo `test -f 'src/antlr3treeparser.c' || echo '$(srcdir)/'`src/antlr3treeparser.c
- mv -f $(DEPDIR)/antlr3treeparser.Tpo $(DEPDIR)/antlr3treeparser.Plo
-# source='src/antlr3treeparser.c' object='antlr3treeparser.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3treeparser.lo `test -f 'src/antlr3treeparser.c' || echo '$(srcdir)/'`src/antlr3treeparser.c
-
-antlr3ucs2inputstream.lo: src/antlr3ucs2inputstream.c
- $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT antlr3ucs2inputstream.lo -MD -MP -MF $(DEPDIR)/antlr3ucs2inputstream.Tpo -c -o antlr3ucs2inputstream.lo `test -f 'src/antlr3ucs2inputstream.c' || echo '$(srcdir)/'`src/antlr3ucs2inputstream.c
- mv -f $(DEPDIR)/antlr3ucs2inputstream.Tpo $(DEPDIR)/antlr3ucs2inputstream.Plo
-# source='src/antlr3ucs2inputstream.c' object='antlr3ucs2inputstream.lo' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-# $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o antlr3ucs2inputstream.lo `test -f 'src/antlr3ucs2inputstream.c' || echo '$(srcdir)/'`src/antlr3ucs2inputstream.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-install-includeHEADERS: $(include_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
- @list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
- $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
- done
-
-uninstall-includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(include_HEADERS)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
- rm -f "$(DESTDIR)$(includedir)/$$f"; \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) antlr3config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) antlr3config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) antlr3config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- list='$(SOURCES) $(HEADERS) antlr3config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d $(distdir) || mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && cd $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @cd $(distuninstallcheck_dir) \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS) antlr3config.h
-installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-generic clean-libLTLIBRARIES clean-libtool ctags dist \
- dist-all dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ \
- dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-includeHEADERS install-info install-info-am \
- install-libLTLIBRARIES install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-includeHEADERS \
- uninstall-libLTLIBRARIES
-
-
-export OBJECT_MODE
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3baserecognizer.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3baserecognizer.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3baserecognizer.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3basetree.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3basetree.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3basetree.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3basetreeadaptor.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3basetreeadaptor.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3basetreeadaptor.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3bitset.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3bitset.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3bitset.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3collections.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3collections.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3collections.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3collections.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3collections.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3collections.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3collections.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3commontoken.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3commontoken.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3commontoken.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3commontree.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3commontree.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3commontree.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3commontreeadaptor.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3commontreeadaptor.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3commontreeadaptor.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.lo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.lo 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.lo 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,12 +0,0 @@
-# antlr3commontreenodestream.lo - a libtool object file
-# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object='.libs/antlr3commontreenodestream.o'
-
-# Name of the non-PIC object.
-non_pic_object='antlr3commontreenodestream.o'
-
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.o
===================================================================
(Binary files differ)
Deleted: third-party/ANTLR3_ctarget_3_1_3/antlr3config.h
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/antlr3config.h 2009-07-01 18:46:00 UTC (rev 134)
+++ third-party/ANTLR3_ctarget_3_1_3/antlr3config.h 2009-07-01 18:47:53 UTC (rev 135)
@@ -1,180 +0,0 @@
-/* antlr3config.h. Generated from antlr3config.h.in by configure. */
-/* antlr3config.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if ANTLR debugger not required */
-/* #undef ANTLR3_NODEBUGGER */
-
-/* Define if 64 bit mode required */
-/* #undef ANTLR3_USE_64BIT */
-
-/* Define to 1 if you have the `accept' function. */
-#define HAVE_ACCEPT 1
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if the system has the type `intptr_t'. */
-#define HAVE_INTPTR_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-/* #undef HAVE_MALLOC_H */
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the <resolv.h> header file. */
-#define ...
[truncated message content] |
|
From: <the...@us...> - 2009-07-01 18:46:09
|
Revision: 134
http://pntool.svn.sourceforge.net/pntool/?rev=134&view=rev
Author: thecodeweasel
Date: 2009-07-01 18:46:00 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Moving things to support the new directory structure
The translator now builds from the main makefile
Modified Paths:
--------------
Makefile
translator/Makefile
translator/clibs.patch
translator/pngenerator.c
Added Paths:
-----------
third-party/ANTLR3_ctarget_3_1_3/
third-party/ANTLR3_ctarget_3_1_3/.deps/
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3convertutf.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3cyclicdfa.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3debughandlers.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3encodings.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3exception.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3filestream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3inputstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3intstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3lexer.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3parser.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3rewritestreams.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3string.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3stringstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3tokenstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3treeparser.Plo
third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3ucs2inputstream.Plo
third-party/ANTLR3_ctarget_3_1_3/.libs/
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3baserecognizer.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3basetree.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3basetreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3bitset.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3collections.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontoken.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontree.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3commontreenodestream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3convertutf.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3cyclicdfa.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3debughandlers.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3encodings.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3exception.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3filestream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3inputstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3intstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3lexer.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3parser.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3rewritestreams.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3string.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3stringstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3tokenstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3treeparser.o
third-party/ANTLR3_ctarget_3_1_3/.libs/antlr3ucs2inputstream.o
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.a
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Info.plist
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Resources/
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Resources/DWARF/
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.dylib.dSYM/Contents/Resources/DWARF/libantlr3c.dylib
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.la
third-party/ANTLR3_ctarget_3_1_3/.libs/libantlr3c.lai
third-party/ANTLR3_ctarget_3_1_3/AUTHORS
third-party/ANTLR3_ctarget_3_1_3/C.sln
third-party/ANTLR3_ctarget_3_1_3/C.vcproj
third-party/ANTLR3_ctarget_3_1_3/C.vcproj.vspscc
third-party/ANTLR3_ctarget_3_1_3/C.vssscc
third-party/ANTLR3_ctarget_3_1_3/COPYING
third-party/ANTLR3_ctarget_3_1_3/ChangeLog
third-party/ANTLR3_ctarget_3_1_3/INSTALL
third-party/ANTLR3_ctarget_3_1_3/Makefile
third-party/ANTLR3_ctarget_3_1_3/Makefile.am
third-party/ANTLR3_ctarget_3_1_3/Makefile.in
third-party/ANTLR3_ctarget_3_1_3/NEWS
third-party/ANTLR3_ctarget_3_1_3/README
third-party/ANTLR3_ctarget_3_1_3/aclocal.m4
third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3baserecognizer.o
third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3basetree.o
third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3basetreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3bitset.o
third-party/ANTLR3_ctarget_3_1_3/antlr3collections.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3collections.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontoken.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontree.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreeadaptor.o
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3commontreenodestream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3config.h
third-party/ANTLR3_ctarget_3_1_3/antlr3config.h.in
third-party/ANTLR3_ctarget_3_1_3/antlr3convertutf.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3convertutf.o
third-party/ANTLR3_ctarget_3_1_3/antlr3cyclicdfa.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3cyclicdfa.o
third-party/ANTLR3_ctarget_3_1_3/antlr3debughandlers.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3debughandlers.o
third-party/ANTLR3_ctarget_3_1_3/antlr3encodings.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3encodings.o
third-party/ANTLR3_ctarget_3_1_3/antlr3exception.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3exception.o
third-party/ANTLR3_ctarget_3_1_3/antlr3filestream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3filestream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3inputstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3inputstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3intstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3intstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3lexer.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3lexer.o
third-party/ANTLR3_ctarget_3_1_3/antlr3parser.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3parser.o
third-party/ANTLR3_ctarget_3_1_3/antlr3rewritestreams.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3rewritestreams.o
third-party/ANTLR3_ctarget_3_1_3/antlr3string.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3string.o
third-party/ANTLR3_ctarget_3_1_3/antlr3stringstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3stringstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3tokenstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3tokenstream.o
third-party/ANTLR3_ctarget_3_1_3/antlr3treeparser.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3treeparser.o
third-party/ANTLR3_ctarget_3_1_3/antlr3ucs2inputstream.lo
third-party/ANTLR3_ctarget_3_1_3/antlr3ucs2inputstream.o
third-party/ANTLR3_ctarget_3_1_3/config.guess
third-party/ANTLR3_ctarget_3_1_3/config.log
third-party/ANTLR3_ctarget_3_1_3/config.status
third-party/ANTLR3_ctarget_3_1_3/config.sub
third-party/ANTLR3_ctarget_3_1_3/configure
third-party/ANTLR3_ctarget_3_1_3/configure.ac
third-party/ANTLR3_ctarget_3_1_3/depcomp
third-party/ANTLR3_ctarget_3_1_3/include/
third-party/ANTLR3_ctarget_3_1_3/include/antlr3.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3baserecognizer.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3basetree.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3basetreeadaptor.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3bitset.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3collections.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3commontoken.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3commontree.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3commontreeadaptor.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3commontreeadaptor.h.rej
third-party/ANTLR3_ctarget_3_1_3/include/antlr3commontreenodestream.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3convertutf.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3cyclicdfa.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3debugeventlistener.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3defs.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3encodings.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3errors.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3exception.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3filestream.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3input.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3interfaces.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3intstream.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3lexer.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3memory.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3parser.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3parsetree.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3recognizersharedstate.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3rewritestreams.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3string.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3stringstream.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3tokenstream.h
third-party/ANTLR3_ctarget_3_1_3/include/antlr3treeparser.h
third-party/ANTLR3_ctarget_3_1_3/install-sh
third-party/ANTLR3_ctarget_3_1_3/libantlr3c.la
third-party/ANTLR3_ctarget_3_1_3/libtool
third-party/ANTLR3_ctarget_3_1_3/ltmain.sh
third-party/ANTLR3_ctarget_3_1_3/missing
third-party/ANTLR3_ctarget_3_1_3/src/
third-party/ANTLR3_ctarget_3_1_3/src/antlr3baserecognizer.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3basetree.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3basetree.c.rej
third-party/ANTLR3_ctarget_3_1_3/src/antlr3basetreeadaptor.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3bitset.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3collections.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3commontoken.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3commontree.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3commontreeadaptor.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3commontreeadaptor.c.rej
third-party/ANTLR3_ctarget_3_1_3/src/antlr3commontreenodestream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3convertutf.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3cyclicdfa.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3debughandlers.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3encodings.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3exception.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3filestream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3inputstream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3intstream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3lexer.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3parser.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3rewritestreams.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3string.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3stringstream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3tokenstream.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3treeparser.c
third-party/ANTLR3_ctarget_3_1_3/src/antlr3ucs2inputstream.c
third-party/ANTLR3_ctarget_3_1_3/stamp-h1
third-party/ANTLR3_ctarget_3_1_3/vsrulefiles/
third-party/ANTLR3_ctarget_3_1_3/vsrulefiles/antlr3lexer.rules
third-party/ANTLR3_ctarget_3_1_3/vsrulefiles/antlr3lexerandparser.rules
third-party/ANTLR3_ctarget_3_1_3/vsrulefiles/antlr3parser.rules
third-party/ANTLR3_ctarget_3_1_3/vsrulefiles/antlr3treeparser.rules
Modified: Makefile
===================================================================
--- Makefile 2009-07-01 16:31:58 UTC (rev 133)
+++ Makefile 2009-07-01 18:46:00 UTC (rev 134)
@@ -34,7 +34,7 @@
cd $(PNHEADERS); make
cd $(CODEGEN); make static
# cd $(SPNBOX); make
-# cd $(TRANSLATOR); make
+ cd $(TRANSLATOR); make
main_function.o: $(PNHEADERS)/main_function.c $(PNHEADERS)/pns.h $(SPNBOX)/spnbox.h $(CODEGEN)/src/codegen.h
$(COMPILER) -c $(PNHEADERS)/main_function.c -Ispnbox -I$(CODEGEN)/src -I$(PNHEADERS)
@@ -42,7 +42,8 @@
clean:
rm -f main_function.o
cd codegen; make clean
-
+ cd $(TRANSLATOR); make clean
distclean: clean
cd codegen; make distclean
+ cd $(TRANSLATOR); make distclean
\ No newline at end of file
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,210 @@
+antlr3baserecognizer.lo antlr3baserecognizer.o: \
+ src/antlr3baserecognizer.c include/antlr3baserecognizer.h \
+ include/antlr3defs.h include/antlr3errors.h antlr3config.h \
+ /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+ /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+ /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3exception.h \
+ include/antlr3input.h include/antlr3string.h \
+ include/antlr3collections.h include/antlr3commontoken.h \
+ include/antlr3intstream.h include/antlr3tokenstream.h \
+ include/antlr3bitset.h include/antlr3debugeventlistener.h \
+ include/antlr3basetree.h include/antlr3commontreenodestream.h \
+ include/antlr3commontreeadaptor.h include/antlr3basetreeadaptor.h \
+ include/antlr3commontree.h include/antlr3recognizersharedstate.h \
+ include/antlr3lexer.h include/antlr3parser.h include/antlr3treeparser.h
+
+include/antlr3baserecognizer.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3exception.h:
+
+include/antlr3input.h:
+
+include/antlr3string.h:
+
+include/antlr3collections.h:
+
+include/antlr3commontoken.h:
+
+include/antlr3intstream.h:
+
+include/antlr3tokenstream.h:
+
+include/antlr3bitset.h:
+
+include/antlr3debugeventlistener.h:
+
+include/antlr3basetree.h:
+
+include/antlr3commontreenodestream.h:
+
+include/antlr3commontreeadaptor.h:
+
+include/antlr3basetreeadaptor.h:
+
+include/antlr3commontree.h:
+
+include/antlr3recognizersharedstate.h:
+
+include/antlr3lexer.h:
+
+include/antlr3parser.h:
+
+include/antlr3treeparser.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3baserecognizer.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,170 @@
+antlr3basetree.lo antlr3basetree.o: src/antlr3basetree.c \
+ include/antlr3basetree.h include/antlr3defs.h include/antlr3errors.h \
+ antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
+ /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+ /usr/include/machine/_types.h /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3collections.h \
+ include/antlr3string.h
+
+include/antlr3basetree.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3collections.h:
+
+include/antlr3string.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetree.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,178 @@
+antlr3basetreeadaptor.lo antlr3basetreeadaptor.o: \
+ src/antlr3basetreeadaptor.c include/antlr3basetreeadaptor.h \
+ include/antlr3defs.h include/antlr3errors.h antlr3config.h \
+ /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+ /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+ /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3collections.h \
+ include/antlr3string.h include/antlr3basetree.h \
+ include/antlr3commontoken.h include/antlr3debugeventlistener.h
+
+include/antlr3basetreeadaptor.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3collections.h:
+
+include/antlr3string.h:
+
+include/antlr3basetree.h:
+
+include/antlr3commontoken.h:
+
+include/antlr3debugeventlistener.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3basetreeadaptor.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,167 @@
+antlr3bitset.lo antlr3bitset.o: src/antlr3bitset.c include/antlr3bitset.h \
+ include/antlr3defs.h include/antlr3errors.h antlr3config.h \
+ /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+ /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+ /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3collections.h
+
+include/antlr3bitset.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3collections.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3bitset.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,222 @@
+antlr3collections.lo antlr3collections.o: src/antlr3collections.c \
+ include/antlr3.h include/antlr3defs.h include/antlr3errors.h \
+ antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
+ /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+ /usr/include/machine/_types.h /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3exception.h \
+ include/antlr3encodings.h include/antlr3string.h \
+ include/antlr3collections.h include/antlr3input.h \
+ include/antlr3commontoken.h include/antlr3intstream.h \
+ include/antlr3cyclicdfa.h include/antlr3baserecognizer.h \
+ include/antlr3tokenstream.h include/antlr3bitset.h \
+ include/antlr3debugeventlistener.h include/antlr3basetree.h \
+ include/antlr3commontreenodestream.h include/antlr3commontreeadaptor.h \
+ include/antlr3basetreeadaptor.h include/antlr3commontree.h \
+ include/antlr3recognizersharedstate.h include/antlr3lexer.h \
+ include/antlr3parser.h include/antlr3treeparser.h \
+ include/antlr3filestream.h include/antlr3rewritestreams.h
+
+include/antlr3.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3exception.h:
+
+include/antlr3encodings.h:
+
+include/antlr3string.h:
+
+include/antlr3collections.h:
+
+include/antlr3input.h:
+
+include/antlr3commontoken.h:
+
+include/antlr3intstream.h:
+
+include/antlr3cyclicdfa.h:
+
+include/antlr3baserecognizer.h:
+
+include/antlr3tokenstream.h:
+
+include/antlr3bitset.h:
+
+include/antlr3debugeventlistener.h:
+
+include/antlr3basetree.h:
+
+include/antlr3commontreenodestream.h:
+
+include/antlr3commontreeadaptor.h:
+
+include/antlr3basetreeadaptor.h:
+
+include/antlr3commontree.h:
+
+include/antlr3recognizersharedstate.h:
+
+include/antlr3lexer.h:
+
+include/antlr3parser.h:
+
+include/antlr3treeparser.h:
+
+include/antlr3filestream.h:
+
+include/antlr3rewritestreams.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3collections.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,222 @@
+antlr3commontoken.lo antlr3commontoken.o: src/antlr3commontoken.c \
+ include/antlr3.h include/antlr3defs.h include/antlr3errors.h \
+ antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
+ /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+ /usr/include/machine/_types.h /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3exception.h \
+ include/antlr3encodings.h include/antlr3string.h \
+ include/antlr3collections.h include/antlr3input.h \
+ include/antlr3commontoken.h include/antlr3intstream.h \
+ include/antlr3cyclicdfa.h include/antlr3baserecognizer.h \
+ include/antlr3tokenstream.h include/antlr3bitset.h \
+ include/antlr3debugeventlistener.h include/antlr3basetree.h \
+ include/antlr3commontreenodestream.h include/antlr3commontreeadaptor.h \
+ include/antlr3basetreeadaptor.h include/antlr3commontree.h \
+ include/antlr3recognizersharedstate.h include/antlr3lexer.h \
+ include/antlr3parser.h include/antlr3treeparser.h \
+ include/antlr3filestream.h include/antlr3rewritestreams.h
+
+include/antlr3.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3exception.h:
+
+include/antlr3encodings.h:
+
+include/antlr3string.h:
+
+include/antlr3collections.h:
+
+include/antlr3input.h:
+
+include/antlr3commontoken.h:
+
+include/antlr3intstream.h:
+
+include/antlr3cyclicdfa.h:
+
+include/antlr3baserecognizer.h:
+
+include/antlr3tokenstream.h:
+
+include/antlr3bitset.h:
+
+include/antlr3debugeventlistener.h:
+
+include/antlr3basetree.h:
+
+include/antlr3commontreenodestream.h:
+
+include/antlr3commontreeadaptor.h:
+
+include/antlr3basetreeadaptor.h:
+
+include/antlr3commontree.h:
+
+include/antlr3recognizersharedstate.h:
+
+include/antlr3lexer.h:
+
+include/antlr3parser.h:
+
+include/antlr3treeparser.h:
+
+include/antlr3filestream.h:
+
+include/antlr3rewritestreams.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontoken.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,175 @@
+antlr3commontree.lo antlr3commontree.o: src/antlr3commontree.c \
+ include/antlr3commontree.h include/antlr3defs.h include/antlr3errors.h \
+ antlr3config.h /usr/include/stdio.h /usr/include/_types.h \
+ /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
+ /usr/include/machine/_types.h /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3basetree.h \
+ include/antlr3collections.h include/antlr3string.h \
+ include/antlr3commontoken.h
+
+include/antlr3commontree.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3basetree.h:
+
+include/antlr3collections.h:
+
+include/antlr3string.h:
+
+include/antlr3commontoken.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontree.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,183 @@
+antlr3commontreeadaptor.lo antlr3commontreeadaptor.o: \
+ src/antlr3commontreeadaptor.c include/antlr3commontreeadaptor.h \
+ include/antlr3defs.h include/antlr3errors.h antlr3config.h \
+ /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+ /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+ /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3collections.h \
+ include/antlr3string.h include/antlr3basetreeadaptor.h \
+ include/antlr3basetree.h include/antlr3commontoken.h \
+ include/antlr3debugeventlistener.h include/antlr3commontree.h
+
+include/antlr3commontreeadaptor.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h:
+
+/usr/include/string.h:
+
+/usr/include/strings.h:
+
+/usr/include/inttypes.h:
+
+/usr/include/unistd.h:
+
+/usr/include/sys/unistd.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/sys/_select.h:
+
+/usr/include/netinet/in.h:
+
+/usr/include/sys/socket.h:
+
+/usr/include/machine/_param.h:
+
+/usr/include/i386/_param.h:
+
+/usr/include/netinet6/in6.h:
+
+/usr/include/netinet/tcp.h:
+
+/usr/include/arpa/nameser.h:
+
+/usr/include/sys/param.h:
+
+/usr/include/sys/syslimits.h:
+
+/usr/include/machine/param.h:
+
+/usr/include/i386/param.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
+
+/usr/include/limits.h:
+
+/usr/include/machine/limits.h:
+
+/usr/include/i386/limits.h:
+
+/usr/include/i386/_limits.h:
+
+/usr/include/netdb.h:
+
+/usr/include/sys/malloc.h:
+
+/usr/include/ctype.h:
+
+/usr/include/runetype.h:
+
+include/antlr3interfaces.h:
+
+include/antlr3convertutf.h:
+
+include/antlr3collections.h:
+
+include/antlr3string.h:
+
+include/antlr3basetreeadaptor.h:
+
+include/antlr3basetree.h:
+
+include/antlr3commontoken.h:
+
+include/antlr3debugeventlistener.h:
+
+include/antlr3commontree.h:
Property changes on: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreeadaptor.Plo
___________________________________________________________________
Added: svn:eol-style
+ native
Added: third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo
===================================================================
--- third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo (rev 0)
+++ third-party/ANTLR3_ctarget_3_1_3/.deps/antlr3commontreenodestream.Plo 2009-07-01 18:46:00 UTC (rev 134)
@@ -0,0 +1,188 @@
+antlr3commontreenodestream.lo antlr3commontreenodestream.o: \
+ src/antlr3commontreenodestream.c include/antlr3commontreenodestream.h \
+ include/antlr3defs.h include/antlr3errors.h antlr3config.h \
+ /usr/include/stdio.h /usr/include/_types.h /usr/include/sys/_types.h \
+ /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
+ /usr/include/i386/_types.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h \
+ /usr/include/sys/types.h /usr/include/sys/appleapiopts.h \
+ /usr/include/machine/types.h /usr/include/i386/types.h \
+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/sys/_structs.h \
+ /usr/include/sys/stat.h /usr/include/stdlib.h /usr/include/available.h \
+ /usr/include/sys/wait.h /usr/include/sys/signal.h \
+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
+ /usr/include/i386/_structs.h /usr/include/machine/_structs.h \
+ /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
+ /usr/include/alloca.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stddef.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdarg.h \
+ /usr/include/string.h /usr/include/strings.h /usr/include/inttypes.h \
+ /usr/include/unistd.h /usr/include/sys/unistd.h \
+ /usr/include/sys/select.h /usr/include/sys/_select.h \
+ /usr/include/netinet/in.h /usr/include/sys/socket.h \
+ /usr/include/machine/_param.h /usr/include/i386/_param.h \
+ /usr/include/netinet6/in6.h /usr/include/netinet/tcp.h \
+ /usr/include/arpa/nameser.h /usr/include/sys/param.h \
+ /usr/include/sys/syslimits.h /usr/include/machine/param.h \
+ /usr/include/i386/param.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
+ /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
+ /usr/include/limits.h /usr/include/machine/limits.h \
+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
+ /usr/include/netdb.h /usr/include/sys/malloc.h /usr/include/ctype.h \
+ /usr/include/runetype.h include/antlr3interfaces.h \
+ include/antlr3convertutf.h include/antlr3commontreeadaptor.h \
+ include/antlr3collections.h include/antlr3string.h \
+ include/antlr3basetreeadaptor.h include/antlr3basetree.h \
+ include/antlr3commontoken.h include/antlr3debugeventlistener.h \
+ include/antlr3commontree.h include/antlr3intstream.h
+
+include/antlr3commontreenodestream.h:
+
+include/antlr3defs.h:
+
+include/antlr3errors.h:
+
+antlr3config.h:
+
+/usr/include/stdio.h:
+
+/usr/include/_types.h:
+
+/usr/include/sys/_types.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/machine/_types.h:
+
+/usr/include/i386/_types.h:
+
+/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/stdint.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/appleapiopts.h:
+
+/usr/include/machine/types.h:
+
+/usr/include/i386/types.h:
+
+/usr/include/machine/endian.h:
+
+/usr/include/i386/endian.h:
+
+/usr/include/sys/_endian.h:
+
+/usr/include/libkern/_OSByteOrder.h:
+
+/usr/include/libkern/i386/_OSByteOrder.h:
+
+/usr/include/sys/_structs.h:
+
+/usr/include/sys/stat.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/available.h:
+
+/usr/include/sys/wait.h:
+
+/usr/include/sys/signal.h:
+
+/usr/include/machine/signal.h:
+
+/usr/include/i386/signal.h:
+
+/usr/include/i386/_structs.h:
+
+/usr/include/machine/_structs.h:
+
+/usr/include/mach/i386/_structs.h:
+
+/usr/include/sys/resource.h:
+
+/usr/include/alloca...
[truncated message content] |
|
From: <Ste...@us...> - 2009-07-01 16:32:11
|
Revision: 133
http://pntool.svn.sourceforge.net/pntool/?rev=133&view=rev
Author: StephenCamp
Date: 2009-07-01 16:31:58 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Re-adding lpsolve, the MILP solver. I made a mistake and lost some files when I moved it to the third-party folder earlier.
Added Paths:
-----------
third-party/lp_solve_5.5/
third-party/lp_solve_5.5/Makefile
third-party/lp_solve_5.5/Makefile.Linux
third-party/lp_solve_5.5/Makefile.in
third-party/lp_solve_5.5/Makefile.msc
third-party/lp_solve_5.5/README.txt
third-party/lp_solve_5.5/bfp/
third-party/lp_solve_5.5/bfp/bfp_LUSOL/
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/LUSOL-overview.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/LUSOL_LGPL.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/LUSOL_Overview.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/LUSOL_README.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/Row-based L0.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/Victoria1850.RUA
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/bfile3.txt
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/hbio.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/hbio.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol1.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol2.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol6a.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol6l0.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol6u.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol7a.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusol8a.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusolio.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusolio.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusolmain.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/lusolmain.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/mmio.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/mmio.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/myblas.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/myblas.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/sherman5.mtx
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/sherman5_rhs1.mtx
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/sparselib.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/LUSOL/sparselib.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/bfp_LUSOL.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/bfp_LUSOL.h
third-party/lp_solve_5.5/bfp/bfp_LUSOL/lp_LUSOL.c
third-party/lp_solve_5.5/bfp/bfp_LUSOL/lp_LUSOL.h
third-party/lp_solve_5.5/bfp/lp_BFP.h
third-party/lp_solve_5.5/bfp/lp_BFP1.c
third-party/lp_solve_5.5/bfp/lp_BFP2.c
third-party/lp_solve_5.5/colamd/
third-party/lp_solve_5.5/colamd/colamd.c
third-party/lp_solve_5.5/colamd/colamd.h
third-party/lp_solve_5.5/configure
third-party/lp_solve_5.5/configure.ac
third-party/lp_solve_5.5/declare.h
third-party/lp_solve_5.5/demo/
third-party/lp_solve_5.5/demo/cbcc32.bat
third-party/lp_solve_5.5/demo/ccc
third-party/lp_solve_5.5/demo/ccc.osx
third-party/lp_solve_5.5/demo/cgcc.bat
third-party/lp_solve_5.5/demo/cvc6.bat
third-party/lp_solve_5.5/demo/cvc8.bat
third-party/lp_solve_5.5/demo/demo.c
third-party/lp_solve_5.5/demo/demo.sln
third-party/lp_solve_5.5/demo/demo.vcproj
third-party/lp_solve_5.5/demo/demolib.sln
third-party/lp_solve_5.5/demo/demolib.vcproj
third-party/lp_solve_5.5/demo/readme.txt
third-party/lp_solve_5.5/doc/
third-party/lp_solve_5.5/doc/AMPL.htm
third-party/lp_solve_5.5/doc/BFP.htm
third-party/lp_solve_5.5/doc/Build.htm
third-party/lp_solve_5.5/doc/CPLEX-format.htm
third-party/lp_solve_5.5/doc/DIMACS_asn.htm
third-party/lp_solve_5.5/doc/DIMACS_maxf.htm
third-party/lp_solve_5.5/doc/DIMACS_mcf.htm
third-party/lp_solve_5.5/doc/FAQ.htm
third-party/lp_solve_5.5/doc/IDE/
third-party/lp_solve_5.5/doc/IDE/IDE1.gif
third-party/lp_solve_5.5/doc/IDE/IDE2.gif
third-party/lp_solve_5.5/doc/IDE/IDE3.gif
third-party/lp_solve_5.5/doc/IDE/IDE4.gif
third-party/lp_solve_5.5/doc/IDE.htm
third-party/lp_solve_5.5/doc/Infeasible.htm
third-party/lp_solve_5.5/doc/Intro.htm
third-party/lp_solve_5.5/doc/Java/
third-party/lp_solve_5.5/doc/Java/README.html
third-party/lp_solve_5.5/doc/Java/docs/
third-party/lp_solve_5.5/doc/Java/docs/api/
third-party/lp_solve_5.5/doc/Java/docs/api/allclasses-frame.html
third-party/lp_solve_5.5/doc/Java/docs/api/allclasses-noframe.html
third-party/lp_solve_5.5/doc/Java/docs/api/constant-values.html
third-party/lp_solve_5.5/doc/Java/docs/api/deprecated-list.html
third-party/lp_solve_5.5/doc/Java/docs/api/help-doc.html
third-party/lp_solve_5.5/doc/Java/docs/api/index-all.html
third-party/lp_solve_5.5/doc/Java/docs/api/index.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/AbortListener.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/BbListener.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/LogListener.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/LpSolve.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/LpSolveException.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/MsgListener.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/VersionInfo.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/package-frame.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/package-summary.html
third-party/lp_solve_5.5/doc/Java/docs/api/lpsolve/package-tree.html
third-party/lp_solve_5.5/doc/Java/docs/api/overview-tree.html
third-party/lp_solve_5.5/doc/Java/docs/api/package-list
third-party/lp_solve_5.5/doc/Java/docs/api/packages.html
third-party/lp_solve_5.5/doc/Java/docs/api/resources/
third-party/lp_solve_5.5/doc/Java/docs/api/resources/inherit.gif
third-party/lp_solve_5.5/doc/Java/docs/api/serialized-form.html
third-party/lp_solve_5.5/doc/Java/docs/api/stylesheet.css
third-party/lp_solve_5.5/doc/Java/docs/reference.html
third-party/lp_solve_5.5/doc/Java.htm
third-party/lp_solve_5.5/doc/LGPL.htm
third-party/lp_solve_5.5/doc/LINDO-format.htm
third-party/lp_solve_5.5/doc/LPBasics.htm
third-party/lp_solve_5.5/doc/MATLAB.htm
third-party/lp_solve_5.5/doc/MATLAB1.jpg
third-party/lp_solve_5.5/doc/MATLAB2.jpg
third-party/lp_solve_5.5/doc/MATLAB3.jpg
third-party/lp_solve_5.5/doc/MathProg.htm
third-party/lp_solve_5.5/doc/O-Matrix.htm
third-party/lp_solve_5.5/doc/O-Matrix1.jpg
third-party/lp_solve_5.5/doc/O-Matrix2.jpg
third-party/lp_solve_5.5/doc/O-Matrix3.jpg
third-party/lp_solve_5.5/doc/Octave.htm
third-party/lp_solve_5.5/doc/Octave1.jpg
third-party/lp_solve_5.5/doc/Octave2.jpg
third-party/lp_solve_5.5/doc/Octave3.jpg
third-party/lp_solve_5.5/doc/PHP.htm
third-party/lp_solve_5.5/doc/Presolve.htm
third-party/lp_solve_5.5/doc/Python.htm
third-party/lp_solve_5.5/doc/R.htm
third-party/lp_solve_5.5/doc/SOS.htm
third-party/lp_solve_5.5/doc/Scilab.htm
third-party/lp_solve_5.5/doc/Scilab1.jpg
third-party/lp_solve_5.5/doc/Scilab2.jpg
third-party/lp_solve_5.5/doc/Scilab3.jpg
third-party/lp_solve_5.5/doc/Semi-ContinuousVariables_files/
third-party/lp_solve_5.5/doc/Semi-ContinuousVariables_files/bsscdhtm.js
third-party/lp_solve_5.5/doc/Semi-ContinuousVariables_files/img00340.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/bsscdhtm.js
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00341.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00342.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00343.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00344.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00345.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00346.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeOne_files/img00347.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/bsscdhtm.js
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00348.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00349.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00350.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00351.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00352.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00353.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00354.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00355.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00356.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00357.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00358.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00359.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00360.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00361.gif
third-party/lp_solve_5.5/doc/SpecialOrderedSetsOfTypeTwo_files/img00362.gif
third-party/lp_solve_5.5/doc/Win32/
third-party/lp_solve_5.5/doc/Win32/HTML Help/
third-party/lp_solve_5.5/doc/XLI.htm
third-party/lp_solve_5.5/doc/Xpress-format.htm
third-party/lp_solve_5.5/doc/Zimpl.htm
third-party/lp_solve_5.5/doc/absolute.htm
third-party/lp_solve_5.5/doc/add_SOS.htm
third-party/lp_solve_5.5/doc/add_column.htm
third-party/lp_solve_5.5/doc/add_constraint.htm
third-party/lp_solve_5.5/doc/add_lag_con.htm
third-party/lp_solve_5.5/doc/bas-format.htm
third-party/lp_solve_5.5/doc/changes5.htm
third-party/lp_solve_5.5/doc/changes55.htm
third-party/lp_solve_5.5/doc/closed.gif
third-party/lp_solve_5.5/doc/column_in_lp.htm
third-party/lp_solve_5.5/doc/contents.htm
third-party/lp_solve_5.5/doc/copy_lp.htm
third-party/lp_solve_5.5/doc/default_basis.htm
third-party/lp_solve_5.5/doc/del_column.htm
third-party/lp_solve_5.5/doc/del_constraint.htm
third-party/lp_solve_5.5/doc/delete_lp.htm
third-party/lp_solve_5.5/doc/dimacs_asn.gif
third-party/lp_solve_5.5/doc/dimacs_maxf.gif
third-party/lp_solve_5.5/doc/dimacs_mcf.gif
third-party/lp_solve_5.5/doc/distribution.htm
third-party/lp_solve_5.5/doc/download.htm
third-party/lp_solve_5.5/doc/dualize_lp.htm
third-party/lp_solve_5.5/doc/fold.gif
third-party/lp_solve_5.5/doc/formulate.htm
third-party/lp_solve_5.5/doc/free.htm
third-party/lp_solve_5.5/doc/free_lp.htm
third-party/lp_solve_5.5/doc/get_Lrows.htm
third-party/lp_solve_5.5/doc/get_Ncolumns.htm
third-party/lp_solve_5.5/doc/get_Norig_columns.htm
third-party/lp_solve_5.5/doc/get_Norig_rows.htm
third-party/lp_solve_5.5/doc/get_Nrows.htm
third-party/lp_solve_5.5/doc/get_anti_degen.htm
third-party/lp_solve_5.5/doc/get_basis.htm
third-party/lp_solve_5.5/doc/get_basiscrash.htm
third-party/lp_solve_5.5/doc/get_bb_depthlimit.htm
third-party/lp_solve_5.5/doc/get_bb_floorfirst.htm
third-party/lp_solve_5.5/doc/get_bb_rule.htm
third-party/lp_solve_5.5/doc/get_bounds_tighter.htm
third-party/lp_solve_5.5/doc/get_break_at_value.htm
third-party/lp_solve_5.5/doc/get_col_name.htm
third-party/lp_solve_5.5/doc/get_column.htm
third-party/lp_solve_5.5/doc/get_constr_type.htm
third-party/lp_solve_5.5/doc/get_constr_value.htm
third-party/lp_solve_5.5/doc/get_constraints.htm
third-party/lp_solve_5.5/doc/get_epsb.htm
third-party/lp_solve_5.5/doc/get_epsd.htm
third-party/lp_solve_5.5/doc/get_epsel.htm
third-party/lp_solve_5.5/doc/get_epsint.htm
third-party/lp_solve_5.5/doc/get_epsperturb.htm
third-party/lp_solve_5.5/doc/get_epspivot.htm
third-party/lp_solve_5.5/doc/get_improve.htm
third-party/lp_solve_5.5/doc/get_infinite.htm
third-party/lp_solve_5.5/doc/get_lambda.htm
third-party/lp_solve_5.5/doc/get_lowbo.htm
third-party/lp_solve_5.5/doc/get_lp_index.htm
third-party/lp_solve_5.5/doc/get_lp_name.htm
third-party/lp_solve_5.5/doc/get_mat.htm
third-party/lp_solve_5.5/doc/get_max_level.htm
third-party/lp_solve_5.5/doc/get_maxpivot.htm
third-party/lp_solve_5.5/doc/get_mip_gap.htm
third-party/lp_solve_5.5/doc/get_nameindex.htm
third-party/lp_solve_5.5/doc/get_negrange.htm
third-party/lp_solve_5.5/doc/get_nonzeros.htm
third-party/lp_solve_5.5/doc/get_obj_bound.htm
third-party/lp_solve_5.5/doc/get_objective.htm
third-party/lp_solve_5.5/doc/get_orig_index.htm
third-party/lp_solve_5.5/doc/get_pivoting.htm
third-party/lp_solve_5.5/doc/get_presolve.htm
third-party/lp_solve_5.5/doc/get_presolveloops.htm
third-party/lp_solve_5.5/doc/get_primal_solution.htm
third-party/lp_solve_5.5/doc/get_print_sol.htm
third-party/lp_solve_5.5/doc/get_rh.htm
third-party/lp_solve_5.5/doc/get_rh_range.htm
third-party/lp_solve_5.5/doc/get_row.htm
third-party/lp_solve_5.5/doc/get_row_name.htm
third-party/lp_solve_5.5/doc/get_scalelimit.htm
third-party/lp_solve_5.5/doc/get_scaling.htm
third-party/lp_solve_5.5/doc/get_sensitivity_obj.htm
third-party/lp_solve_5.5/doc/get_sensitivity_rhs.htm
third-party/lp_solve_5.5/doc/get_simplextype.htm
third-party/lp_solve_5.5/doc/get_solutioncount.htm
third-party/lp_solve_5.5/doc/get_solutionlimit.htm
third-party/lp_solve_5.5/doc/get_status.htm
third-party/lp_solve_5.5/doc/get_statustext.htm
third-party/lp_solve_5.5/doc/get_timeout.htm
third-party/lp_solve_5.5/doc/get_total_iter.htm
third-party/lp_solve_5.5/doc/get_total_nodes.htm
third-party/lp_solve_5.5/doc/get_upbo.htm
third-party/lp_solve_5.5/doc/get_var_branch.htm
third-party/lp_solve_5.5/doc/get_var_priority.htm
third-party/lp_solve_5.5/doc/get_variables.htm
third-party/lp_solve_5.5/doc/get_verbose.htm
third-party/lp_solve_5.5/doc/get_working_objective.htm
third-party/lp_solve_5.5/doc/guess_basis.htm
third-party/lp_solve_5.5/doc/has_BFP.htm
third-party/lp_solve_5.5/doc/has_XLI.htm
third-party/lp_solve_5.5/doc/index.htm
third-party/lp_solve_5.5/doc/index.html
third-party/lp_solve_5.5/doc/integer.htm
third-party/lp_solve_5.5/doc/is_SOS_var.htm
third-party/lp_solve_5.5/doc/is_add_rowmode.htm
third-party/lp_solve_5.5/doc/is_anti_degen.htm
third-party/lp_solve_5.5/doc/is_binary.htm
third-party/lp_solve_5.5/doc/is_break_at_first.htm
third-party/lp_solve_5.5/doc/is_constr_type.htm
third-party/lp_solve_5.5/doc/is_debug.htm
third-party/lp_solve_5.5/doc/is_feasible.htm
third-party/lp_solve_5.5/doc/is_infinite.htm
third-party/lp_solve_5.5/doc/is_int.htm
third-party/lp_solve_5.5/doc/is_integerscaling.htm
third-party/lp_solve_5.5/doc/is_lag_trace.htm
third-party/lp_solve_5.5/doc/is_maxim.htm
third-party/lp_solve_5.5/doc/is_nativeBFP.htm
third-party/lp_solve_5.5/doc/is_nativeXLI.htm
third-party/lp_solve_5.5/doc/is_negative.htm
third-party/lp_solve_5.5/doc/is_obj_in_basis.htm
third-party/lp_solve_5.5/doc/is_piv_mode.htm
third-party/lp_solve_5.5/doc/is_piv_rule.htm
third-party/lp_solve_5.5/doc/is_presolve.htm
third-party/lp_solve_5.5/doc/is_scalemode.htm
third-party/lp_solve_5.5/doc/is_scaletype.htm
third-party/lp_solve_5.5/doc/is_semicont.htm
third-party/lp_solve_5.5/doc/is_trace.htm
third-party/lp_solve_5.5/doc/is_unbounded.htm
third-party/lp_solve_5.5/doc/is_use_names.htm
third-party/lp_solve_5.5/doc/lag_solve.htm
third-party/lp_solve_5.5/doc/links.htm
third-party/lp_solve_5.5/doc/list.gif
third-party/lp_solve_5.5/doc/lp-format.htm
third-party/lp_solve_5.5/doc/lp_solve.htm
third-party/lp_solve_5.5/doc/lp_solveAPIreference.htm
third-party/lp_solve_5.5/doc/lp_solve_5.5.0.12.chw
third-party/lp_solve_5.5/doc/lp_solve_5.5.0.13.chw
third-party/lp_solve_5.5/doc/lp_solve_5.5.0.14.chw
third-party/lp_solve_5.5/doc/lp_solve_5.5.0.14_doc.tar
third-party/lp_solve_5.5/doc/lp_solve_version.htm
third-party/lp_solve_5.5/doc/make_lp.htm
third-party/lp_solve_5.5/doc/mps-format.htm
third-party/lp_solve_5.5/doc/open.gif
third-party/lp_solve_5.5/doc/print_constraints.htm
third-party/lp_solve_5.5/doc/print_debugdump.htm
third-party/lp_solve_5.5/doc/print_duals.htm
third-party/lp_solve_5.5/doc/print_lp.htm
third-party/lp_solve_5.5/doc/print_objective.htm
third-party/lp_solve_5.5/doc/print_scales.htm
third-party/lp_solve_5.5/doc/print_solution.htm
third-party/lp_solve_5.5/doc/print_str.htm
third-party/lp_solve_5.5/doc/print_tableau.htm
third-party/lp_solve_5.5/doc/put_abortfunc.htm
third-party/lp_solve_5.5/doc/put_bb_branchfunc.htm
third-party/lp_solve_5.5/doc/put_bb_nodefunc.htm
third-party/lp_solve_5.5/doc/put_logfunc.htm
third-party/lp_solve_5.5/doc/put_msgfunc.htm
third-party/lp_solve_5.5/doc/quickstart.htm
third-party/lp_solve_5.5/doc/ratio.htm
third-party/lp_solve_5.5/doc/read_XLI.htm
third-party/lp_solve_5.5/doc/read_basis.htm
third-party/lp_solve_5.5/doc/read_lp.htm
third-party/lp_solve_5.5/doc/read_mps.htm
third-party/lp_solve_5.5/doc/read_params.htm
third-party/lp_solve_5.5/doc/reset_basis.htm
third-party/lp_solve_5.5/doc/reset_params.htm
third-party/lp_solve_5.5/doc/resize_lp.htm
third-party/lp_solve_5.5/doc/scaling.htm
third-party/lp_solve_5.5/doc/search.htm
third-party/lp_solve_5.5/doc/semi-cont.htm
third-party/lp_solve_5.5/doc/sensitivity.htm
third-party/lp_solve_5.5/doc/set_BFP.htm
third-party/lp_solve_5.5/doc/set_XLI.htm
third-party/lp_solve_5.5/doc/set_add_rowmode.htm
third-party/lp_solve_5.5/doc/set_anti_degen.htm
third-party/lp_solve_5.5/doc/set_basis.htm
third-party/lp_solve_5.5/doc/set_basiscrash.htm
third-party/lp_solve_5.5/doc/set_basisvar.htm
third-party/lp_solve_5.5/doc/set_bb_depthlimit.htm
third-party/lp_solve_5.5/doc/set_bb_floorfirst.htm
third-party/lp_solve_5.5/doc/set_bb_rule.htm
third-party/lp_solve_5.5/doc/set_binary.htm
third-party/lp_solve_5.5/doc/set_bounds.htm
third-party/lp_solve_5.5/doc/set_bounds_tighter.htm
third-party/lp_solve_5.5/doc/set_break_at_first.htm
third-party/lp_solve_5.5/doc/set_break_at_value.htm
third-party/lp_solve_5.5/doc/set_col_name.htm
third-party/lp_solve_5.5/doc/set_column.htm
third-party/lp_solve_5.5/doc/set_constr_type.htm
third-party/lp_solve_5.5/doc/set_debug.htm
third-party/lp_solve_5.5/doc/set_epsb.htm
third-party/lp_solve_5.5/doc/set_epsd.htm
third-party/lp_solve_5.5/doc/set_epsel.htm
third-party/lp_solve_5.5/doc/set_epsint.htm
third-party/lp_solve_5.5/doc/set_epslevel.htm
third-party/lp_solve_5.5/doc/set_epsperturb.htm
third-party/lp_solve_5.5/doc/set_epspivot.htm
third-party/lp_solve_5.5/doc/set_improve.htm
third-party/lp_solve_5.5/doc/set_infinite.htm
third-party/lp_solve_5.5/doc/set_int.htm
third-party/lp_solve_5.5/doc/set_lag_trace.htm
third-party/lp_solve_5.5/doc/set_lowbo.htm
third-party/lp_solve_5.5/doc/set_lp_name.htm
third-party/lp_solve_5.5/doc/set_mat.htm
third-party/lp_solve_5.5/doc/set_maxim.htm
third-party/lp_solve_5.5/doc/set_maxpivot.htm
third-party/lp_solve_5.5/doc/set_minim.htm
third-party/lp_solve_5.5/doc/set_mip_gap.htm
third-party/lp_solve_5.5/doc/set_negrange.htm
third-party/lp_solve_5.5/doc/set_obj_bound.htm
third-party/lp_solve_5.5/doc/set_obj_fn.htm
third-party/lp_solve_5.5/doc/set_obj_in_basis.htm
third-party/lp_solve_5.5/doc/set_output.htm
third-party/lp_solve_5.5/doc/set_pivoting.htm
third-party/lp_solve_5.5/doc/set_preferdual.htm
third-party/lp_solve_5.5/doc/set_presolve.htm
third-party/lp_solve_5.5/doc/set_print_sol.htm
third-party/lp_solve_5.5/doc/set_rh.htm
third-party/lp_solve_5.5/doc/set_rh_range.htm
third-party/lp_solve_5.5/doc/set_rh_vec.htm
third-party/lp_solve_5.5/doc/set_row.htm
third-party/lp_solve_5.5/doc/set_row_name.htm
third-party/lp_solve_5.5/doc/set_scalelimit.htm
third-party/lp_solve_5.5/doc/set_scaling.htm
third-party/lp_solve_5.5/doc/set_semicont.htm
third-party/lp_solve_5.5/doc/set_sense.htm
third-party/lp_solve_5.5/doc/set_simplextype.htm
third-party/lp_solve_5.5/doc/set_solutionlimit.htm
third-party/lp_solve_5.5/doc/set_timeout.htm
third-party/lp_solve_5.5/doc/set_trace.htm
third-party/lp_solve_5.5/doc/set_unbounded.htm
third-party/lp_solve_5.5/doc/set_upbo.htm
third-party/lp_solve_5.5/doc/set_use_names.htm
third-party/lp_solve_5.5/doc/set_var_branch.htm
third-party/lp_solve_5.5/doc/set_var_weights.htm
third-party/lp_solve_5.5/doc/set_verbose.htm
third-party/lp_solve_5.5/doc/simpletree.css
third-party/lp_solve_5.5/doc/simpletreemenu.js
third-party/lp_solve_5.5/doc/solve.htm
third-party/lp_solve_5.5/doc/time_elapsed.htm
third-party/lp_solve_5.5/doc/unscale.htm
third-party/lp_solve_5.5/doc/write_XLI.htm
third-party/lp_solve_5.5/doc/write_basis.htm
third-party/lp_solve_5.5/doc/write_lp.htm
third-party/lp_solve_5.5/doc/write_mps.htm
third-party/lp_solve_5.5/doc/write_params.htm
third-party/lp_solve_5.5/fortify.c
third-party/lp_solve_5.5/fortify.h
third-party/lp_solve_5.5/ini.c
third-party/lp_solve_5.5/ini.h
third-party/lp_solve_5.5/lp_Hash.c
third-party/lp_solve_5.5/lp_Hash.h
third-party/lp_solve_5.5/lp_MDO.c
third-party/lp_solve_5.5/lp_MDO.h
third-party/lp_solve_5.5/lp_MPS.c
third-party/lp_solve_5.5/lp_MPS.h
third-party/lp_solve_5.5/lp_SOS.c
third-party/lp_solve_5.5/lp_SOS.h
third-party/lp_solve_5.5/lp_crash.c
third-party/lp_solve_5.5/lp_crash.h
third-party/lp_solve_5.5/lp_explicit.h
third-party/lp_solve_5.5/lp_fortify.h
third-party/lp_solve_5.5/lp_lib.c
third-party/lp_solve_5.5/lp_lib.h
third-party/lp_solve_5.5/lp_matrix.c
third-party/lp_solve_5.5/lp_matrix.h
third-party/lp_solve_5.5/lp_mipbb.c
third-party/lp_solve_5.5/lp_mipbb.h
third-party/lp_solve_5.5/lp_params.c
third-party/lp_solve_5.5/lp_presolve.c
third-party/lp_solve_5.5/lp_presolve.h
third-party/lp_solve_5.5/lp_price.c
third-party/lp_solve_5.5/lp_price.h
third-party/lp_solve_5.5/lp_pricePSE.c
third-party/lp_solve_5.5/lp_pricePSE.h
third-party/lp_solve_5.5/lp_report.c
third-party/lp_solve_5.5/lp_report.h
third-party/lp_solve_5.5/lp_rlp.bat
third-party/lp_solve_5.5/lp_rlp.c
third-party/lp_solve_5.5/lp_rlp.h
third-party/lp_solve_5.5/lp_rlp.l
third-party/lp_solve_5.5/lp_rlp.y
third-party/lp_solve_5.5/lp_scale.c
third-party/lp_solve_5.5/lp_scale.h
third-party/lp_solve_5.5/lp_simplex.c
third-party/lp_solve_5.5/lp_simplex.h
third-party/lp_solve_5.5/lp_solve/
third-party/lp_solve_5.5/lp_solve/Makefile.msc
third-party/lp_solve_5.5/lp_solve/bin/
third-party/lp_solve_5.5/lp_solve/bin/win32/
third-party/lp_solve_5.5/lp_solve/bin/win64/
third-party/lp_solve_5.5/lp_solve/cbcc32.bat
third-party/lp_solve_5.5/lp_solve/ccc
third-party/lp_solve_5.5/lp_solve/ccc.osx
third-party/lp_solve_5.5/lp_solve/cgcc.bat
third-party/lp_solve_5.5/lp_solve/cvc6.bat
third-party/lp_solve_5.5/lp_solve/cvc6d.bat
third-party/lp_solve_5.5/lp_solve/cvc8.bat
third-party/lp_solve_5.5/lp_solve/lp_solve.c
third-party/lp_solve_5.5/lp_solve/lp_solve.sln
third-party/lp_solve_5.5/lp_solve/lp_solve.vcproj
third-party/lp_solve_5.5/lp_solve/readme.txt
third-party/lp_solve_5.5/lp_solve.def
third-party/lp_solve_5.5/lp_solveDLL.c
third-party/lp_solve_5.5/lp_solveDLL.h
third-party/lp_solve_5.5/lp_types.h
third-party/lp_solve_5.5/lp_utils.c
third-party/lp_solve_5.5/lp_utils.h
third-party/lp_solve_5.5/lp_wlp.c
third-party/lp_solve_5.5/lp_wlp.h
third-party/lp_solve_5.5/lpkit.h
third-party/lp_solve_5.5/lpsolve.h
third-party/lp_solve_5.5/lpsolve55/
third-party/lp_solve_5.5/lpsolve55/bin/
third-party/lp_solve_5.5/lpsolve55/bin/win32/
third-party/lp_solve_5.5/lpsolve55/bin/win64/
third-party/lp_solve_5.5/lpsolve55/ccc
third-party/lp_solve_5.5/lpsolve55/ccc.aix
third-party/lp_solve_5.5/lpsolve55/ccc.hp-ux
third-party/lp_solve_5.5/lpsolve55/ccc.osx
third-party/lp_solve_5.5/lpsolve55/cccLUSOL.osx
third-party/lp_solve_5.5/lpsolve55/cg++.bat
third-party/lp_solve_5.5/lpsolve55/cgcc.bat
third-party/lp_solve_5.5/lpsolve55/cvc6.bat
third-party/lp_solve_5.5/lpsolve55/cvc8NOmsvcrt.bat
third-party/lp_solve_5.5/lpsolve55/cvc8msvcrt.bat
third-party/lp_solve_5.5/lpsolve55/dll.sln
third-party/lp_solve_5.5/lpsolve55/dll.vcproj
third-party/lp_solve_5.5/lpsolve55/lib.sln
third-party/lp_solve_5.5/lpsolve55/lib.vcproj
third-party/lp_solve_5.5/lpsolve55/lpsolve.rc
third-party/lp_solve_5.5/lpsolve55/readme.txt
third-party/lp_solve_5.5/lpsolve55/resource.h
third-party/lp_solve_5.5/shared/
third-party/lp_solve_5.5/shared/commonlib.c
third-party/lp_solve_5.5/shared/commonlib.h
third-party/lp_solve_5.5/shared/mmio.c
third-party/lp_solve_5.5/shared/mmio.h
third-party/lp_solve_5.5/shared/myblas.c
third-party/lp_solve_5.5/shared/myblas.h
third-party/lp_solve_5.5/ufortify.h
third-party/lp_solve_5.5/yacc_read.c
third-party/lp_solve_5.5/yacc_read.h
Added: third-party/lp_solve_5.5/Makefile
===================================================================
--- third-party/lp_solve_5.5/Makefile (rev 0)
+++ third-party/lp_solve_5.5/Makefile 2009-07-01 16:31:58 UTC (rev 133)
@@ -0,0 +1,169 @@
+CC= gcc
+
+MINGW_EXTRA = c:/cygwin/mingw
+MINGW_INCDIR = $(MINGW_EXTRA)/include
+MINGW_LIBDIR = $(MINGW_EXTRA)/lib
+
+AS = as
+DLLTOOL = dlltool
+DLLWRAP = dllwrap
+DLLWRAP_FLAGS = --dlltool-name=$(DLLTOOL) --as=$(AS) --driver-name=$(CC) \
+ --target=i386-mingw32
+
+DLL_LDFLAGS = -L$(MINGW_LIBDIR) -mno-cygwin -mwindows
+DLL_LDLIBS = liblpk.a
+
+#
+# Beginning of supplied stuff
+#
+
+#should be OK in most situations:
+#CFLAGS= -O
+
+# HP/UX 9.0X optimized code
+#CFLAGS= +O3 +Oaggressive +Olibcalls -Aa -D_POSIX_SOURCE -DCHECK +FP VZOUiD
+# HP/UX 9.0X debugging
+#CFLAGS= -g -Aa -D_POSIX_SOURCE -DCHECK +FP VZOUiD
+
+# nice for gcc
+CFLAGS= -O3 -Wall -pedantic -ansi -mrtd
+#CFLAGS= -g -Wall -pedantic -ansi
+INCLUDE=-Ibfp -Ibfp/bfp_etaPFI -I. -Icolamd -Ishared
+CFLAGS= -O3 -Wall -pedantic -ansi -mrtd -mno-cygwin -I$(MINGW_INCDIR)\
+-DINTEGERTIME -DPARSER_LP -DYY_INTERACTIVE -DWIN32 $(INCLUDE) \
+-DBUILDING_FOR_R -DWIN32 -g
+
+# Option -DCHECK checks for numerical problems during rounding of numbers.
+# It will slow things down a bit.
+# You can add a -DREAL=<float type> to the CFLAGS, to change the default float
+# type used in lp_solve (double) to float or 'long double'. However, type float
+# might be fast on your computer, but it is not accurate enough to solve even
+# moderately sized problems without running into numerical problems.
+# The use of long doubles does increase the numerical stability of lp_solve,
+# if your compiler actually implements them with more bits than a double. But
+# it slows down things quite a bit.
+
+# Choose your favorite or available version of lex and yacc
+
+#YACC= yacc
+#especially for linux:
+YACC= bison -y
+
+#LEX= lex
+#especially for linux:
+LEX= flex -l
+
+#LEXLIB= -ll
+#especially for linux:
+LEXLIB= -lfl
+
+#ANSI math lib
+#MATHLIB= -lM
+#non-ANSI math lib, should also work
+MATHLIB= -lm
+
+LPKSRC.c= $(wildcard *.c) lp_MDO.c \
+colamd/colamd.c shared/commonlib.c shared/myblas.c
+
+LEXFILE.l= lp_rlp.l
+YACCFILE.y= lp_rlp.y
+
+LPKLIB=liblpk.a
+
+LEXFILE.c= $(LEXFILE.l:.l=.c)
+YACCFILE.c= $(YACCFILE.y:.y=.c)
+YACCFILE.o= $(YACCFILE.y:.y=.o)
+CSOURCES=$(LEXFILE.c) $(YACCFILE.c) $(wildcard *.c)
+# commonlib.c fortify.c lp_Hash.c \
+# lp_LUMOD.c lp_MPS.c lp_SOS.c lp_crash.c lp_lib.c lp_matrix.c lp_mipbb.c \
+# lp_presolve.c lp_price.c lp_pricePSE.c lp_report.c lp_rlp.c lp_scale.c \
+# lp_simplex.c lp_solveDLL.c lp_utils.c lp_wlp.c lpslink.c myblas.c \
+# yacc_read.c
+COBJ=$(CSOURCES:.c=.o)
+LPKSRC= $(LPKSRC.c) $(YACCFILE.c)
+LPKOBJ= $(LPKSRC:.c=.o)
+HEADERS=*.h
+
+all: lpslink.dll
+
+q8.exe: q8.o
+ $(CC) -o q8.exe $(CFLAGS) \
+--allow-multiple-definition \
+q8.o colamd/colamd.o shared/commonlib.o \
+fortify.o ini.o \
+lp_Hash.o lp_LUSOL.o lp_MDO.o lp_MPS.o lp_SOS.o lp_crash.o lp_lib.o \
+lp_matrix.o lp_mipbb.o lp_params.o lp_presolve.o lp_price.o lp_pricePSE.o \
+lp_report.o lp_rlp.o lp_scale.o lp_simplex.o lp_utils.o lp_wlp.o lpslink.o \
+lusol.o mmio.o shared/myblas.o yacc_read.o \
+$(MATHLIB) $(LPKLIB) \
+-Wl,--allow-multiple-definition
+
+
+$(COBJ): $(HEADERS)
+
+purify: lp_solve.o $(LPKLIB)
+ purify $(CC) -o $(TARGET) $(CFLAGS) lp_solve.o $(LPKLIB) $(LEXLIB) $(MATHLIB)
+
+quantify: lp_solve.o $(LPKLIB)
+ quantify $(CC) -o $(TARGET) $(CFLAGS) lp_solve.o $(LPKLIB) $(LEXLIB) $(MATHLIB)
+
+$(LPKLIB): $(LPKOBJ)
+ ar rv $@ $(LPKOBJ)
+ ranlib $(LPKLIB)
+
+$(YACCFILE.o): $(LEXFILE.c)
+
+$(LEXFILE.c): $(LEXFILE.l)
+ $(LEX) $(LEXFILE.l)
+ mv lex.yy.c $(LEXFILE.c)
+
+$(YACCFILE.c): $(YACCFILE.y)
+ $(YACC) $(YACCFILE.y)
+ mv y.tab.c $(YACCFILE.c)
+
+# liblpk.def: lpslink.o
+# dlltool -z liblpk.def -e exports.o -l liblpk.lib lpslink.o
+lpslink.dll: lpslink.o liblpk.def liblpk.a
+ $(DLLWRAP) $(DLLWRAP_FLAGS) -o $@ --def liblpk.def \
+lpslink.o $(DLL_LDFLAGS) $(DLL_LDLIBS)
+
+
+
+test:
+ -for i in $(TESTFILES1); do\
+ ./$(TARGET) -s -S3 -time < $$i > xxx.tmp;\
+ if diff xxx.tmp lp_examples/`basename $$i .lp`.out > /dev/null; then\
+ echo "$$i gives the correct result";\
+ else\
+ echo "*** $$i gives different result, please check ***";\
+ fi;\
+ done;\
+ for i in $(TESTFILES2); do\
+ ./$(TARGET) -mps -s -S3 -time < $$i > xxx.tmp;\
+ if diff xxx.tmp lp_examples/`basename $$i .mps`.out > /dev/null; then\
+ echo "$$i gives the correct result";\
+ else\
+ echo "*** $$i gives different result, please check ***";\
+ fi;\
+ done;\
+ rm xxx.tmp
+
+mktest:
+ -for i in $(TESTFILES1); do\
+ ./$(TARGET) -s -S3 -time < $$i > lp_examples/`basename $$i .lp`.out;\
+ done;\
+ for i in $(TESTFILES2); do\
+ ./$(TARGET) -mps -s -S3 -time < $$i > lp_examples/`basename $$i .mps`.out;\
+ done;\
+
+$(TARGET).man: $(TARGET).1
+ nroff -man $(TARGET).1 > $(TARGET).man
+
+MANIFEST: clean
+ ls -lR > MANIFEST; ls -lR > MANIFEST
+
+clean:
+ rm -f *.a *.o TAGS $(LEXFILE.c) $(YACCFILE.c) demo $(TARGET) lp2mps mps2lp .pure .softdebughist datafile
+
+TAGS:
+ etags *.[chyl]
Added: third-party/lp_solve_5.5/Makefile.Linux
===================================================================
--- third-party/lp_solve_5.5/Makefile.Linux (rev 0)
+++ third-party/lp_solve_5.5/Makefile.Linux 2009-07-01 16:31:58 UTC (rev 133)
@@ -0,0 +1,83 @@
+#
+# Makefile for building lp_solve using GNU Make
+# Usage:
+# make -f Makefile.Linux [all | bin | lib | clean]
+#
+# $Revision: 1.1 $
+#
+
+AR = ar
+ARFLAGS = rv
+CC = gcc
+LEX = flex
+YACC = bison
+
+INCLUDE = -I. -Ibfp -Ibfp/bfp_LUSOL -Ibfp/bfp_LUSOL/LUSOL -Icolamd -Ishared
+
+# Uncomment any of the following two depending on your profile
+#DEBUG = -g -pg
+DEBUG = -O2
+
+DEFINE = -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine
+
+# Uncomment any of the following two depending on how easily compiler messages scare you
+#CFLAGS= $(INCLUDE) $(DEBUG) $(DEFINE) -fpic -Wall -pedantic -trigraphs
+CFLAGS= $(INCLUDE) $(DEBUG) $(DEFINE) -fpic
+
+LFLAGS = -L -l
+YFLAGS = --no-lines -y
+
+LDFLAGS = -lm -ldl
+
+LUSOLSRC = bfp/bfp_LUSOL/lp_LUSOL.c bfp/bfp_LUSOL/LUSOL/lusol.c
+LUSOLOBJS = bfp/bfp_LUSOL/lp_LUSOL.o bfp/bfp_LUSOL/LUSOL/lusol.o
+
+OBJECTS = $(LUSOLOBJS) lp_MDO.o shared/commonlib.o colamd/colamd.o \
+shared/mmio.o shared/myblas.o ini.o fortify.o lp_rlp.o lp_crash.o \
+lp_Hash.o lp_lib.o lp_wlp.o lp_matrix.o lp_mipbb.o lp_MPS.o \
+lp_params.o lp_presolve.o lp_price.o lp_pricePSE.o lp_report.o \
+lp_scale.o lp_simplex.o lp_SOS.o lp_utils.o yacc_read.o
+
+SRC = $(LUSOLSRC) lp_MDO.c shared/commonlib.c colamd/colamd.c \
+shared/mmio.c shared/myblas.c ini.c fortify.c lp_rlp.c lp_crash.c \
+lp_Hash.c lp_lib.c lp_wlp.c lp_matrix.c lp_mipbb.c lp_MPS.c \
+lp_params.c lp_presolve.c lp_price.c lp_pricePSE.c lp_report.c \
+lp_scale.c lp_simplex.c lp_SOS.c lp_utils.c yacc_read.c
+
+LIBRARIES = liblpsolve55.a liblpsolve55.so
+BINARIES = lp_solve demo
+ALL = $(BINARIES) $(DEMOS) $(LIBRARIES)
+.PHONY=clean lp_solve
+
+all: $(ALL)
+lib: $(LIBRARIES)
+bin: $(BINARIES)
+objects: $(OBJECTS)
+
+lp_rlp.o: lp_rlp.l lp_rlp.y
+ #$(LEX) $(LFLAGS) lp_rlp.l
+ #sed -e "s/yy/lp_yy/g" lex.yy.c >lp_rlp.h
+ #rm -f lex.yy.c
+
+ #$(YACC) $(YFLAGS) lp_rlp.y
+ #sed -e "s/yy/lp_yy/g" y.tab.c >lp_rlp.c
+ #rm -f y.tab.c
+
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INCLUDE) -c $*.c
+
+lp_solve: lp_solve/lp_solve.c $(OBJECTS)
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INCLUDE) $< $(OBJECTS) -o lp_solve/lp_solve $(LDFLAGS)
+
+demo: demo/demo.c $(OBJECTS)
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INCLUDE) $< $(OBJECTS) -o demo/demo $(LDFLAGS)
+
+liblpsolve55.a: $(OBJECTS)
+ $(AR) $(ARFLAGS) lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'`
+ ranlib lpsolve55/$@
+
+liblpsolve55.so: $(OBJECTS)
+ $(CC) -fpic -shared -Wl,-Bsymbolic -Wl,-soname,$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.o/g'` $(LDFLAGS)
+
+clean:
+ rm -f $(OBJECTS) *.so *.a lp_solve/lp_solve demo/demo lpsolve55/*.so lpsolve55/*.a
+
Added: third-party/lp_solve_5.5/Makefile.in
===================================================================
--- third-party/lp_solve_5.5/Makefile.in (rev 0)
+++ third-party/lp_solve_5.5/Makefile.in 2009-07-01 16:31:58 UTC (rev 133)
@@ -0,0 +1,131 @@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_STRING=@PACKAGE_NAME@_@PACKAGE_VERSION@
+CCSHARED=@CCSHARED@
+prefix = @prefix@
+includedir = @includedir@/lpsolve
+libdir = @libdir@
+CFLAGS=@CFLAGS@
+INCLUDES=-I. -I./shared -I./bfp -I./bfp/bfp_LUSOL -I./bfp/bfp_LUSOL/LUSOL -I./colamd
+DEFINES=-DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine @DEF@
+LIBS=-lc -lm -ldl
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL = @INSTALL@
+mkdir_p = mkdir -p
+HEADERS = \
+ declare.h \
+ fortify.h \
+ ini.h \
+ lp_crash.h \
+ lp_explicit.h \
+ lp_fortify.h \
+ lp_Hash.h \
+ lpkit.h \
+ lp_lib.h \
+ lp_matrix.h \
+ lp_MDO.h \
+ lp_mipbb.h \
+ lp_MPS.h \
+ lp_presolve.h \
+ lp_price.h \
+ lp_pricePSE.h \
+ lp_report.h \
+ lp_rlp.h \
+ lp_scale.h \
+ lp_simplex.h \
+ lp_solveDLL.h \
+ lpsolve.h \
+ lp_SOS.h \
+ lp_types.h \
+ lp_utils.h \
+ lp_wlp.h \
+ ufortify.h \
+ yacc_read.h
+
+SOURCES = lp_MDO.c \
+ shared/commonlib.c \
+ shared/mmio.c \
+ shared/myblas.c \
+ ini.c \
+ fortify.c \
+ colamd/colamd.c \
+ lp_rlp.c \
+ lp_crash.c \
+ bfp/bfp_LUSOL/lp_LUSOL.c \
+ bfp/bfp_LUSOL/LUSOL/lusol.c \
+ lp_Hash.c \
+ lp_lib.c \
+ lp_wlp.c \
+ lp_matrix.c \
+ lp_mipbb.c \
+ lp_MPS.c \
+ lp_params.c \
+ lp_presolve.c \
+ lp_price.c \
+ lp_pricePSE.c \
+ lp_report.c \
+ lp_scale.c \
+ lp_simplex.c \
+ lp_SOS.c \
+ lp_utils.c \
+ yacc_read.c
+
+all: liblpsolve55.a @SHARED_LIB@
+
+# OBJECTS = $(patsubst %.c,%.o,$(SOURCES))
+#.c.o:
+# $(CC) -s -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(SOURCES)
+
+liblpsolve55.a: $(SOURCES)
+ $(CC) -s -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(SOURCES)
+ ar rv $@ `echo $(SOURCES)|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'`
+ ranlib $@
+
+liblpsolve55@SO@: $(SOURCES)
+ $(CC) $(CCSHARED) -s -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(SOURCES)
+ $(CC) -shared -Wl,-Bsymbolic -Wl,-soname,$@ -o $@ `echo $(SOURCES)|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` $(LIBS)
+
+install: install-HEADERS install-LIBRARIES
+
+install-HEADERS: $(HEADERS)
+ test -d $(includedir) || $(mkdir_p) $(includedir)
+ @list='$(HEADERS)'; for p in $$list; do \
+ echo " $(INSTALL) $$p $(includedir)/$$f"; \
+ $(INSTALL) $$p $(includedir)/$$f; \
+ done
+
+install-LIBRARIES: liblpsolve55.a @SHARED_LIB@
+ test -d $(libdir) || $(mkdir_p) $(libdir)
+ @list='liblpsolve55.a @SHARED_LIB@'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL) $$p $(libdir)/$$f"; \
+ $(INSTALL) $$p $(libdir)/$$f; \
+ else :; fi; \
+ done
+
+uninstall-LIBRARIES:
+ @set -x; list='liblpsolve55.a @SHARED_LIB@'; for p in $$list; do \
+ echo " rm -f $(libdir)/$$f"; \
+ rm -f "$(libdir)/$$f"; \
+ done
+
+uninstall: uninstall-HEADERS uninstall-LIBRARIES
+
+uninstall-HEADERS:
+ @set -x; @list=$(HEADERS); for p in $$list; do \
+ echo " rm -f $(includedir)/$$f"; \
+ rm -f "$(includedir)/$$f"; \
+ done
+
+dist:
+ mkdir $(PACKAGE_STRING)
+ tar -cpf- -T MANIFEST | (cd $(PACKAGE_STRING) && tar -xpf- )
+ tar -czpf $(PACKAGE_STRING).tar.bz2 ./$(PACKAGE_STRING)
+ -rm -fr $(PACKAGE_STRING)
+
+CLEANFILES = *.o *.so *.a
+clean:
+ -rm -f $(CLEANFILES)
+
+.PHONY: install install-HEADERS install-LIBRARIES uninstall uninstall-HEADERS uninstall-LIBRARIES all
Added: third-party/lp_solve_5.5/Makefile.msc
===================================================================
--- third-party/lp_solve_5.5/Makefile.msc (rev 0)
+++ third-party/lp_solve_5.5/Makefile.msc 2009-07-01 16:31:58 UTC (rev 133)
@@ -0,0 +1,89 @@
+#
+# Makefile for building lp_solve using GNU Make
+# Usage:
+# gmake -f Makefile.msc [all | bin | lib | clean]
+#
+# $Revision: 1.1 $
+#
+
+AR = ar
+ARFLAGS = rv
+CC = cl
+LEX = flex
+YACC = bison
+
+INC = -I. -Ibfp -Ibfp/bfp_LUSOL -Ibfp/bfp_LUSOL/LUSOL -Icolamd -Ishared
+
+# Uncomment any of the following two depending on your profile
+#DEBUG = -g -pg
+DEBUG = /ML /O1 /Zp8 /Gd /W2 /DWIN32 /D_WINDOWS
+
+DEFINE = -DNoParanoia -DWIN32 -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine
+
+# Uncomment any of the following two depending on how easily compiler messages scare you
+CFLAGS= $(INC) $(DEBUG) $(DEFINE) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
+
+LFLAGS = -L -l
+YFLAGS = --no-lines -y
+
+LDFLAGS =
+
+LUSOLSRC = bfp/bfp_LUSOL/lp_LUSOL.c bfp/bfp_LUSOL/LUSOL/lusol.c
+LUSOLOBJS = bfp/bfp_LUSOL/lp_LUSOL.obj bfp/bfp_LUSOL/LUSOL/lusol.obj
+
+OBJECTS = $(LUSOLOBJS) lp_MDO.obj shared/commonlib.obj colamd/colamd.obj \
+shared/mmio.obj shared/myblas.obj ini.obj fortify.obj lp_rlp.obj lp_crash.obj \
+lp_Hash.obj lp_lib.obj lp_wlp.obj lp_matrix.obj lp_mipbb.obj lp_MPS.obj \
+lp_params.obj lp_presolve.obj lp_price.obj lp_pricePSE.obj lp_report.obj \
+lp_scale.obj lp_simplex.obj lp_SOS.obj lp_utils.obj yacc_read.obj
+
+SRC = $(LUSOLSRC) lp_MDO.c shared/commonlib.c colamd/colamd.c \
+shared/mmio.c shared/myblas.c ini.c fortify.c lp_rlp.c lp_crash.c \
+lp_Hash.c lp_lib.c lp_wlp.c lp_matrix.c lp_mipbb.c lp_MPS.c \
+lp_params.c lp_presolve.c lp_price.c lp_pricePSE.c lp_report.c \
+lp_scale.c lp_simplex.c lp_SOS.c lp_utils.c yacc_read.c
+
+#LIBRARIES = liblpsolve55.lib liblpsolve55d.lib lpsolve55.dll
+LIBRARIES =
+#BINARIES = lp_solve.exe demo.exe
+BINARIES = lp_solve.exe
+ALL = $(BINARIES) $(DEMOS) $(LIBRARIES)
+.PHONY=clean lp_solve
+
+all: $(ALL)
+lib: $(LIBRARIES)
+bin: $(BINARIES)
+objects: $(OBJECTS)
+
+$(OBJECTS): $(SRC)
+ $(CC) -c $(CFLAGS) $(SRC)
+
+lp_rlp.c: lp_rlp.l lp_rlp.y
+ $(LEX) $(LFLAGS) lp_rlp.l
+ sed -e "s/yy/lp_yy/g" lex.yy.c >lp_rlp.h
+ rm -f lex.yy.c
+
+ $(YACC) $(YFLAGS) lp_rlp.y
+ sed -e "s/yy/lp_yy/g" y.tab.c >lp_rlp.c
+ rm -f y.tab.c
+
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INC) -c $*.c
+
+lp_solve.exe: lp_solve/lp_solve.c $(OBJECTS)
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INC) $< $(OBJECTS) -Felp_solve/lp_solve $(LDFLAGS)
+
+demo.exe: demo/demo.c $(OBJECTS)
+ $(CC) $(CFLAGS) $(DEBUG) $(DEFINE) $(INC) $< $(OBJECTS) -Fedemo/demo $(LDFLAGS)
+
+lpsolve.res: lpsolve.rc
+ $(RC) lpsolve.rc
+
+liblpsolve55.lib: $(OBJECTS)
+ $(LIB) *.obj /OUT:lpsolve55/$@
+
+lpsolve55.dll: $(OBJECTS)
+ $(CC) -fpic -shared -Wl,-Bsymbolic -Wl,-soname,$@ -o lpsolve55/$@ `echo $(SRC)|sed 's/[.]c/.obj/g'` $(LDFLAGS)
+
+clean:
+ rm -f $(OBJECTS) *.lib *.dll lp_solve/lp_solve.exe demo/demo.exe lpsolve55/*.dll lpsolve55/*.lib
+
Added: third-party/lp_solve_5.5/README.txt
===================================================================
--- third-party/lp_solve_5.5/README.txt (rev 0)
+++ third-party/lp_solve_5.5/README.txt 2009-07-01 16:31:58 UTC (rev 133)
@@ -0,0 +1,408 @@
+Introduction
+------------
+What is lp_solve and what is it not?
+The simple answer is, lp_solve is a Mixed Integer Linear Programming (MILP) solver.
+
+It is a free (see LGPL for the GNU lesser general public license) linear (integer) programming solver
+based on the revised simplex method and the Branch-and-bound method for the integers.
+It contains full source, examples and manuals.
+lp_solve solves pure linear, (mixed) integer/binary, semi-continuous and
+special ordered sets (SOS) models.
+
+See the reference guide for more information.
+
+
+lp_solve 5.5
+------------
+
+Why a jump from version numbers 5.1 to 5.5 ?
+This is done to indicate that this is more than just another update.
+The solver engine was revised and optimised in such a way that performance has improved considerably.
+Numerical stability is also better resulting in more models that can be solved.
+The LUSOL bfp is now also the default. In the past, the etaPFI bfp package was the default,
+but for larger models this leads faster to numerical instabilities and performance problems.
+
+Overall, the v5.5 code is faster and more robust than v5.1.
+This robustness is for example proven by the fact that many more models can now be solved even without scaling.
+
+The API hasn't changed very much.
+There are a couple of new routines and one routine has an extra argument.
+Some constants got new values.
+
+ * Fundamental internal change to the solver engine resulting in better performance and numerical stability.
+ Both the LP solver and the B&B solvers are enhanced.
+ * Optimised MILP branch truncation, with reduced cost fixing.
+ * LUSOL bfp is now the default.
+ * Presolve is improved in functionality and performance.
+ * Better handling of degeneracy, with more options.
+ * Store and read options from a file make it easier to set options.
+ * Partial pricing for the primal simplex now works.
+ * Full support for xli_ZIMPL v2.0.3.
+ * The objective function is no longer stored as part of the constraint matrix.
+ * Dual-long step code is in place, but not fully activated yet.
+ * General code cleanup.
+ * Added OBJSENSE and OBJNAME headers in the free MPS format (See MPS file format).
+ * The MathProg xli driver has now the ability to generate a model.
+ * New API routines
+
+Start by taking a look at 'Changes compared to version 4', 'Changes from version 5.1 to version 5.5'
+and 'lp_solve usage'
+This gives a good starting point.
+
+
+BFP's
+-----
+
+BFP stands for Basis Factorization Package, which is a unique lp_solve feature. Considerable
+effort has been put in this new feature and we have big expectations for this. BFP is a generic
+interface model and users can develop their own implementations based on the provided templates.
+We are very interested in providing as many different BFPs as possible to the community.
+
+lp_solve 5.5 has the LUSOL BFP built in as default engine. In addition two other
+BFPs are included for both Windows and Linux: bfp_etaPFI.dll, bfp_GLPK.dll for Windows and
+libbfp_etaPFI.so, libbfp_GLPK.so for Linux. The bfp_etaPFI includes
+advanced column ordering using the COLAMD library, as well as better pivot management for
+stability. For complex models, however, the LU factorization approach is much better, and
+lp_solve now includes LUSOL as one of the most stable engines available anywhere. LUSOL was
+originally developed by Prof. Saunders at Stanford, and it has now been ported to C
+and enhanced by Kjell.
+
+If you compile BFPs yourself, make sure that under Windows, you use __stdcall convention and
+use 8 byte alignments. This is needed for the BFPs to work correctly with the general
+distribution of lp_solve and also to make sharing BFPs as uncomplicated as possible.
+
+See the reference guide for more information.
+
+
+XLI's
+-----
+
+XLI stands for eXternal Language Interface, also a unique lp_solve feature. XLI's are stand-alone
+libraries used as add-on to lp_solve to make it possible to read and write lp models in a format
+not natively supported by lp_solve. Examples are CPLEX lp format, LINDO lp format, MathProg format,
+XML format...
+
+See the reference guide for more information.
+
+
+lpsolve API
+-----------
+
+Don't forget that the API has changed compared to previous versions of lpsolve and that you just
+can't use the version 5 lpsolve library with your version 4 or older code. That is also the
+reason why the library is now called lpsolve55.dll/lpsolve55.a. lpsolve55.dll or lpsolve55.a are
+only needed when you call the lpsolve library via the API interface from your program.
+The lp_solve program is still a stand-alone executable program.
+
+There are examples interfaces for different language like C, VB, C#, VB.NET, Java,
+Delphi, and there is now also even a COM object to access the lpsolve library. This means that
+the door is wide-open for using lp_solve in many different situations. Thus everything that is
+available in version 4 is now also available in version 5 and already much more!
+
+See the reference guide for more information.
+
+
+Conversion between lp modeling formats
+--------------------------------------
+
+Note that lp2mps and mps2lp don't exist anymore. However this functionality is now implemented
+in lp_solve:
+
+lp2mps can be simulated as following:
+lp_solve -parse_only -lp infile -wmps outfile
+
+mps2lp can be simulated as following:
+lp_solve -parse_only -mps infile -wlp outfile
+
+
+via the -rxli option, a model can be read via an XLI library and via the -wxli option, a model
+can be written via an XLI library.
+
+
+How to build the executables yourself.
+---------------------------------------
+
+At this time, there are no Makefiles yet. However for the time being, there are batch files/scripts
+to build. For the Microsoft compiler under Windows, use cvc6.bat, for the gnu compiler under Windows,
+use cgcc.bat and for Unix/Linux, use the ccc shell script (sh ccc).
+
+See the reference guide for more information.
+
+
+IDE
+---
+
+Under Windows, there is now also a very user friendly lpsolve IDE. Check out LPSolveIDE
+
+See the reference guide for more information.
+
+
+Documentation (reference guide)
+-------------------------------
+
+See lp_solve55.chm for a Windows HTML help documentation file.
+The html files are also in lp_solve_5.5_doc.tar.gz. Start with index.htm
+Also see http://lpsolve.sourceforge.net/ for a on-line documentation
+
+
+Change history:
+---------------
+
+17/05/05 version 5.5.0.0
+- Beta release of version 5.5
+
+??/??/05 version 5.5.0.1
+- ?
+
+26/06/05 version 5.5.0.2
+- ?
+
+29/06/05 version 5.5.0.3
+- ?
+
+16/08/05 version 5.5.0.4
+- There are no API changes
+- The LUSOL message routine could generate a crash under some cicumstances. Fixed
+- A crash could occur when building the model in add_row_mode. Fixed.
+- write_params didn't write the PRESOLVE and PRESOLVELOOPS correctly. Fixed.
+- write_params didn't write constants with value 0. Fixed.
+- The library did not compile under msdev 2002 (VC 7.0 _MSC_VER 1300). Fixed.
+- There were some problems with printing long long variables which could generate a crash. Fixed.
+- An overflow error could occur because memory was sometimes overwritten. Fixed.
+- Presolve routines are revised. They are again improved and made faster.
+ Also some problems with it are fixed (possible crashes).
+- Solver revised. Again made faster and more stable.
+- get_row/get_column returned FALSE if the row/column is empty. Fixed.
+- get_rowex/get_columnex now returns -1 if and error is detected. This instead of 0.
+ This to know the distinction between an empty row/column and an error.
+- set_bounds had a possible problem when min and max are equal. Fixed.
+- A crash/damage error could occur when rows/columns are added after a solve. Fixed.
+- The my_chsign macro in lp_types.h gave warnings with some compilers. Fixed.
+- The lp_solve program now returns 255 if an unexpected error occurs. Before this was 1
+ But this interferes with the lpsolve library return codes.
+- With the lp_solve program, debug and print modes were not written correctly in a
+ specified parameter file. Fixed.
+- With the lp_solve program, presolveloops was not set correctly. Fixed.
+
+17/09/05 version 5.5.0.5
+- In some cases, SOS restrictions were not optimized till optimality. Fixed.
+- Presolve sometimes generated 'Column -xxx out of range during presolve' with a possible crash.
+- Presolve sometimes removed integer and/or semi-cont variables that should not be deleted. Fixed.
+- B&B sometimes didn't find the most optimal solution. Fixed.
+- Internal constant COMP_EQUAL renamed to COMP_PREFERNONE because this could interfere with a define
+ in the standard header files.
+- The lp parser had problems with variables starting with INF and there is a + or - sign just before it.
+ Fixed.
+- Added options -presolvem, -presolvefd, -presolvebnd, -presolved, -presolveslk
+- Updated documentation. put_bb_branchfunc, put_bb_nodefunc, set_epslevel, dualize_lp, set_basisvar
+
+16/11/05 version 5.5.0.6
+- set_add_rowmode should not be called after a solve. There is now a test in this routine when this is
+ done and it then returns FALSE.
+- When an empty string ("") as filename is provided to set_outputfile, then output is completely
+ ignored.
+- In some cases, SOS models did not solve to their most optimal solution.
+- There was as problem with get_sensitivity_objex. Calling it (sometimes only after multiple times)
+ resulted in protection errors/core dumps.
+- When a model has no constraints, it did not solve most of the times.
+- column_in_lp didn't work anymore.
+- Large upper bounds could make the model unstable. A change was made to fix this.
+- set_improve could let crash the model.
+- lp_params.c used the non-ANSI function unlink(). Changed to ANSI function remove().
+- Presolve is again revised considerably.
+- SOS handling is improved when there are a lot of SOS constraints.
+- Limited constraint-to-SOS1 presolve to constraints with at least 4 variables.
+- Limited bound tightening presolve loops.
+
+12/02/06 version 5.5.0.7
+- When SOS restrictions are added after a previous solve, a crash could occur.
+- Optimized renaming a variable when the new name is equal to the old name.
+- A possible crash could occur when presolve was enabled
+- The constant ANTIDEGEN_DEFAULT is changed. ANTIDEGEN_INFEASIBLE is removed from it.
+ This constant should not be used unless you have some very tight and hard to solve
+ models where the optimal solution numerically straddles infeasibility.
+- There was a possible problem with set_row(ex). It sometimes wrongfully changed the row.
+- When integer variables were scaled, it could happen that because of rounding errors,
+ a loop was created.
+- Sometimes integer models kept on looping in the B&B algorithm.
+- A memory overrun could occur when an initial basis is set. This when variable names
+ are in Rnnn format and constraint names in Cnnn format.
+- Some fixes are made in presolve.
+- On 64-bit systems, compiler warnings were given and some code worked wrong resulting in
+ wrong results.
+- lp_solve.c didn't compile with some compilers because if a very deep nested if statement.
+- The distributed files now have the version number include in the filename.
+ For example lp_solve_5.5.0.7_exe.zip
+ This for a possible move to SourceForge in the (near?) future.
+- When illegal bounds are specified in the MPS format (lower bound larger than upper bound)
+ then a warning was given but the illegal bound was just ignored and the model was solved.
+ This resulted in a solution that did not comply to the original model. Now the message is
+ seen as an error and solving is aborted.
+
+
+06/09/06 version 5.5.0.8
+- When presolve is active and columns are removed and there are SOS constraints, then presolve
+ had an error which could result in hanging while solve or maybe wrong solutions.
+- set_row(ex) set wrong values when used after a previous solve and scaling is active.
+- disabled PRESOLVE_REDUCEMIP since it is very rare that this is effective, and also that it adds
+ code complications and delayed presolve effects that are not captured properly.
+- made routine guess_basis available for all languages (now exported by the dll).
+ The routine is now also documented.
+- some bug corrections in guess_basis.
+- Corrected a problem with add_column(ex) when add_rowmode is enabled.
+- write_lp now wraps long lines over multiple lines to make it more readable.
+- A compilation warning/error sometimes occured on is_fixedvar in lp_lusol.c with some compilers.
+- Added options -wxlisol and -wxlisolopt to lp_solve program to write a solution file for those
+ XLIs that support it.
+- Updated CPLEX XLI to support constants in objective.
+- Added documentation on infeasible models, guess_basis, DIMACS models, CPLEX format, Zimpl, GNU Mathprog.
+ Corrected/updated documentation on get_col_name, get_row_name, get_nameindex, write_xli,
+ External Language Interfaces.
+- The mps reader was improved for the rarely cases where the same elements are provided multiple
+ times. These are now added.
+- Revised the java unittest example because it gave some errors that it shouldn't give.
+
+07/10/06 version 5.5.0.9
+- set_row(ex) could sometimes set wrong values in the model.
+- Sometimes models with semi-cont variables which are also integer and scaling is active, a solution
+ was returned that is not most optimal or it returns infeasible.
+- write_mps didn't write semi-cont variables with an infinite upper bound.
+- When presolve can solve the model on its own and objective direction is maximize then a wrong sign
+ was shown in the reported price on screen.
+- write_lp writes constraint and bounds in the same way if a constraint is not named. If a constraint
+ only has one variable then it looks like a bound. This can give problems because when a constraint
+ is interpreted as bound and it is negative then the problem definition changes.
+ Therefore a constraint which is not named and having only one variable in it is getting a name to
+ make sure it is interpreted as a constraint.
+- The lp_solve program didn't interprete the PRESOLVED solve return code very well. Fixed.
+- bfp_GLPK and xli_MathProg are now compiled against GLPK 4.11
+- When an integer model is aborted before the most optimal solution is found (timeout or
+ break at first, ...) solve returned OPTIMAL (0) instead of SUBOPTIMAL (1). This is now corrected.
+
+14/01/07 version 5.5.0.10
+- If a model has integer variables, but the model is already integer optimal in the simplex fase,
+ then it was reported as suboptimal feasible.
+- get_objective, get_variables, get_ptr_variables, get_constraints, get_ptr_constraints, get_primal_solution
+ reported 'not a valid basis' when presolve is active and the model is entirely solved by presolve.
+- presolve on a model with SOS variables sometimes went wrong.
+- presolve on a model with SOS variables where infeasibility is detected crashed.
+- read_bas could fail when not all constraints had names or had names like default variable names.
+- A crash could occur with set_row(ex) in rowmode.
+- The lp format has been extended with a free section to define free variables.
+- bfp_GLPK and xli_MathProg are now compiled against GLPK 4.13
+- fixed bug in the pseudocost logic that can blow up subsequent pseudocost values in that
+ branch and make them almost random.
+- In some rare cases a memory overrun could occur when constraints are added after a previous solve.
+- Made the copy_lp routine work. Note that information about the optimisation of the original model
+ is not copied (at this time). Only the model is.
+- Fixed a bug in the hashing routines that had only influence in some rare cases in the
+ MATLAB, O-Matrix, Scilab, Octave, Python drivers.
+- coldual sometimes worked on a uninitialised variable value with unpredictable results.
+
+27/12/07 version 5.5.0.11
+- Fixed a problem in presolve. Sometimes an array-index-out-of-bounds error occured.
+- Added a makefile for Linux.
+- When adding constraints, in some rare cases a memory overrun could occur resulting in a crash.
+- add_constraintex with count=0 and row=colno=NULL gave a protection error.
+ several XLIs didn't work anymore because of this.
+- set_constr_type sometimes set wrong signs for the coefficient matrix when add_rowmode is on.
+- presolve did an unnecessary extra loop. Also a test is added to stop presolve when very few
+ changes are done.
+- for very large models, a request of much more memory than is reasonable could occur. Fixed.
+- Modified LINDO XLI to read keywords also not at column 1 and to accept an empty objective function.
+ Previously this wat not possible.
+- In some rare cases, numbers very close to their integer values (for example 11276.999999999998)
+ were truncated to their ceiling value (for example 11276) instead of rounded
+ (for example 11277).
+- Solved a problem with presolve with an all-int constraint.
+- Solved a problem with presolve coldominate
+- Added stronger checking of the MPS format.
+ Fields that must be blank are now also tested accordingly so that if data is there that it is
+ not ignored as before.
+- FREE MPS format was not read ok if row/column name were all numbers
+ or a FR, MI, PL, BV bound was defined. Fixed.
+- The lp-format now also supports a bin(ary) section to define binary variables.
+- When an integer model is aborted before the most optimal solution is found
+ via break at first or break at value, solve returned OPTIMAL (0) instead of SUBOPTIMAL (1).
+ This is now corrected. Problem occured in version 5.5.0.10
+- Fixed a problem with del_constraint. Constraints names were not shifted and reported variable result was incorrect.
+- read_XLI failed with MathProg if datamodel was provided with "" when there is no datamodel.
+ NULL was expected in the past. "" is now also accepted.
+- Added an XLI to read Xpress lp files.
+- Added routines MPS_writefileex, write_lpex.
+- Added options -o0, -o1 to lp_solve command driven program to specify if objective is in basis or not.
+- Added new information in the reference guide:
+ - Linear programming basics
+ - Presolve
+ - Xpress lp files
+
+04/01/08 version 5.5.0.11
+- There was an error in the lp-parser resulting is misreading the model in many cases. This was fixed in the existing release and an update of following files is posted:
+ lp_solve_5.5.0.11_exe.tar.gz
+ lp_solve_5.5.0.11_dev.tar.gz
+ lp_solve_5.5.0.11_source.tar.gz
+ lp_solve_5.5.0.11_exe.zip
+ lp_solve_5.5.0.11_dev.zip
+
+13/03/08 version 5.5.0.12
+- When NODE_RCOSTFIXING (bound tightening during B&B) (enabled by default) was enabled some models were not solved
+ to optimality.
+- In following situation a (sub-optimal) solution was returned while no integer
+ solution isn't found yet at this time.
+ - The model contains integers
+ - A break at first is set
+ - A timeout is set
+ - The timeout occurs before a first integer solution is found
+ - When the timeout occurs, the simplex algorithm is in phase 2 and has a feasible (but non-integer) solution, but not optimal yet.
+- If an integer solution is found with the same objective value as the relaxed solution then
+ B&B is stopped. However this resulted in a report of a SUBOPTIMAL solution while this is not true.
+ The found solution is then optimal.
+- On 64-bit Linux systems crashes occured when informati...
[truncated message content] |
|
From: <Ste...@us...> - 2009-07-01 16:17:34
|
Revision: 132
http://pntool.svn.sourceforge.net/pntool/?rev=132&view=rev
Author: Stephencamp
Date: 2009-07-01 16:17:30 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Made a mistake the first time I moved lpsolve the third-party folder...deleting bad version.
Removed Paths:
-------------
third-party/lp_solve_5.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 08:27:13
|
Revision: 131
http://pntool.svn.sourceforge.net/pntool/?rev=131&view=rev
Author: thecodeweasel
Date: 2009-07-01 08:26:41 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
misc cleanup, doc update
Modified Paths:
--------------
translator/docs/TODO.rtf
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
Modified: translator/docs/TODO.rtf
===================================================================
--- translator/docs/TODO.rtf 2009-07-01 08:21:29 UTC (rev 130)
+++ translator/docs/TODO.rtf 2009-07-01 08:26:41 UTC (rev 131)
@@ -26,7 +26,6 @@
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\cf0 Allow threads to be declared with no initial marking\strike0\striked0 \
Debug weird cygwin memory corruption\
-dealloc the specs structure in testing\
\strike \strikec0 improve documentation\strike0\striked0 \
revert the performance hack to use updatepn\
look at improving antlr's error handling\
@@ -34,4 +33,8 @@
\cf0 Generate test data\
Type isn't being specified on constraint expressions\
\strike \strikec0 Apparently the constraint list was supposed to be a linked list. Change to use that.\strike0\striked0 \
-Implement a tree walker to "balance" the equations}
\ No newline at end of file
+Implement a tree walker to "balance" the equations\
+reorganize to new directory structure\
+tie into main makefile\
+add is_verbose() support\
+update documentation}
\ No newline at end of file
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-01 08:21:29 UTC (rev 130)
+++ translator/pngenerator.c 2009-07-01 08:26:41 UTC (rev 131)
@@ -2,7 +2,7 @@
* This C source file was generated by $ANTLR version 3.1.2
*
* - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- * - On : 2009-07-01 03:20:48
+ * - On : 2009-07-01 03:22:05
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -533,9 +533,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_definitions)->free != NULL)
+ if (SCOPE_TOP(proc_definitions)>free != NULL)
{
- SCOPE_TOP(proc_definitions)->free(SCOPE_TOP(proc_definitions));
+ SCOPE_TOP(proc_definitions)>->free(SCOPE_TOP(proc_definitions));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -557,9 +557,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_instantiations)->free != NULL)
+ if (SCOPE_TOP(proc_instantiations)>free != NULL)
{
- SCOPE_TOP(proc_instantiations)->free(SCOPE_TOP(proc_instantiations));
+ SCOPE_TOP(proc_instantiations)>->free(SCOPE_TOP(proc_instantiations));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -581,9 +581,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(constraints)->free != NULL)
+ if (SCOPE_TOP(constraints)>free != NULL)
{
- SCOPE_TOP(constraints)->free(SCOPE_TOP(constraints));
+ SCOPE_TOP(constraints)>->free(SCOPE_TOP(constraints));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -1683,10 +1683,6 @@
int a = (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places);
int b = (int) (SCOPE_TOP(proc_definitions))->trans->size( (SCOPE_TOP(proc_definitions))->trans);
*pn = createpn("pnum tnum", a, b);
- /* pn = tcalloc(1, sizeof(pns));
- pn->pnum = (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places);
- pn->tnum = (int) (SCOPE_TOP(proc_definitions))->trans->size( (SCOPE_TOP(proc_definitions))->trans);
- allocate_matrices(pn);*/
(SCOPE_TOP(proc_definitions))->proc->pn = pn;
//setup debug names
for(i = 0; i < (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places); i++) {
@@ -1722,7 +1718,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:204:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:200:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1733,7 +1729,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:205:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:201:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1766,7 +1762,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:205:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:201:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1781,7 +1777,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:206:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:202:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1818,7 +1814,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:207:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:203:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1841,11 +1837,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:4: ^( ( TO | FROM ) ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:209:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:209:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:209:6: ( TO | FROM )
{
int alt9=2;
@@ -1875,7 +1871,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:213:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:209:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1893,7 +1889,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:216:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:212:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1920,7 +1916,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:219:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:215:6: ( ID )+
{
int cnt10=0;
@@ -1940,7 +1936,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:219:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:215:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -2007,7 +2003,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:223:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:219:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
*/
static void
trans_def(ppngenerator ctx)
@@ -2044,7 +2040,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:234:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:230:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
ANTLR3_UINT32 alt15;
@@ -2138,7 +2134,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:234:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:230:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2180,7 +2176,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:243:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:239:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2201,7 +2197,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:245:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:241:5: (place= ID )+
{
int cnt11=0;
@@ -2221,7 +2217,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:245:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:241:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2275,7 +2271,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:261:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:257:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2288,7 +2284,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:261:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:257:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2323,7 +2319,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:267:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:263:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2365,7 +2361,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:271:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:267:5: (place= ID )*
for (;;)
{
@@ -2383,7 +2379,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:271:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:267:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def249);
if (HASEXCEPTION())
@@ -2424,7 +2420,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:286:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:282:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2437,7 +2433,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:286:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:282:6: CODE_BLOCK
{
CODE_BLOCK8 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def258);
if (HASEXCEPTION())
@@ -2502,7 +2498,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:291:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:287:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2518,8 +2514,8 @@
CODE_BLOCK10 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:292:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:292:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:288:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:288:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions275);
if (HASEXCEPTION())
@@ -2585,7 +2581,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:299:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:295:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2599,8 +2595,8 @@
ID11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:296:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:296:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(45, &FOLLOW_45_in_nondeterm292);
if (HASEXCEPTION())
@@ -2615,7 +2611,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:296:34: ( ID )+
{
int cnt16=0;
@@ -2635,7 +2631,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:300:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:296:35: ID
{
ID11 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm295);
if (HASEXCEPTION())
@@ -2703,7 +2699,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:306:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:302:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2713,11 +2709,11 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:2: ( ( proc_init | sync_def | proc_start ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ( proc_init | sync_def | proc_start )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:4: ( proc_init | sync_def | proc_start )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:4: ( proc_init | sync_def | proc_start )
{
int alt17=3;
switch ( LA(1) )
@@ -2752,7 +2748,7 @@
switch (alt17)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:5: proc_init
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:5: proc_init
{
FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations315);
proc_init(ctx);
@@ -2767,7 +2763,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:17: sync_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:17: sync_def
{
FOLLOWPUSH(FOLLOW_sync_def_in_proc_instantiations319);
sync_def(ctx);
@@ -2782,7 +2778,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:312:28: proc_start
+ // /Users/bion/projects/iordache/translator/pngenerator.g:308:28: proc_start
{
FOLLOWPUSH(FOLLOW_proc_start_in_proc_instantiations323);
proc_start(ctx);
@@ -2824,7 +2820,7 @@
/**
* $ANTLR start proc_init
- * /Users/bion/projects/iordache/translator/pngenerator.g:313:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:309:1: proc_init : (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) );
*/
static void
proc_init(ppngenerator ctx)
@@ -2850,7 +2846,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:319:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:315:2: (name1= ID | ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ ) )
ANTLR3_UINT32 alt19;
@@ -2902,7 +2898,7 @@
switch (alt19)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:319:4: name1= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:315:4: name1= ID
{
name1 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init340);
if (HASEXCEPTION())
@@ -2931,7 +2927,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:334:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:330:4: ^(name2= ID ( numbered_ID[$proc_instantiations::places] )+ )
{
name2 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_init350);
if (HASEXCEPTION())
@@ -2962,7 +2958,7 @@
goto ruleproc_initEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:346:5: ( numbered_ID[$proc_instantiations::places] )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:342:5: ( numbered_ID[$proc_instantiations::places] )+
{
int cnt18=0;
@@ -2982,7 +2978,7 @@
switch (alt18)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:346:6: numbered_ID[$proc_instantiations::places]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:342:6: numbered_ID[$proc_instantiations::places]
{
FOLLOWPUSH(FOLLOW_numbered_ID_in_proc_init355);
numbered_ID12=numbered_ID(ctx, (SCOPE_TOP(proc_instantiations))->places);
@@ -3072,7 +3068,7 @@
/**
* $ANTLR start sync_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:365:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:361:1: sync_def : ^( SYNC_TOK ( group_elements )+ ) ;
*/
static void
sync_def(ppngenerator ctx)
@@ -3092,8 +3088,8 @@
group_elements13 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:370:2: ( ^( SYNC_TOK ( group_elements )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:370:4: ^( SYNC_TOK ( group_elements )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:366:2: ( ^( SYNC_TOK ( group_elements )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:366:4: ^( SYNC_TOK ( group_elements )+ )
{
MATCHT(SYNC_TOK, &FOLLOW_SYNC_TOK_in_sync_def381);
if (HASEXCEPTION())
@@ -3108,7 +3104,7 @@
goto rulesync_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:370:15: ( group_elements )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:366:15: ( group_elements )+
{
int cnt20=0;
@@ -3128,7 +3124,7 @@
switch (alt20)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:370:16: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:366:16: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_sync_def384);
group_elements13=group_elements(ctx);
@@ -3244,7 +3240,7 @@
/**
* $ANTLR start proc_start
- * /Users/bion/projects/iordache/translator/pngenerator.g:417:1: proc_start : ^( START ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:413:1: proc_start : ^( START ( ID )+ ) ;
*/
static void
proc_start(ppngenerator ctx)
@@ -3258,8 +3254,8 @@
ID14 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:418:2: ( ^( START ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:418:4: ^( START ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:414:2: ( ^( START ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:414:4: ^( START ( ID )+ )
{
MATCHT(START, &FOLLOW_START_in_proc_start401);
if (HASEXCEPTION())
@@ -3274,7 +3270,7 @@
goto ruleproc_startEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:418:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:414:12: ( ID )+
{
int cnt21=0;
@@ -3294,7 +3290,7 @@
switch (alt21)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:418:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:414:13: ID
{
ID14 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_proc_start404);
if (HASEXCEPTION())
@@ -3364,7 +3360,7 @@
/**
* $ANTLR start constraints
- * /Users/bion/projects/iordache/translator/pngenerator.g:426:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:422:1: constraints : ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) ;
*/
static void
constraints(ppngenerator ctx)
@@ -3378,8 +3374,8 @@
ctx->ppngenerator_constraintsTop = ppngenerator_constraintsPush(ctx);
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:2: ( ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:4: ^( constraint_block ( ( eq ) | live_def | uncontrol | unobserve )* )
{
FOLLOWPUSH(FOLLOW_constraint_block_in_constraints424);
constraint_block(ctx);
@@ -3399,7 +3395,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:23: ( ( eq ) | live_def | uncontrol | unobserve )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:23: ( ( eq ) | live_def | uncontrol | unobserve )*
for (;;)
{
@@ -3433,10 +3429,10 @@
switch (alt22)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:24: ( eq )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:24: ( eq )
- // /Users/bion/projects/iordache/translator/pngenerator.g:433:25: eq
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:24: ( eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:429:25: eq
{
FOLLOWPUSH(FOLLOW_eq_in_constraints428);
eq15=eq(ctx);
@@ -3478,7 +3474,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:454:6: live_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:450:6: live_def
{
FOLLOWPUSH(FOLLOW_live_def_in_constraints433);
live_def(ctx);
@@ -3493,7 +3489,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:454:15: uncontrol
+ // /Users/bion/projects/iordache/translator/pngenerator.g:450:15: uncontrol
{
FOLLOWPUSH(FOLLOW_uncontrol_in_constraints435);
uncontrol(ctx);
@@ -3508,7 +3504,7 @@
}
break;
case 4:
- // /Users/bion/projects/iordache/translator/pngenerator.g:454:25: unobserve
+ // /Users/bion/projects/iordache/translator/pngenerator.g:450:25: unobserve
{
FOLLOWPUSH(FOLLOW_unobserve_in_constraints437);
unobserve(ctx);
@@ -3563,7 +3559,7 @@
/**
* $ANTLR start constraint_block
- * /Users/bion/projects/iordache/translator/pngenerator.g:455:1: constraint_block : ID ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:451:1: constraint_block : ID ;
*/
static void
constraint_block(ppngenerator ctx)
@@ -3577,8 +3573,8 @@
ID16 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:456:2: ( ID )
- // /Users/bion/projects/iordache/translator/pngenerator.g:456:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:452:2: ( ID )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:452:4: ID
{
ID16 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_constraint_block448);
if (HASEXCEPTION())
@@ -3629,7 +3625,7 @@
/**
* $ANTLR start eq
- * /Users/bion/projects/iordache/translator/pngenerator.g:475:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( EQS_OP leq= eq req= eq ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:471:1: eq returns [bool ineq, void* ret] : ( relationalExpression | ^( EQS_OP leq= eq req= eq ) );
*/
static pngenerator_eq_return
eq(ppngenerator ctx)
@@ -3662,7 +3658,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:479:2: ( relationalExpression | ^( EQS_OP leq= eq req= eq ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:475:2: ( relationalExpression | ^( EQS_OP leq= eq req= eq ) )
ANTLR3_UINT32 alt23;
@@ -3695,7 +3691,7 @@
switch (alt23)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:479:4: relationalExpression
+ // /Users/bion/projects/iordache/translator/pngenerator.g:475:4: relationalExpression
{
FOLLOWPUSH(FOLLOW_relationalExpression_in_eq471);
relationalExpression17=relationalExpression(ctx);
@@ -3713,7 +3709,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:480:4: ^( EQS_OP leq= eq req= eq )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:476:4: ^( EQS_OP leq= eq req= eq )
{
MATCHT(EQS_OP, &FOLLOW_EQS_OP_in_eq479);
if (HASEXCEPTION())
@@ -3810,7 +3806,7 @@
/**
* $ANTLR start relationalExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:501:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:497:1: relationalExpression returns [inequality* ret] : ^( EQ_OP additiveExpression[list, false] NUM ) ;
*/
static inequality*
relationalExpression(ppngenerator ctx)
@@ -3833,8 +3829,8 @@
NUM18 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:509:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:509:9: ^( EQ_OP additiveExpression[list, false] NUM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:505:5: ( ^( EQ_OP additiveExpression[list, false] NUM ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:505:9: ^( EQ_OP additiveExpression[list, false] NUM )
{
MATCHT(EQ_OP, &FOLLOW_EQ_OP_in_relationalExpression522);
if (HASEXCEPTION())
@@ -3908,7 +3904,7 @@
/**
* $ANTLR start additiveExpression
- * /Users/bion/projects/iordache/translator/pngenerator.g:522:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:518:1: additiveExpression[pANTLR3_VECTOR list, bool flip] : ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) );
*/
static void
additiveExpression(ppngenerator ctx, pANTLR3_VECTOR list, bool flip)
@@ -3925,7 +3921,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:523:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:519:5: ( primary[flip] | ^( ADD additiveExpression[list, false] additiveExpression[list, false] ) | ^( SUB additiveExpression[list, false] additiveExpression[list, true] ) )
ANTLR3_UINT32 alt24;
@@ -3964,7 +3960,7 @@
switch (alt24)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:523:9: primary[flip]
+ // /Users/bion/projects/iordache/translator/pngenerator.g:519:9: primary[flip]
{
FOLLOWPUSH(FOLLOW_primary_in_additiveExpression546);
primary19=primary(ctx, flip);
@@ -3982,7 +3978,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:524:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:520:7: ^( ADD additiveExpression[list, false] additiveExpression[list, false] )
{
MATCHT(ADD, &FOLLOW_ADD_in_additiveExpression558);
if (HASEXCEPTION())
@@ -4026,7 +4022,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:525:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:521:7: ^( SUB additiveExpression[list, false] additiveExpression[list, true] )
{
MATCHT(SUB, &FOLLOW_SUB_in_additiveExpression574);
if (HASEXCEPTION())
@@ -4092,7 +4088,7 @@
/**
* $ANTLR start primary
- * /Users/bion/projects/iordache/translator/pngenerator.g:527:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:523:1: primary[bool flip] returns [variable* var] : ( group_elements | ^( MULT NUM group_elements ) );
*/
static variable*
primary(ppngenerator ctx, bool flip)
@@ -4118,7 +4114,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:528:5: ( group_elements | ^( MULT NUM group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:524:5: ( group_elements | ^( MULT NUM group_elements ) )
ANTLR3_UINT32 alt25;
@@ -4151,7 +4147,7 @@
switch (alt25)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:528:9: group_elements
+ // /Users/bion/projects/iordache/translator/pngenerator.g:524:9: group_elements
{
FOLLOWPUSH(FOLLOW_group_elements_in_primary601);
group_elements20=group_elements(ctx);
@@ -4175,7 +4171,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:535:7: ^( MULT NUM group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:531:7: ^( MULT NUM group_elements )
{
MATCHT(MULT, &FOLLOW_MULT_in_primary612);
if (HASEXCEPTION())
@@ -4247,7 +4243,7 @@
/**
* $ANTLR start live_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:542:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:538:1: live_def : ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) );
*/
static void
live_def(ppngenerator ctx)
@@ -4264,7 +4260,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:543:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:539:2: ( ^( LIVE ALL ( ID )* ) | ^( LIVE ( ID )+ ) )
ANTLR3_UINT32 alt28;
@@ -4335,7 +4331,7 @@
switch (alt28)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:543:4: ^( LIVE ALL ( ID )* )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:539:4: ^( LIVE ALL ( ID )* )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def629);
if (HASEXCEPTION())
@@ -4370,7 +4366,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:553:5: ( ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:549:5: ( ID )*
for (;;)
{
@@ -4388,7 +4384,7 @@
switch (alt26)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:553:6: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:549:6: ID
{
ID23 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def636);
if (HASEXCEPTION())
@@ -4426,7 +4422,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:559:4: ^( LIVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:555:4: ^( LIVE ( ID )+ )
{
MATCHT(LIVE, &FOLLOW_LIVE_in_live_def647);
if (HASEXCEPTION())
@@ -4441,7 +4437,7 @@
goto rulelive_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:559:11: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:555:11: ( ID )+
{
int cnt27=0;
@@ -4461,7 +4457,7 @@
switch (alt27)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:559:12: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:555:12: ID
{
ID24 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_live_def650);
if (HASEXCEPTION())
@@ -4532,7 +4528,7 @@
/**
* $ANTLR start uncontrol
- * /Users/bion/projects/iordache/translator/pngenerator.g:564:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:560:1: uncontrol : ^( UNCONTROL ( ID )+ ) ;
*/
static void
uncontrol(ppngenerator ctx)
@@ -4546,8 +4542,8 @@
ID25 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:2: ( ^( UNCONTROL ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:4: ^( UNCONTROL ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:561:2: ( ^( UNCONTROL ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:561:4: ^( UNCONTROL ( ID )+ )
{
MATCHT(UNCONTROL, &FOLLOW_UNCONTROL_in_uncontrol665);
if (HASEXCEPTION())
@@ -4562,7 +4558,7 @@
goto ruleuncontrolEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:561:16: ( ID )+
{
int cnt29=0;
@@ -4582,7 +4578,7 @@
switch (alt29)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:565:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:561:17: ID
{
ID25 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_uncontrol668);
if (HASEXCEPTION())
@@ -4650,7 +4646,7 @@
/**
* $ANTLR start unobserve
- * /Users/bion/projects/iordache/translator/pngenerator.g:570:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:566:1: unobserve : ^( UNOBSERVE ( ID )+ ) ;
*/
static void
unobserve(ppngenerator ctx)
@@ -4664,8 +4660,8 @@
ID26 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:2: ( ^( UNOBSERVE ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:4: ^( UNOBSERVE ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:567:2: ( ^( UNOBSERVE ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:567:4: ^( UNOBSERVE ( ID )+ )
{
MATCHT(UNOBSERVE, &FOLLOW_UNOBSERVE_in_unobserve683);
if (HASEXCEPTION())
@@ -4680,7 +4676,7 @@
goto ruleunobserveEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:16: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:567:16: ( ID )+
{
int cnt30=0;
@@ -4700,7 +4696,7 @@
switch (alt30)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:571:17: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:567:17: ID
{
ID26 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_unobserve686);
if (HASEXCEPTION())
@@ -4768,7 +4764,7 @@
/**
* $ANTLR start other_commands
- * /Users/bion/projects/iordache/translator/pngenerator.g:577:1: other_commands : print ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:573:1: other_commands : print ;
*/
static void
other_commands(ppngenerator ctx)
@@ -4778,8 +4774,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:2: ( print )
- // /Users/bion/projects/iordache/translator/pngenerator.g:578:4: print
+ // /Users/bion/projects/iordache/translator/pngenerator.g:574:2: ( print )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:574:4: print
{
FOLLOWPUSH(FOLLOW_print_in_other_commands701);
print(ctx);
@@ -4813,7 +4809,7 @@
/**
* $ANTLR start print
- * /Users/bion/projects/iordache/translator/pngenerator.g:579:1: print : ^( PRINT ID group_elements ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:575:1: print : ^( PRINT ID group_elements ) ;
*/
static void
print(ppngenerator ctx)
@@ -4823,8 +4819,8 @@
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:580:2: ( ^( PRINT ID group_elements ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:580:4: ^( PRINT ID group_elements )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:576:2: ( ^( PRINT ID group_elements ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:576:4: ^( PRINT ID group_elements )
{
MATCHT(PRINT, &FOLLOW_PRINT_in_print712);
if (HASEXCEPTION())
@@ -4884,7 +4880,7 @@
/**
* $ANTLR start group_elements
- * /Users/bion/projects/iordache/translator/pngenerator.g:582:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:578:1: group_elements returns [pANTLR3_VECTOR ret] : ^( GROUP ( ID )+ ) ;
*/
static pANTLR3_VECTOR
group_elements(ppngenerator ctx)
@@ -4903,8 +4899,8 @@
ID27 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:2: ( ^( GROUP ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:4: ^( GROUP ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:2: ( ^( GROUP ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:4: ^( GROUP ( ID )+ )
{
MATCHT(GROUP, &FOLLOW_GROUP_in_group_elements737);
if (HASEXCEPTION())
@@ -4919,7 +4915,7 @@
goto rulegroup_elementsEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:12: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:12: ( ID )+
{
int cnt31=0;
@@ -4939,7 +4935,7 @@
switch (alt31)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:586:13: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:582:13: ID
{
ID27 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_group_elements740);
if (HASEXCEPTION())
@@ -5005,7 +5001,7 @@
/**
* $ANTLR start numbered_ID
- * /Users/bion/projects/iordache/translator/pngenerator.g:589:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:585:1: numbered_ID[ASSOC_ARRAY* places] returns [int* ret] : ( ID | ^( ID INT ) );
*/
static int*
numbered_ID(ppngenerator ctx, ASSOC_ARRAY* places)
@@ -5026,7 +5022,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:2: ( ID | ^( ID INT ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:2: ( ID | ^( ID INT ) )
ANTLR3_UINT32 alt32;
@@ -5078,7 +5074,7 @@
switch (alt32)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:590:4: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:586:4: ID
{
ID28 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID759);
if (HASEXCEPTION())
@@ -5097,7 +5093,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:595:4: ^( ID INT )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:591:4: ^( ID INT )
{
ID29 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_numbered_ID767);
if (HASEXCEPTION())
Modified: translator/pngenerator.g
===================================================================
--- translator/pngenerator.g 2009-07-01 08:21:29 UTC (rev 130)
+++ translator/pngenerator.g 2009-07-01 08:26:41 UTC (rev 131)
@@ -186,10 +186,6 @@
int a = (int) $proc_definitions::places->size($proc_definitions::places);
int b = (int) $proc_definitions::trans->size($proc_definitions::trans);
*pn = createpn("pnum tnum", a, b);
-/* pn = tcalloc(1, sizeof(pns));
- pn->pnum = (int) $proc_definitions::places->size($proc_definitions::places);
- pn->tnum = (int) $proc_definitions::trans->size($proc_definitions::trans);
- allocate_matrices(pn);*/
$proc_definitions::proc->pn = pn;
//setup debug names
for(i = 0; i < $proc_definitions::places->size($proc_definitions::places); i++) {
Modified: translator/pngenerator.h
===================================================================
--- translator/pngenerator.h 2009-07-01 08:21:29 UTC (rev 130)
+++ translator/pngenerator.h 2009-07-01 08:26:41 UTC (rev 131)
@@ -2,7 +2,7 @@
* This C header file was generated by $ANTLR version 3.1.2
*
* - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- * - On : 2009-07-01 03:20:48
+ * - On : 2009-07-01 03:22:05
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2009-07-01 07:23:22
|
Revision: 129
http://pntool.svn.sourceforge.net/pntool/?rev=129&view=rev
Author: thecodeweasel
Date: 2009-07-01 07:23:00 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Well... That was a fun lesson in "if the feature looks buggy it probably is - use something else"
Still have a few bugs to work out, but at least memory's not getting smashed anymore
Modified Paths:
--------------
translator/main.c
translator/pngenerator.c
translator/pngenerator.g
translator/pngenerator.h
translator/pnscript.g
translator/pnscriptLexer.c
translator/pnscriptLexer.h
translator/pnscriptParser.c
translator/pnscriptParser.h
Modified: translator/main.c
===================================================================
--- translator/main.c 2009-07-01 04:50:35 UTC (rev 128)
+++ translator/main.c 2009-07-01 07:23:00 UTC (rev 129)
@@ -264,11 +264,17 @@
fprintf(stderr, "The parser returned %d error(s), code generation aborted.\n", generator->pTreeParser->rec->state->errorCount);
}
+ printf("Starting cleanup...\n");
dealloc_specs(output); output = NULL;
+ printf("Specs dealloced\n");
processes ->free (processes); processes = NULL;
+ printf("Processes dealloced\n");
threads ->free (threads); threads = NULL;
+ printf("Threads dealloced\n");
nodes ->free (nodes); nodes = NULL;
+ printf("Nodes freed\n");
generator ->free (generator); generator = NULL;
+ printf("Generator freed\n");
}
}
@@ -276,9 +282,13 @@
// to close down our open objects, in the reverse order we created them
//
psr ->free (psr); psr = NULL;
+ printf("Parser freed\n");
tstream ->free (tstream); tstream = NULL;
+ printf("Tstream freed\n");
lxr ->free (lxr); lxr = NULL;
+ printf("Lexer freed\n");
input ->close (input); input = NULL;
+ printf("Input file freed\n");
time(&end);
{
Modified: translator/pngenerator.c
===================================================================
--- translator/pngenerator.c 2009-07-01 04:50:35 UTC (rev 128)
+++ translator/pngenerator.c 2009-07-01 07:23:00 UTC (rev 129)
@@ -2,7 +2,7 @@
* This C source file was generated by $ANTLR version 3.1.2
*
* - From the grammar source file : /Users/bion/projects/iordache/translator/pngenerator.g
- * - On : 2009-06-26 12:24:27
+ * - On : 2009-07-01 02:20:47
* - for the tree parser : pngeneratorTreeParser *
* Editing it, at least manually, is not wise.
*
@@ -63,9 +63,9 @@
#define FAIL_AT(token) fprintf(stderr, "Parser Failed: "); showContext(token); exit(1)
#define kNAME 0
- #define kPROC 2
- #define kPLACES 3
- #define kTRANS 4
+ #define kPROC 1
+ #define kPLACES 2
+ #define kTRANS 3
/* End of Header action.
* =============================================================================
@@ -533,9 +533,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_definitions)->free != NULL)
+ if (SCOPE_TOP(proc_definitions)>free != NULL)
{
- SCOPE_TOP(proc_definitions)->free(SCOPE_TOP(proc_definitions));
+ SCOPE_TOP(proc_definitions)>->free(SCOPE_TOP(proc_definitions));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -557,9 +557,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(proc_instantiations)->free != NULL)
+ if (SCOPE_TOP(proc_instantiations)>free != NULL)
{
- SCOPE_TOP(proc_instantiations)->free(SCOPE_TOP(proc_instantiations));
+ SCOPE_TOP(proc_instantiations)>->free(SCOPE_TOP(proc_instantiations));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -581,9 +581,9 @@
//
// If the user supplied the scope entries with a free function,then call it first
//
- if (SCOPE_TOP(constraints)->free != NULL)
+ if (SCOPE_TOP(constraints)>free != NULL)
{
- SCOPE_TOP(constraints)->free(SCOPE_TOP(constraints));
+ SCOPE_TOP(constraints)>->free(SCOPE_TOP(constraints));
}
// Now we decrement the scope's upper limit bound. We do not actually pop the scope as
@@ -816,16 +816,18 @@
}
static process* copyProcess(process* proc) {
- static process* ret;
- static pns* net;
+ process* ret;
+ pns* net;
net = tmalloc(sizeof(pns));
ret = tmalloc(sizeof(process));
ret->name = proc->name;
+ ret->instance = NULL;
*net = copypn(proc->pn);
ret->pn = net;
ret->build = proc->build;
ret->include = proc->include;
ret->type = proc->type;
+ ret->start = proc->start;
return ret;
}
@@ -850,25 +852,25 @@
}
}
} else {
- pANTLR3_LIST list;
+ void** list;
process* proc;
ASSOC_ARRAY* places;
ASSOC_ARRAY* trans;
if(strcmp("q", (char*) data->get(data, 0)) == 0) {
ret->type = PARIKHV;
- list = (pANTLR3_LIST) threads->get(threads, (char*) data->get(data, 1));
- proc = (process*) list->get(list, kPROC);
+ list = (void**) threads->get(threads, (char*) data->get(data, 1));
+ proc = (process*) list[kPROC];
ret->pn = proc->pn;
- trans = (ASSOC_ARRAY*) list->get(list, kTRANS);
+ trans = (ASSOC_ARRAY*) list[kTRANS];
num = (int*) trans->get(trans, (char*) data->get(data, 2));
} else {
- list = (pANTLR3_LIST) threads->get(threads, (char*) data->get(data, 0));
- proc = (process*) list->get(list, kPROC);
+ list = (void**) threads->get(threads, (char*) data->get(data, 0));
+ proc = (process*) list[kPROC];
ret->pn = proc->pn;
- places = (ASSOC_ARRAY*) list->get(list, kPLACES);
+ places = (ASSOC_ARRAY*) list[kPLACES];
num = (int*) places->get(places, (char*) data->get(data, 1));
if(num == NULL) {
- trans = (ASSOC_ARRAY*) list->get(list, kTRANS);
+ trans = (ASSOC_ARRAY*) list[kTRANS];
num = (int*) trans->get(trans, (char*) data->get(data, 1));
ret->type = FIRINGV;
} else {
@@ -969,162 +971,162 @@
/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_nondeterm295 */
static ANTLR3_BITWORD FOLLOW_ID_in_nondeterm295_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
static ANTLR3_BITSET_LIST FOLLOW_ID_in_nondeterm295 = { FOLLOW_ID_in_nondeterm295_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations314 */
-static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations314_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations314 = { FOLLOW_proc_init_in_proc_instantiations314_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations318 */
-static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations318_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations318 = { FOLLOW_sync_def_in_proc_instantiations318_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations322 */
-static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations322_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations322 = { FOLLOW_proc_start_in_proc_instantiations322_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init336 */
-static ANTLR3_BITWORD FOLLOW_ID_in_proc_init336_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init336 = { FOLLOW_ID_in_proc_init336_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init344 */
-static ANTLR3_BITWORD FOLLOW_ID_in_proc_init344_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init344 = { FOLLOW_ID_in_proc_init344_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init349 */
-static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init349_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init349 = { FOLLOW_numbered_ID_in_proc_init349_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def372 */
-static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def372_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def372 = { FOLLOW_SYNC_TOK_in_sync_def372_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def375 */
-static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def375_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
-static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def375 = { FOLLOW_group_elements_in_sync_def375_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start392 */
-static ANTLR3_BITWORD FOLLOW_START_in_proc_start392_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start392 = { FOLLOW_START_in_proc_start392_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start395 */
-static ANTLR3_BITWORD FOLLOW_ID_in_proc_start395_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start395 = { FOLLOW_ID_in_proc_start395_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints415 */
-static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints415_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints415 = { FOLLOW_constraint_block_in_constraints415_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints419 */
-static ANTLR3_BITWORD FOLLOW_eq_in_constraints419_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
-static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints419 = { FOLLOW_eq_in_constraints419_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints424 */
-static ANTLR3_BITWORD FOLLOW_live_def_in_constraints424_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
-static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints424 = { FOLLOW_live_def_in_constraints424_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints426 */
-static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints426_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
-static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints426 = { FOLLOW_uncontrol_in_constraints426_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints428 */
-static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints428_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
-static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints428 = { FOLLOW_unobserve_in_constraints428_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block439 */
-static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block439_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block439 = { FOLLOW_ID_in_constraint_block439_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq459 */
-static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq459_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq459 = { FOLLOW_relationalExpression_in_eq459_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq467 */
-static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq467_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq467 = { FOLLOW_EQS_OP_in_eq467_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq473 */
-static ANTLR3_BITWORD FOLLOW_eq_in_eq473_bits[] = { ANTLR3_UINT64_LIT(0x000000000C000000) };
-static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq473 = { FOLLOW_eq_in_eq473_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq479 */
-static ANTLR3_BITWORD FOLLOW_eq_in_eq479_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq479 = { FOLLOW_eq_in_eq479_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression510 */
-static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression510_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression510 = { FOLLOW_EQ_OP_in_relationalExpression510_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression512 */
-static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression512_bits[] = { ANTLR3_UINT64_LIT(0x0002000000000000) };
-static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression512 = { FOLLOW_additiveExpression_in_relationalExpression512_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_NUM_in_relationalExpression515 */
-static ANTLR3_BITWORD FOLLOW_NUM_in_relationalExpression515_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_NUM_in_relationalExpression515 = { FOLLOW_NUM_in_relationalExpression515_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression534 */
-static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression534_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression534 = { FOLLOW_primary_in_additiveExpression534_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ADD_in_additiveExpression546 */
-static ANTLR3_BITWORD FOLLOW_ADD_in_additiveExpression546_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_ADD_in_additiveExpression546 = { FOLLOW_ADD_in_additiveExpression546_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression548 */
-static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression548_bits[] = { ANTLR3_UINT64_LIT(0x0001800000040088) };
-static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression548 = { FOLLOW_additiveExpression_in_additiveExpression548_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression551 */
-static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression551_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression551 = { FOLLOW_additiveExpression_in_additiveExpression551_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_SUB_in_additiveExpression562 */
-static ANTLR3_BITWORD FOLLOW_SUB_in_additiveExpression562_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_SUB_in_additiveExpression562 = { FOLLOW_SUB_in_additiveExpression562_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression564 */
-static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression564_bits[] = { ANTLR3_UINT64_LIT(0x0001800000040088) };
-static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression564 = { FOLLOW_additiveExpression_in_additiveExpression564_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression567 */
-static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression567_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression567 = { FOLLOW_additiveExpression_in_additiveExpression567_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary589 */
-static ANTLR3_BITWORD FOLLOW_group_elements_in_primary589_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary589 = { FOLLOW_group_elements_in_primary589_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary600 */
-static ANTLR3_BITWORD FOLLOW_MULT_in_primary600_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary600 = { FOLLOW_MULT_in_primary600_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_NUM_in_primary602 */
-static ANTLR3_BITWORD FOLLOW_NUM_in_primary602_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
-static ANTLR3_BITSET_LIST FOLLOW_NUM_in_primary602 = { FOLLOW_NUM_in_primary602_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary604 */
-static ANTLR3_BITWORD FOLLOW_group_elements_in_primary604_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary604 = { FOLLOW_group_elements_in_primary604_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def617 */
-static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def617_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def617 = { FOLLOW_LIVE_in_live_def617_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def619 */
-static ANTLR3_BITWORD FOLLOW_ALL_in_live_def619_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def619 = { FOLLOW_ALL_in_live_def619_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def624 */
-static ANTLR3_BITWORD FOLLOW_ID_in_live_def624_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def624 = { FOLLOW_ID_in_live_def624_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def635 */
-static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def635_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def635 = { FOLLOW_LIVE_in_live_def635_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def638 */
-static ANTLR3_BITWORD FOLLOW_ID_in_live_def638_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def638 = { FOLLOW_ID_in_live_def638_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol653 */
-static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol653_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol653 = { FOLLOW_UNCONTROL_in_uncontrol653_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol656 */
-static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol656_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol656 = { FOLLOW_ID_in_uncontrol656_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve671 */
-static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve671_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve671 = { FOLLOW_UNOBSERVE_in_unobserve671_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve674 */
-static ANTLR3_BITWORD FOLLOW_ID_in_unobserve674_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve674 = { FOLLOW_ID_in_unobserve674_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands689 */
-static ANTLR3_BITWORD FOLLOW_print_in_other_commands689_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands689 = { FOLLOW_print_in_other_commands689_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print700 */
-static ANTLR3_BITWORD FOLLOW_PRINT_in_print700_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print700 = { FOLLOW_PRINT_in_print700_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print702 */
-static ANTLR3_BITWORD FOLLOW_ID_in_print702_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_print702 = { FOLLOW_ID_in_print702_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print704 */
-static ANTLR3_BITWORD FOLLOW_group_elements_in_print704_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print704 = { FOLLOW_group_elements_in_print704_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_GROUP_in_group_elements725 */
-static ANTLR3_BITWORD FOLLOW_GROUP_in_group_elements725_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_GROUP_in_group_elements725 = { FOLLOW_GROUP_in_group_elements725_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements728 */
-static ANTLR3_BITWORD FOLLOW_ID_in_group_elements728_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements728 = { FOLLOW_ID_in_group_elements728_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID747 */
-static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID747_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID747 = { FOLLOW_ID_in_numbered_ID747_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID755 */
-static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID755_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
-static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID755 = { FOLLOW_ID_in_numbered_ID755_bits, 1 };
-/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID757 */
-static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID757_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
-static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID757 = { FOLLOW_INT_in_numbered_ID757_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_init_in_proc_instantiations315 */
+static ANTLR3_BITWORD FOLLOW_proc_init_in_proc_instantiations315_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_proc_init_in_proc_instantiations315 = { FOLLOW_proc_init_in_proc_instantiations315_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_sync_def_in_proc_instantiations319 */
+static ANTLR3_BITWORD FOLLOW_sync_def_in_proc_instantiations319_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_sync_def_in_proc_instantiations319 = { FOLLOW_sync_def_in_proc_instantiations319_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_proc_start_in_proc_instantiations323 */
+static ANTLR3_BITWORD FOLLOW_proc_start_in_proc_instantiations323_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_proc_start_in_proc_instantiations323 = { FOLLOW_proc_start_in_proc_instantiations323_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init340 */
+static ANTLR3_BITWORD FOLLOW_ID_in_proc_init340_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init340 = { FOLLOW_ID_in_proc_init340_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_init350 */
+static ANTLR3_BITWORD FOLLOW_ID_in_proc_init350_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_init350 = { FOLLOW_ID_in_proc_init350_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_numbered_ID_in_proc_init355 */
+static ANTLR3_BITWORD FOLLOW_numbered_ID_in_proc_init355_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_numbered_ID_in_proc_init355 = { FOLLOW_numbered_ID_in_proc_init355_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_SYNC_TOK_in_sync_def381 */
+static ANTLR3_BITWORD FOLLOW_SYNC_TOK_in_sync_def381_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_SYNC_TOK_in_sync_def381 = { FOLLOW_SYNC_TOK_in_sync_def381_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_sync_def384 */
+static ANTLR3_BITWORD FOLLOW_group_elements_in_sync_def384_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
+static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_sync_def384 = { FOLLOW_group_elements_in_sync_def384_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_START_in_proc_start401 */
+static ANTLR3_BITWORD FOLLOW_START_in_proc_start401_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_START_in_proc_start401 = { FOLLOW_START_in_proc_start401_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_proc_start404 */
+static ANTLR3_BITWORD FOLLOW_ID_in_proc_start404_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_proc_start404 = { FOLLOW_ID_in_proc_start404_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_constraint_block_in_constraints424 */
+static ANTLR3_BITWORD FOLLOW_constraint_block_in_constraints424_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_constraint_block_in_constraints424 = { FOLLOW_constraint_block_in_constraints424_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_constraints428 */
+static ANTLR3_BITWORD FOLLOW_eq_in_constraints428_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
+static ANTLR3_BITSET_LIST FOLLOW_eq_in_constraints428 = { FOLLOW_eq_in_constraints428_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_live_def_in_constraints433 */
+static ANTLR3_BITWORD FOLLOW_live_def_in_constraints433_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
+static ANTLR3_BITSET_LIST FOLLOW_live_def_in_constraints433 = { FOLLOW_live_def_in_constraints433_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_uncontrol_in_constraints435 */
+static ANTLR3_BITWORD FOLLOW_uncontrol_in_constraints435_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
+static ANTLR3_BITSET_LIST FOLLOW_uncontrol_in_constraints435 = { FOLLOW_uncontrol_in_constraints435_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_unobserve_in_constraints437 */
+static ANTLR3_BITWORD FOLLOW_unobserve_in_constraints437_bits[] = { ANTLR3_UINT64_LIT(0x000000034C000008) };
+static ANTLR3_BITSET_LIST FOLLOW_unobserve_in_constraints437 = { FOLLOW_unobserve_in_constraints437_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_constraint_block448 */
+static ANTLR3_BITWORD FOLLOW_ID_in_constraint_block448_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_constraint_block448 = { FOLLOW_ID_in_constraint_block448_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_relationalExpression_in_eq471 */
+static ANTLR3_BITWORD FOLLOW_relationalExpression_in_eq471_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_relationalExpression_in_eq471 = { FOLLOW_relationalExpression_in_eq471_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQS_OP_in_eq479 */
+static ANTLR3_BITWORD FOLLOW_EQS_OP_in_eq479_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_EQS_OP_in_eq479 = { FOLLOW_EQS_OP_in_eq479_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq485 */
+static ANTLR3_BITWORD FOLLOW_eq_in_eq485_bits[] = { ANTLR3_UINT64_LIT(0x000000000C000000) };
+static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq485 = { FOLLOW_eq_in_eq485_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_eq_in_eq491 */
+static ANTLR3_BITWORD FOLLOW_eq_in_eq491_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_eq_in_eq491 = { FOLLOW_eq_in_eq491_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_EQ_OP_in_relationalExpression522 */
+static ANTLR3_BITWORD FOLLOW_EQ_OP_in_relationalExpression522_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_EQ_OP_in_relationalExpression522 = { FOLLOW_EQ_OP_in_relationalExpression522_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_relationalExpression524 */
+static ANTLR3_BITWORD FOLLOW_additiveExpression_in_relationalExpression524_bits[] = { ANTLR3_UINT64_LIT(0x0002000000000000) };
+static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_relationalExpression524 = { FOLLOW_additiveExpression_in_relationalExpression524_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_NUM_in_relationalExpression527 */
+static ANTLR3_BITWORD FOLLOW_NUM_in_relationalExpression527_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_NUM_in_relationalExpression527 = { FOLLOW_NUM_in_relationalExpression527_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_primary_in_additiveExpression546 */
+static ANTLR3_BITWORD FOLLOW_primary_in_additiveExpression546_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_primary_in_additiveExpression546 = { FOLLOW_primary_in_additiveExpression546_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ADD_in_additiveExpression558 */
+static ANTLR3_BITWORD FOLLOW_ADD_in_additiveExpression558_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_ADD_in_additiveExpression558 = { FOLLOW_ADD_in_additiveExpression558_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression560 */
+static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression560_bits[] = { ANTLR3_UINT64_LIT(0x0001800000040088) };
+static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression560 = { FOLLOW_additiveExpression_in_additiveExpression560_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression563 */
+static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression563_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression563 = { FOLLOW_additiveExpression_in_additiveExpression563_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_SUB_in_additiveExpression574 */
+static ANTLR3_BITWORD FOLLOW_SUB_in_additiveExpression574_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_SUB_in_additiveExpression574 = { FOLLOW_SUB_in_additiveExpression574_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression576 */
+static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression576_bits[] = { ANTLR3_UINT64_LIT(0x0001800000040088) };
+static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression576 = { FOLLOW_additiveExpression_in_additiveExpression576_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_additiveExpression_in_additiveExpression579 */
+static ANTLR3_BITWORD FOLLOW_additiveExpression_in_additiveExpression579_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_additiveExpression_in_additiveExpression579 = { FOLLOW_additiveExpression_in_additiveExpression579_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary601 */
+static ANTLR3_BITWORD FOLLOW_group_elements_in_primary601_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary601 = { FOLLOW_group_elements_in_primary601_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_MULT_in_primary612 */
+static ANTLR3_BITWORD FOLLOW_MULT_in_primary612_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_MULT_in_primary612 = { FOLLOW_MULT_in_primary612_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_NUM_in_primary614 */
+static ANTLR3_BITWORD FOLLOW_NUM_in_primary614_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
+static ANTLR3_BITSET_LIST FOLLOW_NUM_in_primary614 = { FOLLOW_NUM_in_primary614_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_primary616 */
+static ANTLR3_BITWORD FOLLOW_group_elements_in_primary616_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_primary616 = { FOLLOW_group_elements_in_primary616_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def629 */
+static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def629_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def629 = { FOLLOW_LIVE_in_live_def629_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ALL_in_live_def631 */
+static ANTLR3_BITWORD FOLLOW_ALL_in_live_def631_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ALL_in_live_def631 = { FOLLOW_ALL_in_live_def631_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def636 */
+static ANTLR3_BITWORD FOLLOW_ID_in_live_def636_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def636 = { FOLLOW_ID_in_live_def636_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_LIVE_in_live_def647 */
+static ANTLR3_BITWORD FOLLOW_LIVE_in_live_def647_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_LIVE_in_live_def647 = { FOLLOW_LIVE_in_live_def647_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_live_def650 */
+static ANTLR3_BITWORD FOLLOW_ID_in_live_def650_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_live_def650 = { FOLLOW_ID_in_live_def650_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNCONTROL_in_uncontrol665 */
+static ANTLR3_BITWORD FOLLOW_UNCONTROL_in_uncontrol665_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_UNCONTROL_in_uncontrol665 = { FOLLOW_UNCONTROL_in_uncontrol665_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_uncontrol668 */
+static ANTLR3_BITWORD FOLLOW_ID_in_uncontrol668_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_uncontrol668 = { FOLLOW_ID_in_uncontrol668_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_UNOBSERVE_in_unobserve683 */
+static ANTLR3_BITWORD FOLLOW_UNOBSERVE_in_unobserve683_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_UNOBSERVE_in_unobserve683 = { FOLLOW_UNOBSERVE_in_unobserve683_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_unobserve686 */
+static ANTLR3_BITWORD FOLLOW_ID_in_unobserve686_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_unobserve686 = { FOLLOW_ID_in_unobserve686_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_print_in_other_commands701 */
+static ANTLR3_BITWORD FOLLOW_print_in_other_commands701_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_print_in_other_commands701 = { FOLLOW_print_in_other_commands701_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_PRINT_in_print712 */
+static ANTLR3_BITWORD FOLLOW_PRINT_in_print712_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_PRINT_in_print712 = { FOLLOW_PRINT_in_print712_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_print714 */
+static ANTLR3_BITWORD FOLLOW_ID_in_print714_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000088) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_print714 = { FOLLOW_ID_in_print714_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_group_elements_in_print716 */
+static ANTLR3_BITWORD FOLLOW_group_elements_in_print716_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_group_elements_in_print716 = { FOLLOW_group_elements_in_print716_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_GROUP_in_group_elements737 */
+static ANTLR3_BITWORD FOLLOW_GROUP_in_group_elements737_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_GROUP_in_group_elements737 = { FOLLOW_GROUP_in_group_elements737_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_group_elements740 */
+static ANTLR3_BITWORD FOLLOW_ID_in_group_elements740_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000408) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_group_elements740 = { FOLLOW_ID_in_group_elements740_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID759 */
+static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID759_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000002) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID759 = { FOLLOW_ID_in_numbered_ID759_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_ID_in_numbered_ID767 */
+static ANTLR3_BITWORD FOLLOW_ID_in_numbered_ID767_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000004) };
+static ANTLR3_BITSET_LIST FOLLOW_ID_in_numbered_ID767 = { FOLLOW_ID_in_numbered_ID767_bits, 1 };
+/** Bitset defining follow set for error recovery in rule state: FOLLOW_INT_in_numbered_ID769 */
+static ANTLR3_BITWORD FOLLOW_INT_in_numbered_ID769_bits[] = { ANTLR3_UINT64_LIT(0x0000000000000008) };
+static ANTLR3_BITSET_LIST FOLLOW_INT_in_numbered_ID769 = { FOLLOW_INT_in_numbered_ID769_bits, 1 };
@@ -1134,7 +1136,7 @@
*/
/**
* $ANTLR start pn
- * /Users/bion/projects/iordache/translator/pngenerator.g:126:1: pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName] returns [specs* ret] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:128:1: pn[ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName] returns [specs* ret] : ( proc_definitions )+ ( proc_instantiations )+ ( constraints )* ( other_commands )* ;
*/
static specs*
pn(ppngenerator ctx, ASSOC_ARRAY* procData, ASSOC_ARRAY* threadData, char* fileName)
@@ -1150,10 +1152,8 @@
//we'll assume there are about 3 instances of every process
threads = threadData;
output = tmalloc(sizeof(specs));
- char* tmp;
- tmp = tcalloc(strlen(fileName), sizeof(char));
- strcpy(tmp, fileName);
- output->name = tmp;
+ output->name = tcalloc(strlen(fileName), sizeof(char));
+ strcpy(output->name, fileName);
output->pn_array = NULL;
output->pn_num = 0;
constraintList = NULL;
@@ -1421,14 +1421,14 @@
{
//put everything in the specs and ship it out!
- pANTLR3_LIST list;
+ void** list;
int i;
output->process_num = threads->size(threads);
output->process_array = tcalloc(output->process_num, sizeof(process));
for(i = 0; i < output->process_num; i++) {
- list = (pANTLR3_LIST) threads->iter(threads, i);
- output->process_array[i] = (process*) list->get(list, kPROC);
+ list = (void**) threads->iter(threads, i);
+ output->process_array[i] = (process*) list[kPROC];
}
output->constraint_list = constraintList;
ret= output;
@@ -1645,7 +1645,7 @@
- pns* pn;
+ pns* pn = tmalloc(sizeof(pns));
ID1 = NULL;
@@ -1661,19 +1661,21 @@
{
- pANTLR3_LIST list;
+ void** list;
int i;
char* key;
- list = processes->get(processes, (char*) (ID1->getText(ID1))->chars);
- (SCOPE_TOP(proc_definitions))->proc= (process*) list->get(list, kPROC);
- (SCOPE_TOP(proc_definitions))->places= (ASSOC_ARRAY*) list->get(list, kPLACES);
- (SCOPE_TOP(proc_definitions))->trans= (ASSOC_ARRAY*) list->get(list, kTRANS);
- // *pn = createpn("pnum tnum", (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places), (int) (SCOPE_TOP(proc_definitions))->trans->size( (SCOPE_TOP(proc_definitions))->trans));
- pn = tcalloc(1, sizeof(pns));
+ list =(void**) processes->get(processes, (char*) (ID1->getText(ID1))->chars);
+ (SCOPE_TOP(proc_definitions))->proc= (process*) list[kPROC];
+ (SCOPE_TOP(proc_definitions))->places= (ASSOC_ARRAY*) list[kPLACES];
+ (SCOPE_TOP(proc_definitions))->trans= (ASSOC_ARRAY*) list[kTRANS];
+ int a = (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places);
+ int b = (int) (SCOPE_TOP(proc_definitions))->trans->size( (SCOPE_TOP(proc_definitions))->trans);
+ *pn = createpn("pnum tnum", a, b);
+ /* pn = tcalloc(1, sizeof(pns));
pn->pnum = (int) (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places);
pn->tnum = (int) (SCOPE_TOP(proc_definitions))->trans->size( (SCOPE_TOP(proc_definitions))->trans);
- allocate_matrices(pn);
+ allocate_matrices(pn);*/
(SCOPE_TOP(proc_definitions))->proc->pn = pn;
//setup debug names
for(i = 0; i < (SCOPE_TOP(proc_definitions))->places->size( (SCOPE_TOP(proc_definitions))->places); i++) {
@@ -1709,7 +1711,7 @@
/**
* $ANTLR start trans_defs
- * /Users/bion/projects/iordache/translator/pngenerator.g:191:1: trans_defs : ( extern_trans_def | trans_def );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:193:1: trans_defs : ( extern_trans_def | trans_def );
*/
static void
trans_defs(ppngenerator ctx)
@@ -1720,7 +1722,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:192:2: ( extern_trans_def | trans_def )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:194:2: ( extern_trans_def | trans_def )
ANTLR3_UINT32 alt8;
@@ -1753,7 +1755,7 @@
switch (alt8)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:192:4: extern_trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:194:4: extern_trans_def
{
FOLLOWPUSH(FOLLOW_extern_trans_def_in_trans_defs132);
extern_trans_def(ctx);
@@ -1768,7 +1770,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:193:4: trans_def
+ // /Users/bion/projects/iordache/translator/pngenerator.g:195:4: trans_def
{
FOLLOWPUSH(FOLLOW_trans_def_in_trans_defs137);
trans_def(ctx);
@@ -1805,7 +1807,7 @@
/**
* $ANTLR start extern_trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:194:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:196:1: extern_trans_def : ^( ( TO | FROM ) ( ID )+ ) ;
*/
static void
extern_trans_def(ppngenerator ctx)
@@ -1828,11 +1830,11 @@
ID4 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:200:2: ( ^( ( TO | FROM ) ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:200:4: ^( ( TO | FROM ) ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:202:2: ( ^( ( TO | FROM ) ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:202:4: ^( ( TO | FROM ) ( ID )+ )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:200:6: ( TO | FROM )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:202:6: ( TO | FROM )
{
int alt9=2;
@@ -1862,7 +1864,7 @@
switch (alt9)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:200:7: TO
+ // /Users/bion/projects/iordache/translator/pngenerator.g:202:7: TO
{
TO2 = (pANTLR3_BASE_TREE) MATCHT(TO, &FOLLOW_TO_in_extern_trans_def153);
if (HASEXCEPTION())
@@ -1880,7 +1882,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:203:7: FROM
+ // /Users/bion/projects/iordache/translator/pngenerator.g:205:7: FROM
{
FROM3 = (pANTLR3_BASE_TREE) MATCHT(FROM, &FOLLOW_FROM_in_extern_trans_def159);
if (HASEXCEPTION())
@@ -1907,7 +1909,7 @@
goto ruleextern_trans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:206:6: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:208:6: ( ID )+
{
int cnt10=0;
@@ -1927,7 +1929,7 @@
switch (alt10)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:206:7: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:208:7: ID
{
ID4 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_extern_trans_def165);
if (HASEXCEPTION())
@@ -1994,7 +1996,7 @@
/**
* $ANTLR start trans_def
- * /Users/bion/projects/iordache/translator/pngenerator.g:210:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:212:1: trans_def : ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) );
*/
static void
trans_def(ppngenerator ctx)
@@ -2019,6 +2021,7 @@
arcs = tmalloc(sizeof(arcs));
arcs->next = 0; //I'm not even sure what a next arc would mean...
+ arcs->condition = NULL;
tran = NULL;
place = NULL;
@@ -2030,7 +2033,7 @@
{
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:220:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:223:2: ( ^( ID CODE_BLOCK ) | ^(tran= ID (place= ID )+ ( CODE_BLOCK )? ) | ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) ) )
ANTLR3_UINT32 alt15;
@@ -2124,7 +2127,7 @@
switch (alt15)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:220:4: ^( ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:223:4: ^( ID CODE_BLOCK )
{
ID5 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def185);
if (HASEXCEPTION())
@@ -2152,6 +2155,7 @@
place = *((int*) (SCOPE_TOP(proc_definitions))->places->get( (SCOPE_TOP(proc_definitions))->places, (char*) (ID5->getText(ID5))->chars));
code = (char*) (CODE_BLOCK6->getText(CODE_BLOCK6))->chars;
updatepn( (SCOPE_TOP(proc_definitions))->proc->pn, "segment", place, code);
+ free(arcs);
}
@@ -2165,7 +2169,7 @@
}
break;
case 2:
- // /Users/bion/projects/iordache/translator/pngenerator.g:228:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:232:4: ^(tran= ID (place= ID )+ ( CODE_BLOCK )? )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def201);
if (HASEXCEPTION())
@@ -2186,7 +2190,7 @@
goto ruletrans_defEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:230:5: (place= ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:234:5: (place= ID )+
{
int cnt11=0;
@@ -2206,7 +2210,7 @@
switch (alt11)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:230:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:234:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def208);
if (HASEXCEPTION())
@@ -2255,11 +2259,12 @@
}
{
+ arcs->in_place = -1;
arcs->out_places = places;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:245:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:250:5: ( CODE_BLOCK )?
{
int alt12=2;
{
@@ -2272,7 +2277,7 @@
switch (alt12)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:245:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:250:6: CODE_BLOCK
{
CODE_BLOCK7 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def217);
if (HASEXCEPTION())
@@ -2307,7 +2312,7 @@
}
break;
case 3:
- // /Users/bion/projects/iordache/translator/pngenerator.g:251:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:256:4: ^(tran= ID ^(pInit= ID (place= ID )* ( CODE_BLOCK )? ) )
{
tran = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def235);
if (HASEXCEPTION())
@@ -2349,7 +2354,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:255:5: (place= ID )*
+ // /Users/bion/projects/iordache/translator/pngenerator.g:260:5: (place= ID )*
for (;;)
{
@@ -2367,7 +2372,7 @@
switch (alt13)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:255:6: place= ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:260:6: place= ID
{
place = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_trans_def249);
if (HASEXCEPTION())
@@ -2408,7 +2413,7 @@
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:270:5: ( CODE_BLOCK )?
+ // /Users/bion/projects/iordache/translator/pngenerator.g:275:5: ( CODE_BLOCK )?
{
int alt14=2;
{
@@ -2421,7 +2426,7 @@
switch (alt14)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:270:6: CODE_BLOCK
+ // /Users/bion/projects/iordache/translator/pngenerator.g:275:6: CODE_BLOCK
{
CODE_BLOCK8 = (pANTLR3_BASE_TREE) MATCHT(CODE_BLOCK, &FOLLOW_CODE_BLOCK_in_trans_def258);
if (HASEXCEPTION())
@@ -2486,7 +2491,7 @@
/**
* $ANTLR start select_functions
- * /Users/bion/projects/iordache/translator/pngenerator.g:275:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:280:1: select_functions : ^( SELECT_DEF ID CODE_BLOCK ) ;
*/
static void
select_functions(ppngenerator ctx)
@@ -2502,8 +2507,8 @@
CODE_BLOCK10 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:276:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:276:4: ^( SELECT_DEF ID CODE_BLOCK )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:281:2: ( ^( SELECT_DEF ID CODE_BLOCK ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:281:4: ^( SELECT_DEF ID CODE_BLOCK )
{
MATCHT(SELECT_DEF, &FOLLOW_SELECT_DEF_in_select_functions275);
if (HASEXCEPTION())
@@ -2569,7 +2574,7 @@
/**
* $ANTLR start nondeterm
- * /Users/bion/projects/iordache/translator/pngenerator.g:283:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
+ * /Users/bion/projects/iordache/translator/pngenerator.g:288:1: nondeterm : ^( 'nondeterministic places: ' ( ID )+ ) ;
*/
static void
nondeterm(ppngenerator ctx)
@@ -2583,8 +2588,8 @@
ID11 = NULL;
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:4: ^( 'nondeterministic places: ' ( ID )+ )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:289:2: ( ^( 'nondeterministic places: ' ( ID )+ ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:289:4: ^( 'nondeterministic places: ' ( ID )+ )
{
MATCHT(45, &FOLLOW_45_in_nondeterm292);
if (HASEXCEPTION())
@@ -2599,7 +2604,7 @@
goto rulenondetermEx;
}
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:34: ( ID )+
+ // /Users/bion/projects/iordache/translator/pngenerator.g:289:34: ( ID )+
{
int cnt16=0;
@@ -2619,7 +2624,7 @@
switch (alt16)
{
case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:284:35: ID
+ // /Users/bion/projects/iordache/translator/pngenerator.g:289:35: ID
{
ID11 = (pANTLR3_BASE_TREE) MATCHT(ID, &FOLLOW_ID_in_nondeterm295);
if (HASEXCEPTION())
@@ -2687,7 +2692,7 @@
/**
* $ANTLR start proc_instantiations
- * /Users/bion/projects/iordache/translator/pngenerator.g:290:1: proc_instantiations : ( proc_init | sync_def | proc_start );
+ * /Users/bion/projects/iordache/translator/pngenerator.g:295:1: proc_instantiations : ( proc_init | sync_def | proc_start ) ;
*/
static void
proc_instantiations(ppngenerator ctx)
@@ -2697,92 +2702,95 @@
ctx->ppngenerator_proc_instantiationsTop = ppngenerator_proc_instantiationsPush(ctx);
{
+ // /Users/bion/projects/iordache/translator/pngenerator.g:301:2: ( ( proc_init | sync_def | proc_start ) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:301:4: ( proc_init | sync_def | proc_start )
{
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:2: ( proc_init | sync_def | proc_start )
-
- ANTLR3_UINT32 alt17;
- alt17=3;
-
- switch ( LA(1) )
+ // /Users/bion/projects/iordache/translator/pngenerator.g:301:4: ( proc_init | sync_def | proc_start )
{
- case ID:
- {
- alt17=1;
- }
- break;
- case SYNC_TOK:
- {
- alt17=2;
- }
- break;
- case START:
- {
- alt17=3;
- }
- break;
+ int alt17=3;
+ switch ( LA(1) )
+ {
+ case ID:
+ {
+ alt17=1;
+ }
+ break;
+ case SYNC_TOK:
+ {
+ alt17=2;
+ }
+ break;
+ case START:
+ {
+ alt17=3;
+ }
+ break;
- default:
- CONSTRUCTEX();
- EXCEPTION->type = ANTLR3_NO_VIABLE_ALT_EXCEPTION;
- EXCEPTION->message = (void *)"";
- EXCEPTION->decisionNum = 17;
- EXCEPTION->state = 0;
+ default:
+ CONSTRUCTEX();
+ EXCEPTION->type = ANTLR3_NO_VIABLE_ALT_EXCEPTION;
+ EXCEPTION->message = (void *)"";
+ EXCEPTION->decisionNum = 17;
+ EXCEPTION->state = 0;
- goto ruleproc_instantiationsEx;
- }
+ goto ruleproc_instantiationsEx;
+ }
- switch (alt17)
- {
- case 1:
- // /Users/bion/projects/iordache/translator/pngenerator.g:296:4: proc_init
- {
- FOLLOWPUSH(FOLLOW_proc_init_in_proc_instantiations314);
- ...
[truncated message content] |
|
From: <Ste...@us...> - 2009-07-01 04:50:37
|
Revision: 128
http://pntool.svn.sourceforge.net/pntool/?rev=128&view=rev
Author: StephenCamp
Date: 2009-07-01 04:50:35 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
Divided ipsolve into cleaner subroutines for easier code reading.
Fixed miscellaneous ipsolve bugs.
Rewrote ipsolve test routines to use the new test framework.
Wrote a test script file for ipsolve.
Modified Paths:
--------------
spnbox/ipsolve.c
spnbox/tests/test-ipsolve.c
spnbox/tests/test-ipsolve.mak
Added Paths:
-----------
spnbox/tests/test-ipsolve.txt
Modified: spnbox/ipsolve.c
===================================================================
--- spnbox/ipsolve.c 2009-06-29 22:54:48 UTC (rev 127)
+++ spnbox/ipsolve.c 2009-07-01 04:50:35 UTC (rev 128)
@@ -3,8 +3,36 @@
#include "matrixmath.h"
#include "MemoryManager.h"
-ipsolve_r ipsolve(matrix *L0, double* B0, double *Cost0, short int *IntList0, double *HiBound0, double *LoBound0, short int *ConstraintType0)
+/*This structure is returned by ConvertProblem, responsible for creating copies
+of the problem parameters compatible with ipslv.*/
+typedef struct ipslv_problem
{
+ REAL** L;
+ REAL* B;
+ REAL* Cost;
+ REAL* HiBound;
+ REAL* LoBound;
+ int* IntList;
+ int* ctype;
+ int Constraints;
+ int Variables;
+} ipslv_problem;
+
+/*Function prototypes. See the definitions for comments as to purpose.*/
+int CheckParams(MemoryManager* mem, matrix* L0, double** B0, double** Cost0, short**IntList, double** HiBound, double **LoBound, short** ctype);
+
+int ProcessCols(MemoryManager* mem, matrix* L, int** ColKeys, double* Cost, double* HiBound, double* LoBound, ipsolve_r* result);
+
+int ProcessRows(MemoryManager* mem, matrix* L0, int** RowKeys, short* ctype, double* B0, ipsolve_r* result);
+
+ipslv_problem ConvertProblem(MemoryManager* mem, int* RowKeys, int* ColKeys, int Rows, int Cols, matrix* L, double* B, double* Cost, double* HiBound, double* LoBound, short* IntList, short* ctype);
+
+void SetMessage(ipsolve_r* result, ipslv_r* lpresult, int Variables);
+
+int CheckSolution(matrix* L, double* B, short* ctype, ipsolve_r* result);
+
+ipsolve_r ipsolve(matrix *L0, double* B0, double *Cost0, short int *IntList0, double *HiBound0, double *LoBound0, short int *ctype0)
+{
/*Possible arguments:
L = a matrix.
B = a vector.
@@ -15,42 +43,33 @@
lower bounds inclusive on each entry in x. Same number of elements as L has
columns. I will call these HiBound and LoBound. ctype - a vector each element
of which is negative, zero, or positive. Same number of elements as L has
- columns. I will call this ConstraintType*/
+ columns. I will call this ctype*/
/*The structure that will be returned.*/
- ipsolve_r Return;
+ ipsolve_r result;
- /*The list of optional parameters that were passed.*/
- va_list param;
-
/*Variables*/
int i, j, k, l;
-
- /*Parameters which will be modifed before being passed to ipslv.*/
- REAL **L1;
- REAL *Cost1, *B1, *HiBound1, *LoBound1;
- int *ConstraintType1, *IntList1;
/*The result returned from ipslv*/
- ipslv_r result;
+ ipslv_r lpresult;
- /*Indicators of where bounds on x are +/- infinity. A logic 0 indicates a
- boundary at +/- infinity.*/
- int *HiBoundsFinite, *LoBoundsFinite;
-
/*Indicators of rows and columns that have been removed or altered, plus
indices to which rows are not being skipped.*/
int *RowKeys, *ColKeys;
- /*The number of rows and columns in the original and in the final constraint
- matrix L. The number of columns of L corresponds to the number of elements in
- the solution vector.*/
- int LRows0, LCols0, LRows1 = 0, LCols1 = 0, LColsAdded = 0;
-
- /*Initialize the Return structure to something we can return if we encounter
+ /*The number of rows and columns in the final constraint matrix L. The number
+ of columns of L corresponds to the number of elements in the solution vector.*/
+ int LRows1 = 0, LCols1 = 0;
+
+ /*The problem that will be passed to ipslv (suitable types and null columns
+ and rows removed.*/
+ ipslv_problem lp;
+
+ /*Initialize the result structure to something we can return if we encounter
an error.*/
- Return.mhow = HOW_ERROR;
- Return.res = 0;
+ result.mhow = HOW_ERROR;
+ result.res = 0;
/*The variable that will be used at the end to check the results.*/
double LTimesXLessB;
@@ -59,142 +78,238 @@
MemoryManager memory;
memory = CreateMemoryManager(20, 0, 10, 0);
+ /*Check the parameters and initialize defaults.*/
+ if (! CheckParams(&memory, L0, &B0, &Cost0, &IntList0, &HiBound0, &LoBound0, &ctype0)) return result;
+
+ /*Do the column preprocessing. The value returned is the number of columns
+ left after preprocessing has designated some for removal. The number will be
+ negative if ProcessCols has encountered an infeasible set of boundaries and
+ requests an immediate return.*/
+ if ((LCols1 = ProcessCols(&memory, L0, &ColKeys, HiBound0, LoBound0, Cost0, &result)) < 0)
+ {
+ return result;
+ }
+ /*Do the row proprocessing. This function behaves much like ProcessCols.*/
+ if ((LRows1 = ProcessRows(&memory, L0, &RowKeys, ctype0, B0, &result)) < 0)
+ {
+ return result;
+ }
+
+ /*If we have removed all rows or all columns, then there are no constraints
+ imposed by the constraint matrix and we can go straight ahead to checking the
+ feasible solution we developed earlier. Otherwise, proceed with solving for
+ the constraints imposed by the constraint matrix.*/
+ if (LRows1 && LCols1)
+ {
+ lp = ConvertProblem(&memory, RowKeys, ColKeys, LRows1, LCols1, L0, B0, Cost0, HiBound0, LoBound0, IntList0, ctype0);
+
+ /*Solve: Syntax is:
+ ipslv(REAL* f, REAL** L, REAL* b, int m, int n, int* intlist, REAL* ub,
+ REAL* lb, int* ctype);*/
+ lpresult = ipslv(lp.Cost, lp.L, lp.B, lp.Constraints, lp.Variables, lp.IntList, lp.HiBound, lp.LoBound, lp.ctype);
+
+ /*If the result type is unbounded, it means that in trying to minimize the
+ cost function the ipslv routine has returned an unbounded variable in the '
+ solution vector. If this occurs, zero the cost function and get a feasible
+ solution.*/
+ if (lpresult.kind == 3)
+ {
+ for (i = 0; i < LCols1; i++)
+ {
+ lp.Cost[i] = 0;
+ }
+ free(lpresult.solution);
+ lpresult = ipslv(lp.Cost, lp.L, lp.B, lp.Constraints, lp.Variables, lp.IntList, lp.HiBound, lp.LoBound, lp.ctype);
+ }
+
+ if (lpresult.kind == 3 || lpresult.kind == 0)
+ {
+ /*Now we have a solution to the subset of variables that we actually
+ solved for. Go back and map this into the complete solution vector.*/
+ for (i = 0, k = 0; i < NumberOfColumns(*L0); i++)
+ {
+ if(ColKeys[i])
+ {
+ /*If we get here, the column was used and there is a corresponding
+ variable in the subset used with ipslv.*/
+ result.res[i] = lpresult.solution[k++];
+ }
+ }
+ }
+ }
+ else
+ {
+ /*If we get here it means that we removed all rows or all columns. Set
+ solution type to OK.*/
+ lpresult.kind = 0;
+ }
+
+ /*Set the appropriate status message.*/
+ SetMessage(&result, &lpresult, NumberOfColumns(*L0));
+
+ /*If the solution is OK or unbounded check to make sure it is feasible.*/
+ if (lpresult.kind == 0 || lpresult.kind == 3)
+ {
+ if (! CheckSolution(L0, B0, ctype0, &result))
+ {
+ /*The returned solution was infeasible, indicating an internal error.
+ Free memory before failing with an error message.*/
+ FreeMemory(&memory);
+ merror(0, "IPSOLVE: Internal Error");
+ return result;
+ }
+ }
+ /*Free memory and return.*/
+ FreeMemory(&memory);
+ return result;
+}
+
+/*******************************************************************************
+CheckParams
+This function checks to make sure that L has been provided and fills all the
+other optional parameters with their default values.*/
+int CheckParams(MemoryManager* mem, matrix* L0, double** B0, double** Cost0, short**IntList, double** HiBound, double **LoBound, short ** ctype)
+{
+ int LCols, LRows, i;
/*Check to make sure required arguments aren't null pointers.*/
if (! L0)
{
- merror(0, "One of the required arguments is a null pointer");
- return Return;
+ merror(0, "L0 is a null pointer");
+ return 0;
}
/*Get the number of rows and columns that will be needed for various things:*/
- LCols0 = NumberOfColumns(*L0);
- LRows0 = NumberOfRows(*L0);
+ LCols = NumberOfColumns(*L0);
+ LRows = NumberOfRows(*L0);
/*If B is empty, allocate a zero matrix of the appropriate length. */
- if(! B0)
+ if(! *B0)
{
- B0 = mcalloc(&memory, LRows0, sizeof(double));
+ *B0 = mcalloc(mem, LRows, sizeof(double));
}
/*Setup the default arguments (whichever optional arguments are null pointers)
*/
- if (! Cost0)
+ if (! *Cost0)
{
/*Cost vector is not included. Default to all zeros. There is one element in
the cost vector for each element in the solution vector.*/
- Cost0 = mcalloc(&memory, LCols0, sizeof(double));
+ *Cost0 = mcalloc(mem, LCols, sizeof(double));
}
- if (! IntList0)
+ if (! *IntList)
{
/*IntList is not included. Default to all ones (all solution elements
required to be integers)*/
- IntList0 = mcalloc(&memory, LCols0, sizeof(short));
- for (i = 0; i < LCols0; i++)
+ *IntList = mcalloc(mem, LCols, sizeof(short));
+ for (i = 0; i < LCols; i++)
{
- IntList0[i] = 1;
+ (*IntList)[i] = 1;
}
}
- if (! HiBound0)
+ if (! *HiBound)
{
/*Upper bounds on x are not included. Default to infinity*/
- HiBound0 = mcalloc(&memory, LCols0, sizeof(double));
- for (i = 0; i < LCols0; i++)
+ *HiBound = mcalloc(mem, LCols, sizeof(double));
+ for (i = 0; i < LCols; i++)
{
- HiBound0[i] = INF;
+ (*HiBound)[i] = INF;
}
}
- if (! LoBound0)
+ if (! *LoBound)
{
/*Lower bounds on x are not included. Default to zeros. There are as many
lower bounds as there are values of x.*/
- LoBound0 = mcalloc(&memory, LCols0, sizeof(double));
+ *LoBound = mcalloc(mem, LCols, sizeof(double));
}
- if (! ConstraintType0)
+ if (! *ctype)
{
- /*ConstraintType is not included. Defaults to all 1s(all constraints >=).
+ /*ctype is not included. Defaults to all 1s(all constraints >=).
There are as many constraint type entries as there are rows of L, since each
row of L generates one row in the product that is constrained.*/
- ConstraintType0 = mcalloc(&memory, LRows0, sizeof(short));
- for (i = 0; i < LRows0; i++)
+ *ctype = mcalloc(mem, LRows, sizeof(short));
+ for (i = 0; i < LRows; i++)
{
- ConstraintType0[i] = 1;
+ (*ctype)[i] = 1;
}
}
- /*Initialize the row and column keys. These will be filled with values by the
- first preprocessing loop to tell the second what to do with specific rows and
- columns. They default to zero, meaning remove row or column.*/
- RowKeys = mcalloc(&memory, LRows0, sizeof(int));
- ColKeys = mcalloc(&memory, LCols0, sizeof(int));
+ return 1;
+}
+
+/*******************************************************************************
+ProcessCols
+This function fills ColKeys with flags indicating which columns are null and
+can be skipped, does preprocessing on IntList, and fills result with a feasible
+solution. It returns the number of columns left after eliminating null columns
+or -1 in case a condition is encountered requiring an immmediate return.*/
+int ProcessCols(MemoryManager* mem, matrix* L, int** ColKeys, double* HiBound, double* LoBound, double* Cost, ipsolve_r* result)
+{
+ int i, j, NewCols = 0, Rows, Cols;
+ int *HiBoundF, *LoBoundF;
- /*Allocate the finite boundary logic elements. These will be initialized by
- the first preprocessing loop.*/
- HiBoundsFinite = mcalloc(&memory, LCols0, sizeof(int));
- LoBoundsFinite = mcalloc(&memory, LCols0, sizeof(int));
-
- /*We need to set up a feasible solution, one which fits upper- and
- lower-boundary requirements, albeit while ignoring everything else. We do this
- during the column scan loop.*/
- Return.res = tcalloc(LCols0, sizeof(double));
-
- /*This is the column scan loop. We scan to see which columns are non-null and
- will be copied, build the feasible solution, and do a few other things that need to be done by column.*/
- for (j = 0; j < LCols0; j++)
+ Rows = NumberOfRows(*L);
+ Cols = NumberOfColumns(*L);
+ /*This is the column scan loop. We scan to see which columns are non-null and
+ will be copied, build the feasible solution, and do a few other things that
+ need to be done by column.*/
+ //Allocate space.
+ *ColKeys = mcalloc(mem, Cols, sizeof(int));
+ HiBoundF = tcalloc(Cols, sizeof(int));
+ LoBoundF = tcalloc(Cols, sizeof(int));
+ result->res = tcalloc(Cols, sizeof(double));
+ for (i = 0; i < Cols; i++)
{
- /*Convert intlist to logic-only values.*/
- if (IntList0[j])
- {
- IntList0[j] = 1;
- }
/*Fill the finite bounds indicators with the appropriate value. We reserve a
value of HiBound for positive infinity and a value of LoBound for negative
infinity.*/
- if(HiBound0[j] != INF)
+ if(HiBound[i] != INF)
{
- HiBoundsFinite[j] = 1;
+ HiBoundF[i] = 1;
}
- if(LoBound0[j] != -INF)
+ if(LoBound[i] != -INF)
{
- LoBoundsFinite[j] = 1;
+ LoBoundF[i] = 1;
}
/*Test to make sure the column contains at least one nonzero entry.*/
- for (i = 0; i < LRows0; i++)
+ for (j = 0; j < Rows; j++)
{
- if (GetMatrixEl(L0, i, j))
+ if (GetMatrixEl(L, j, i))
{
- ColKeys[j] = 1;
- LCols1++;
+ (*ColKeys)[i] = 1;
+ NewCols++;
break;
}
}
/*If the column will be copied, we need to set up a feasible solution:*/
- if(ColKeys[j])
+ if((*ColKeys)[i])
{
/*If any upper bound is lower than a lower bound, no feasible solution
exists.*/
- if (HiBound0[j] < LoBound0[j] && HiBoundsFinite[j])
+ if (HiBound[i] < LoBound[i] && HiBoundF[i])
{
- Return.mhow = HOW_INFEASIBLE;
+ result->mhow = HOW_INFEASIBLE;
/*Free allocated memory.*/
- FreeMemory(&memory);
- free(Return.res);
- Return.res = 0;
- return Return;
+ FreeMemory(mem);
+ free(result->res);
+ free(HiBoundF);
+ free(LoBoundF);
+ result->res = 0;
+ return -1;
}
/*If both the high and low bounds are negative or zero, the feasible
solution should be the high bound.*/
- else if (HiBound0[j] <= 0 && (LoBound0[j] < 0 || (! LoBoundsFinite[j])))
+ else if (HiBound[i] <= 0 && (LoBound[i] < 0 || (! LoBoundF[i])))
{
- Return.res[j] = HiBound0[j];
+ result->res[i] = HiBound[i];
}
/*If the high bound is above zero and the low bound is below zero, the
feasible solution will be a zero.*/
- else if((HiBound0[j] >= 0 || (! HiBoundsFinite[j])) && (LoBound0[j] < 0 || (!LoBoundsFinite[j])))
+ else if((HiBound[i] >= 0 || (! HiBoundF[i])) && (LoBound[i] < 0 || (! LoBoundF[i])))
{
- Return.res[j] = 0;
+ result->res[i] = 0;
}
else
{
/*Both upper and lower bounds are greater than 0 and the feasible
solution can be set to the lower bound.*/
- Return.res[j] = LoBound0[j];
+ result->res[i] = LoBound[i];
}
}
/*If the column is going to be skipped because it is all zeros, then the
@@ -203,216 +318,230 @@
can be set by them.*/
else
{
- if(Cost0[j] < 0)
+ if(Cost[i] < 0)
{
- Return.res[j] = HiBound0[j];
+ result->res[i] = HiBound[i];
}
- else if (Cost0[j] > 0)
+ else if (Cost[i] > 0)
{
- Return.res[j] = LoBound0[j];
+ result->res[i] = LoBound[i];
}
}
- }
-
+ }
+ free(HiBoundF);
+ free(LoBoundF);
+ return NewCols;
+}
+
+/*******************************************************************************
+ProcessRows
+This function marks null rows for removal and verifies that null rows do not
+result in unmeetable constraints.
+*/
+int ProcessRows(MemoryManager* mem, matrix* L0, int** RowKeys, short* ctype, double* B0, ipsolve_r* result)
+{
+ int Rows, Cols, i, j, NewRows = 0;
+ double cmultiplier;
+ Rows = NumberOfRows(*L0);
+ Cols = NumberOfColumns(*L0);
+ /*Initialize the row and column keys. These will be filled with values by the
+ first preprocessing loop to tell the second what to do with specific rows and
+ columns. They default to zero, meaning remove row or column.*/
+ *RowKeys = mcalloc(mem, Rows, sizeof(int));
+
/*This is the row scan loop. We use it to scan which rows will be copied and
do some more constraint checking.*/
- for (i = 0; i < LRows0; i++)
+ for (i = 0; i < Rows; i++)
{
/*Check to make sure this row contains at least one nonzero entry.*/
- for (j = 0; j < LCols0; j++)
+ for (j = 0; j < Cols; j++)
{
if(GetMatrixEl(L0, i, j))
{
- LRows1++;
- RowKeys[i] = 1;
+ NewRows++;
+ (*RowKeys)[i] = 1;
break;
}
}
- if (! RowKeys[i])
+ if (! (*RowKeys)[i])
{
/*If the row is not being copied, it means that this row is empty. If a
row is empty it cannot add up to anything but zero. Make sure the
constraints allow this. We must have not have a constraint for >=
positive, <= negative, or = nonzero*/
- if (((double)ConstraintType0[i]) * B0[i] > 0 || ((! ConstraintType0[i]) && B0[i]))
+ cmultiplier = (ctype[i] > 0) ? 1.0 : ((ctype[i] < 0.0) ? -1.0 : 0.0);
+
+ if (cmultiplier * B0[i] > 0 || ((! ctype[i]) && B0[i]))
{
/*Constraints cannot be met. Notify the calling function and return.*/
- Return.mhow = HOW_INFEASIBLE;
+ result->mhow = HOW_INFEASIBLE;
/*Free allocated memory.*/
- FreeMemory(&memory);
- free(Return.res);
- Return.res = 0;
- return Return;
+ FreeMemory(mem);
+ free(result->res);
+ result->res = 0;
+ return -1;
}
}
}
+ return NewRows;
+}
- /*Allocate the storage for the various copied parameters.*/
- B1 = mcalloc(&memory, LRows0, sizeof(REAL));
- ConstraintType1 = mcalloc(&memory, LRows0, sizeof(int));
- HiBound1 = mcalloc(&memory, LCols1, sizeof(REAL));
- LoBound1 = mcalloc(&memory, LCols1, sizeof(REAL));
- Cost1 = mcalloc(&memory, LCols1, sizeof(REAL));
- IntList1 = mcalloc(&memory, LCols1, sizeof(int));
+/*******************************************************************************
+ConvertProblem
+This function takes the parameters passed to ipsolve, the lists of rows and
+columns to remove, builds the parameters of the trimmed-down problem, converting
+them to types suitable for passing to ipslv.*/
+ipslv_problem ConvertProblem(MemoryManager* mem, int* RowKeys, int* ColKeys, int Rows, int Cols, matrix* L, double* B, double* Cost, double* HiBound, double* LoBound, short* IntList, short* ctype)
+{
+ int i, j, k, l;
+ ipslv_problem result;
+ result.Constraints = Rows;
+ result.Variables = Cols;
+
+ /*Allocate the storage for the various copied parameters.*/
+ result.B = mcalloc(mem, Rows, sizeof(REAL));
+ result.ctype = mcalloc(mem, Rows, sizeof(int));
+ result.HiBound = mcalloc(mem, Cols, sizeof(REAL));
+ result.LoBound = mcalloc(mem, Cols, sizeof(REAL));
+ result.Cost = mcalloc(mem, Cols, sizeof(REAL));
+ result.IntList = mcalloc(mem, Cols, sizeof(int));
- /*Column copy loop. Copy all the column-related paremeters (those related to
+ /*Column copy loop. Copy all the column-related parameters (those related to
specific solution variables). Use k to be the index in the destination
arrays.*/
k = 0;
- for (j = 0; j < LCols0; j++)
+ for (i = 0; i < NumberOfColumns(*L); i++)
{
- if(ColKeys[j])
+ if(ColKeys[i])
{
- Cost1[k] = Cost0[j];
- HiBound1[k] = HiBound0[j];
- LoBound1[k] = LoBound0[j];
- IntList1[k++] = IntList0[j];
+ result.Cost[k] = Cost[i];
+ result.HiBound[k] = HiBound[i];
+ result.LoBound[k] = LoBound[i];
+ result.IntList[k++] = IntList[i] ? 1 : 0;
}
}
/*Row copy loop. Copy all of the row-related parameters (those related to the
constraint equations). Use k to be the index in the destination arrays.*/
k = 0;
- for (i = 0; i < LRows0; i++)
+ for (i = 0; i < NumberOfRows(*L); i++)
{
if (RowKeys[i])
{
- B1[k] = B0[i];
- if (ConstraintType0[i] < 0)
+ result.B[k] = B[i];
+ if (ctype[i] < 0)
{
- ConstraintType1[k] = -1;
+ result.ctype[k] = -1;
}
- else if (ConstraintType0[i] > 0)
+ else if (ctype[i] > 0)
{
- ConstraintType1[k] = 1;
+ result.ctype[k] = 1;
}
k++;
}
}
-
- /*If we have removed all rows or all columns, then there are no constraints
- imposed by the constraint matrix and we can go straight ahead to checking the
- feasible solution we developed earlier. Otherwise, proceed with solving for
- the constraints imposed by the constraint matrix.*/
- if(LRows1 && LCols1)
- {
- /*Allocate the storage for the matrix copy.*/
- L1 = mcalloc(&memory, LRows1, sizeof(REAL*));
- for (i = 0; i < LRows1; i++)
- {
- L1[i] = mcalloc(&memory, LCols1, sizeof(REAL));
- }
-
- /*The constraint matrix copy loop. Use i and j to represent indices within
- the source loop and k and l to represent indices in the destination loop.*/
- k = 0;
- for (i = 0; i < LRows0; i++)
- {
- if (RowKeys[i])
- {
- l = 0;
- for (j = 0; j < LCols0; j++)
- {
- if (ColKeys[j])
- {
- L1[k][l++] = GetMatrixEl(L0, i, j);
- }
- }
- k++;
- }
- }
-
- /*Solve: Syntax is:
- ipslv(REAL* f, REAL** L, REAL* b, int m, int n, int* intlist, REAL* ub,
- REAL* lb, int* ctype);*/
- result = ipslv(Cost1, L1, B1, LRows1, LCols1, IntList1, HiBound1, LoBound1, ConstraintType1);
-
- /*If the result type is unbounded, it means that in trying to minimize the
- cost function the ipslv routine has returned an unbounded variable in the '
- solution vector. If this occurs, zero the cost function and get a feasible
- solution.*/
- if (result.kind == 3)
+ /*Allocate the storage for the matrix copy.*/
+ result.L = mcalloc(mem, Rows, sizeof(REAL*));
+
+ /*The constraint matrix copy loop. Use i and j to represent indices within
+ the source loop and k and l to represent indices in the destination loop.*/
+ k = 0;
+ for (i = 0; i < NumberOfRows(*L); i++)
+ {
+ if (RowKeys[i])
{
- for (i = 0; i < LCols1; i++)
+ result.L[i] = mcalloc(mem, Cols, sizeof(REAL));
+ l = 0;
+ for (j = 0; j < NumberOfColumns(*L); j++)
{
- Cost1[i] = 0;
+ if (ColKeys[j])
+ {
+ result.L[k][l++] = GetMatrixEl(L, i, j);
+ }
}
- free(result.solution);
- result.solution = 0;
- result = ipslv(Cost1, L1, B1, LRows1, LCols1, IntList1, HiBound1, LoBound1, ConstraintType1);
+ k++;
}
-
- if (result.kind == 3 || result.kind == 0)
- {
- /*Now we have a solution to the subset of variables that we actually
- solved for. Go back and map this into the complete solution vector.*/
- for (i = 0, k = 0; i < LCols0; i++)
- {
- if(ColKeys[i])
- {
- /*If we get here, the column was used and there is a corresponding
- variable in the subset used with ipslv.*/
- Return.res[i] = result.solution[k++];
- }
- }
- }
}
- else
- {
- /*If we get here it means that we removed all rows or all columns. Set
- solution type to OK.*/
- result.kind = 0;
- }
+ return result;
+}
+/*******************************************************************************
+SetMessage
+This function examines the solution returned by ipsolve and sets the appropriate
+message in the result structure.*/
+void SetMessage(ipsolve_r* result, ipslv_r* lpresult, int Variables)
+{
+ int i;
/*Set the result message.*/
- switch(result.kind)
+ switch(lpresult->kind)
{
case 0:
- Return.mhow = HOW_OK;
+ result->mhow = HOW_OK;
break;
case 2:
- Return.mhow = HOW_INFEASIBLE;
+ result->mhow = HOW_INFEASIBLE;
break;
case 3:
- Return.mhow = HOW_UNBOUNDED;
+ result->mhow = HOW_UNBOUNDED;
break;
default:
- Return.mhow = HOW_NOTSOLVED;
+ result->mhow = HOW_NOTSOLVED;
break;
}
/*If there are any infinities in the solution, set the result message to
unbounded.*/
- for (i = 0; i < LRows0; i++)
+ for (i = 0; i < Variables; i++)
{
- if(Return.res[i] == INF)
+ if(result->res[i] == INF)
{
- Return.mhow = HOW_UNBOUNDED;
+ result->mhow = HOW_UNBOUNDED;
break;
}
}
- /*If the solution is OK or unbounded check to make sure it is feasible.*/
- if((! result.kind) || result.kind == 3)
+}
+
+/*******************************************************************************
+CheckSolution
+This function examines a proposed solution to make sure that it actually meets
+the constraints. It returns 1 if the solution meets the constraints and 0
+otherwise.*/
+int CheckSolution(matrix* L, double* B, short* ctype, ipsolve_r* result)
+{
+ int i, j;
+ double LTimesXLessB;
+ /*Iterate through each constraint. Make sure that the proposed solution
+ actually meets the constraint.*/
+ for (i = 0; i < NumberOfRows(*L); i++)
{
- for (i = 0; i < LRows0; i++)
+ LTimesXLessB = -B[i];
+ for (j = 0; j < NumberOfColumns(*L); j++)
{
- LTimesXLessB = -B0[i];
- for (j = 0; j < LCols0; j++)
+ LTimesXLessB += ((double) GetMatrixEl(L, i, j)) * result->res[j];
+ }
+ if (ctype[i] < 0)
+ {
+ if (LTimesXLessB - HOW_MAX_ERROR > 0)
{
- LTimesXLessB += ((double) GetMatrixEl(L0, i, j)) * Return.res[j];
- }
- if( (ConstraintType0[i] < 0 && LTimesXLessB - HOW_MAX_ERROR > 0)\
- || (ConstraintType0[i] == 0 && (LTimesXLessB - HOW_MAX_ERROR > 0 || LTimesXLessB + HOW_MAX_ERROR < 0))\
- || (ConstraintType0[i] > 0 && (LTimesXLessB + HOW_MAX_ERROR < 0)))
+ return 0;
+ }
+ }
+ else if (ctype[i] == 0)
+ {
+ if (LTimesXLessB - HOW_MAX_ERROR > 0 || LTimesXLessB + HOW_MAX_ERROR < 0)
{
- /*There was an error of some kind. Warn.*/
- merror(0, "IPSOLVE: Warning: Internal Error");
+ return 0;
}
- }
- }
- /*Now, free allocated memory.*/
- FreeMemory(&memory);
-
- return Return;
+ }
+ else
+ {
+ if (LTimesXLessB + HOW_MAX_ERROR < 0)
+ {
+ return 0;
+ }
+ }
+ }
+ return 1;
}
+
Modified: spnbox/tests/test-ipsolve.c
===================================================================
--- spnbox/tests/test-ipsolve.c 2009-06-29 22:54:48 UTC (rev 127)
+++ spnbox/tests/test-ipsolve.c 2009-07-01 04:50:35 UTC (rev 128)
@@ -1,254 +1,69 @@
-#include "../../pnheaders/general.h"
-#include "../spnbox.h"
-matrix GetMatrix(int rows, int cols);
-int GetIntInInclusiveRange(int min, int max, char* message);
-double* GetDoubleArray(int ArraySize, int InfinityAllowed);
+#include "test.h"
-int main()
+int main(int argc, char* argv[])
{
- ipsolve_r result;
+ char InDesc[] = "matrix L, arrayd B, arrayd F, arrayd HiBound, arrayd LoBound, arrayi IntList, arrayi CType";
+ char OutDesc[] = "string Message, arrayd Solution";
+
+ ipsolve_r result;
matrix L;
- double *B, *F;
- short *IntList;
- double *ub, *lb;
- short *ctype;
- char c;
- int paramcount, rows, cols, i, memcount = 0;
- void* mem[6];
- paramcount = GetIntInInclusiveRange(2, 7, "How many parameters do you want to pass to ipsolve (2-7)? ");
- cols = GetIntInInclusiveRange(2, 4, "How many variables are in the system of equations (2-4)? ");
- if (cols == 2)
- {
- printf("There will be two equations in the system.\n");
- rows = 2;
- }
- else
- {
- rows = GetIntInInclusiveRange(2, cols, "How many equations are in the system (2-Number of variables)? ");
- }
- printf("The contraint matrix L is %d x %d.\n", rows, cols);
- L = GetMatrix(rows, cols);
-
- printf("The constraint vector B is %d elements long.\n", rows);
- B = GetDoubleArray(rows, 0);
- mem[memcount++] = (void*) B;
-
- if (paramcount >= 3)
- {
- printf("The cost vector is %d elements long.\n", cols);
- F = GetDoubleArray(cols, 0);
- mem[memcount++] = (void*) F;
- }
- if (paramcount >= 4)
- {
- IntList = tcalloc(cols, sizeof(short));
- mem[memcount++] = (void*) IntList;
- printf ("Must each variable be an integer? Enter y or n per variable:\n");
- for (i = 0; i < cols; i++)
- {
- printf("x%d? (y/n) ", i);
- while (! scanf("%c", &c) || c == '\n');
- IntList[i] = (c == 'y' || c == 'Y');
- }
- }
- if (paramcount >= 5)
- {
- printf("The upper bounds array has %d elements.\n", cols);
- ub = GetDoubleArray(cols, 1);
- mem[memcount++] = (void*) ub;
- }
- if (paramcount >= 6)
- {
- printf("The lower bounds array has %d elements.\n", cols);
- lb = GetDoubleArray(cols, 1);
- mem[memcount++] = (void*) lb;
- for (i = 0; i < cols; i++)
- {
- if (lb[i] == INF)
- {
- lb[i] = -INF;
- }
- }
- }
- if (paramcount == 7)
- {
- printf("Enter the type of each constraint: l for less than or equal,\n");
- printf("e for equal, and g for greater than or equal:\n");
- ctype = tcalloc(cols, sizeof(short));
- mem[memcount++] = (void*) ctype;
- for (i = 0; i < cols; i++)
- {
- printf("Constraint %d: ", i);
- while (! scanf("%c", &c) || (c != 'l' && c != 'e' && c != 'g'));
- switch(c)
- {
- case 'l':
- ctype[i] = -1;
- break;
- case 'e':
- ctype[i] = 0;
- break;
- default:
- ctype[i] = 1;
- break;
- }
- }
- }
- /*Most complete syntax: ipsolve_r ipsolve(matrix *L, double *B, double *f, short *IntList, double *ub, double *lb, short *ctype)*/
- printf("Attempting solution...\n");
- switch(paramcount)
- {
- case 2:
- result = ipsolve(&L, B, 0, 0, 0, 0, 0);
- break;
- case 3:
- result = ipsolve(&L, B, F, 0, 0, 0, 0);
- break;
- case 4:
- result = ipsolve(&L, B, F, IntList, 0, 0, 0);
- break;
- case 5:
- result = ipsolve(&L, B, F, IntList, ub, 0, 0);
- break;
- case 6:
- result = ipsolve(&L, B, F, IntList, ub, lb, 0);
- break;
- case 7:
- result = ipsolve(&L, B, F, IntList, ub, lb, ctype);
- break;
- }
- printf("Solution type: %s.\n", result.mhow);
- if (result.res)
- {
- printf("Result: [");
- for (i = 0; i < cols; i++)
- {
- if (i) printf("\t");
- printf("%f", result.res[i]);
- }
- printf("]\n");
- }
- else
- {
- printf("Solution vector is empty.\n");
- }
- DeallocateMatrix(&L);
- for (i = 0; i < memcount; i++)
- {
- free(mem[i]);
- }
-}
+ double *B, *F, *ub, *lb;
+ int *IntIntList, *IntCType;
+ int numB, numF, numUB, numLB, numIntList, numCType;
+ short *IntList, *ctype;
-int GetIntInInclusiveRange(int min, int max, char* message)
-{
- int result, value;
- do
- {
- printf("%s", message);
- result = scanf("%i", &value);
- } while (! (result && value <= max && value >= min));
- return value;
+ int *InFilled, OutFilled[2];
+ int i;
+
+ FILE* input;
+
+ MemoryManager mem;
+
+ /*Get the input file.*/
+ if (! (input = GetInput(argc, argv)))
+ {
+ return 1;
+ }
+
+ mem = CreateMemoryManager(10, 10, 0, 0);
+
+ while (ParseStructure(input, InDesc, &InFilled, &mem, &L, &B, &numB, &F, &numF, &ub, &numUB, &lb, &numLB, &IntIntList, &numIntList, &IntCType, &numCType))
+ {
+ /*Display the problem.*/
+ DisplayStructure(InDesc, InFilled, &L, B, numB, F, numF, ub, numUB, lb, numLB, IntIntList, numIntList, IntCType, numCType);
+
+ /*Convert the integer arrays to shorts arrays.*/
+ if (InFilled[5])
+ {
+ IntList = mcalloc(&mem, numIntList, sizeof(short));
+ for (i = 0; i < numIntList; i++)
+ {
+ IntList[i] = (short) IntIntList[i];
+ }
+ }
+ if (InFilled[6])
+ {
+ ctype = mcalloc(&mem, numCType, sizeof(short));
+ for (i = 0; i < numCType; i++)
+ {
+ ctype[i] = (short) IntCType[i];
+ }
+ }
+
+ /*Solve the problem.
+ ipsolve_r ipsolve(matrix *L0, double* B0, double *Cost0, short int *IntList0, double *HiBound0, double *LoBound0, short int *ConstraintType0)*/
+ result = ipsolve(InFilled[0] ? &L : 0, InFilled[1] ? B : 0, InFilled[2] ? F : 0, InFilled[5] ? IntList : 0, InFilled[3] ? ub : 0, InFilled[4] ? lb : 0, InFilled[6] ? ctype : 0);
+
+ /*Fill the output display mask.*/
+ OutFilled[0] = 1;
+ OutFilled[1] = (result.res) ? 1 : 0;
+
+ /*Display the solution.*/
+ DisplayStructure(OutDesc, OutFilled, result.mhow, result.res, NumberOfColumns(L));
+
+ FreeMemory(&mem);
+ mem = CreateMemoryManager(10, 10, 0, 0);
+ }
+ FreeMemory(&mem);
+ return 0;
}
-
-double* GetDoubleArray(int ArraySize, int InfinityAllowed)
-{
- double *array;
- float value;
- int i, result;
- char choice = '\0';
- array = tcalloc(ArraySize, sizeof(double));
- printf("Enter the elements of the array:\n");
- if (InfinityAllowed)
- {
- printf("(Enter -1 to be given a choice between -1 and infinity)\n");
- }
- for (i = 0; i < ArraySize; i++)
- {
- do
- {
- printf("Element %d: ", i);
- if(result = scanf("%g", &value))
- {
- array[i] = value;
-
- if (array[i] == -1.0 && InfinityAllowed)
- {
- printf("Do you wish to set the element to infinity? (y/n) ");
- while (! scanf("%c", &choice) || choice == '\n');
- if (choice == 'y' || choice == 'Y') array[i] = INF;
- }
- }
- } while(! result);
- }
- return array;
-}
-
-matrix GetMatrix(int rows, int cols)
-{
- matrix Return;
- int i, j, result;
-
- short int element;
- AllocateMatrixType(2, &Return, rows, cols);
- printf("Enter the matrix data:\n");
- for (i = 0; i < rows; i++)
- {
- for (j = 0; j < cols; j++)
- {
- do
- {
- printf("Element (%d, %d): ", i, j);
- if( result = scanf("%i", &element))
- {
- SetMatrixEl(&Return, i, j, element);
- }
- } while(! result);
- }
- }
- return Return;
-}
-
-/* Archive: some code originally placed midway through the ipsolve function to print out the problem description for debugging purposes.
-
- printf("DEBUG: The problem description is shown here:\n");
- printf("Constraint Equations:\n");
- for (i = 0; i < LRows1; i++)
- {
- for (j = 0; j < LCols1; j++)
- {
- printf("\t%f", L1[i][j]);
- }
- switch(ConstraintType1[i])
- {
- case -1:
- printf("\t<=\t");
- break;
- case 0:
- printf("\t=\t");
- break;
- case 1:
- printf("\t>=\t");
- break;
- }
- printf("%f\n", B1[i]);
- }
- printf("Bounds/domains of variables:\n");
- for (j = 0; j < LCols1; j++)
- {
- if (LoBound1[j] == -INF)
- {
- printf("-infinity <= x <= ");
- }
- else
- {
- printf("%f <= x <= ", LoBound1[j]);
- }
- if (HiBound1[j] == INF)
- {
- printf("infinity. x a%s of cost %f.\n", IntList1[j] ? "n integer" : "real.", Cost1[j]);
- }
- else
- {
- printf("%f. x a%s of cost %f.\n", HiBound1[j], IntList1[j] ? "n integer" : "real", Cost1[j]);
- }
- }*/
Modified: spnbox/tests/test-ipsolve.mak
===================================================================
--- spnbox/tests/test-ipsolve.mak 2009-06-29 22:54:48 UTC (rev 127)
+++ spnbox/tests/test-ipsolve.mak 2009-07-01 04:50:35 UTC (rev 128)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-ipsolve: test-ipsolve.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o
- $(COMPILER) -o test-ipsolve.exe pns.o matrix.o general.o matrixmath.o test-ipsolve.o ipsolve.o ipslv.o MemoryManager.o ../liblpsolve55.a
+test-ipsolve-new: test-ipsolve-new.o pns.o matrix.o general.o matrixmath.o ipsolve-new.o MemoryManager.o ipslv.o StructuredIO.o test.o
+ $(COMPILER) -o test-ipsolve-new.exe pns.o matrix.o general.o matrixmath.o test-ipsolve-new.o ipsolve-new.o ipslv.o MemoryManager.o StructuredIO.o test.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
@@ -15,8 +15,8 @@
matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../matrixmath.c
-ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
- $(COMPILER) -c ../ipsolve.c
+ipsolve-new.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve-new.c
+ $(COMPILER) -c ../ipsolve-new.c
ipslv.o: ../spnbox.h ../ipslv.c
$(COMPILER) -c ../ipslv.c
@@ -24,5 +24,12 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
-test-ipsolve.o: test-ipsolve.c ../spnbox.h ../../pnheaders/general.h
- $(COMPILER) -c test-ipsolve.c
+test-ipsolve-new.o: test-ipsolve-new.c ../spnbox.h ../../pnheaders/general.h
+ $(COMPILER) -c test-ipsolve-new.c
+
+test.o: test.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+ $(COMPILER) -c test.c
+
+StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
+ $(COMPILER) -c StructuredIO.c
+
Added: spnbox/tests/test-ipsolve.txt
===================================================================
--- spnbox/tests/test-ipsolve.txt (rev 0)
+++ spnbox/tests/test-ipsolve.txt 2009-07-01 04:50:35 UTC (rev 128)
@@ -0,0 +1,300 @@
+rem "How many parameters do you want to pass to ipsolve (2-7)? ");
+rem "How many variables are in the system of equations (2-4)? ");
+rem If only two cols, know only two equations.
+rem matrix elements
+rem B
+rem F
+rem IntList
+rem HiBound - -1 -> infinity
+rem LoBound
+rem CType
+
+echo Problem 1.
+echo Uses equality constraints.
+L 2 2
+1 1
+1 -1
+
+B 2
+4 2
+
+F 2
+1 1
+
+IntList 2
+1 1
+
+HiBound 2
+1e30 1e30
+
+LoBound 2
+0 0
+
+CType 2
+0 0
+
+done
+
+echo Problem 2.
+L 2 2
+1 1
+1 -1
+
+B 2
+6 2
+
+F 2
+0 -1
+
+CType 2
+0 0
+done
+
+echo Problem 3.
+echo One of the variables has zero cost.
+echo Equality constraints.
+L 2 2
+1 1
+1 -1
+
+B 2
+2 100
+
+F 2
+0 -1
+
+CType 2
+0 0
+done
+
+echo Problem 4.
+L 2 2
+1 1
+5 1
+
+B 2
+2 2
+
+F 2
+-100 100
+
+CType 2
+1 1
+
+done
+
+echo Problem 5.
+echo Has one negative and one positive cost vector.
+echo Has lower boundaries at minus infinity.
+
+L 2 2
+1 1
+1 -1
+
+B 2
+-2 0
+
+F 2
+-100 100
+
+LoBound 2
+-1e30 -1e30
+done
+
+echo Problem 6.
+echo Has an upper bound below a lower bound.
+echo Should be infeasible.
+
+L 2 2
+1 1
+1 -1
+
+B 2
+-2 0
+
+F 2
+-100 100
+
+HiBound 2
+10 10
+
+LoBound 2
+20
+-1e30
+
+done
+
+echo Problem 7.
+echo Relies on default values of IntList.
+echo Has lowish upper bounds.
+L 2 2
+1 1
+1 -1
+
+B 2
+4 2
+
+F 2
+-1 -1
+
+HiBound 2
+10 10
+
+done
+
+echo Problem 8.
+echo Negative cost vector, all variables integral.
+L 2 2
+1 1
+1 -1
+
+B 2
+4 2
+
+F 2
+-1 -1
+
+IntList 2
+1 1
+
+done
+
+echo Problem 9.
+echo Does not require the results to be integral.
+echo Negative cost vector.
+
+L 2 2
+1 1
+1 -1
+
+B 2
+4.5 2.5
+
+F 2
+-1 -1
+
+IntList 2
+0 0
+
+done
+
+echo Problem 10.
+echo Negative cost vector.
+L 2 2
+1 1
+1 -1
+
+B 2
+4.5 2.5
+
+F 2
+-1 -1
+
+done
+
+echo Problem 11.
+echo Uses negative cost vector - maximization problem.
+echo Has a null constraint column.
+L 2 2
+1 0
+1 0
+
+B 2
+4.5 2.5
+
+F 2
+-1 -1
+
+done
+
+echo Problem 12.
+echo Uses a cost vector with one negative and one positive
+echo element.
+echo Has a null constraint column.
+L 2 2
+1 0
+1 0
+
+B 2
+4.5 2.5
+
+F 2
+-1 1
+
+IntList 2
+1 1
+done
+
+echo Problem 13.
+echo Uses a null constraint row.
+L 2 2
+1 1
+0 0
+
+B 2
+4.5 2.5
+
+F 2
+-1 1
+
+done
+
+echo Problem 14.
+echo Uses nonintegral constraints.
+L 2 2
+1 1
+1 -1
+
+B 2
+4.5 2.5
+
+done
+
+echo Problem 15.
+echo Uses a negative constraint vector value.
+L 2 2
+1 1
+1 -1
+
+B 2
+4.5 -1
+
+done
+
+echo Problem 16.
+echo Uses more constraints than variables.
+L 3 2
+1 0
+0 1
+-1 -1
+
+B 3
+2
+2
+-2
+
+F 2
+1 1
+
+CType 3
+1 1 -1
+
+done
+
+echo Problem 17.
+echo Uses more variables than constraints.
+L 2 3
+1 0 0
+1 1 -1
+
+B 2
+2 3
+
+F 2
+1 1
+
+done
+
+quit
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2009-06-29 22:55:36
|
Revision: 127
http://pntool.svn.sourceforge.net/pntool/?rev=127&view=rev
Author: stephencamp
Date: 2009-06-29 22:54:48 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Changed include paths and makefile paths to reflect new location of lpsolve files.
Modified Paths:
--------------
spnbox/Makefile
spnbox/ipslv.c
spnbox/spnbox.h
spnbox/tests/test-actn.mak
spnbox/tests/test-ilpadm.mak
spnbox/tests/test-ipslv.mak
spnbox/tests/test-ipsolve.mak
spnbox/tests/test-isadm.mak
spnbox/tests/test-linenf.c
spnbox/tests/test-linenf.mak
spnbox/tests/test-msplit.mak
spnbox/tests/test-nltrans.mak
spnbox/tests/test-pn2acpn.mak
spnbox/tests/test-pn2eacpn.mak
spnbox/tests/test-reduce.mak
Modified: spnbox/Makefile
===================================================================
--- spnbox/Makefile 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/Makefile 2009-06-29 22:54:48 UTC (rev 127)
@@ -14,7 +14,7 @@
ilpadm.o: ilpadm.c spnbox.h MemoryManager.h matrixmath.h ../pnheaders/general.h ../pnheaders/matrix.h ../pnheaders/pns.h
$(COMPILER) -c ilpadm.c
-ipslv.o: ipslv.c spnbox.h lp_solve_5.5/lp_lib.h
+ipslv.o: ipslv.c spnbox.h ../third-party/lp_solve_5.5/lp_lib.h
$(COMPILER) -c ipslv.c
ipsolve.o: ipsolve.c spnbox.h matrixmath.h ../pnheaders/general.h ../pnheaders/matrix.h
@@ -50,8 +50,8 @@
supervis.o: supervis.c spnbox.h matrixmath.h ../pnheaders/matrix.h
$(COMPILER) -c supervis.c
-liblpsolve55.a: ./lp_solve_5.5/lpsolve55/liblpsolve55.a
- cp ./lp_solve_5.5/lpsolve55/liblpsolve55.a liblpsolve55.a
+liblpsolve55.a: ../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a
+ cp ../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a liblpsolve55.a
-./lp_solve_5.5/lpsolve55/liblpsolve55.a:
- cd lp_solve_5.5; make -f Makefile.linux lib
+../third-party/lp_solve_5.5/lpsolve55/liblpsolve55.a:
+ cd ../third-party/lp_solve_5.5; make -f Makefile.linux lib
Modified: spnbox/ipslv.c
===================================================================
--- spnbox/ipslv.c 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/ipslv.c 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,5 +1,5 @@
#include "spnbox.h"
-#include "lp_solve_5.5/lp_lib.h"
+#include "../third-party/lp_solve_5.5/lp_lib.h"
#include <stdlib.h>
#include <stdio.h>
Modified: spnbox/spnbox.h
===================================================================
--- spnbox/spnbox.h 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/spnbox.h 2009-06-29 22:54:48 UTC (rev 127)
@@ -3,7 +3,7 @@
#include <stdarg.h>
#include "../pnheaders/matrix.h"
-#include "./lp_solve_5.5/lpkit.h"
+#include "../third-party/lp_solve_5.5/lpkit.h"
typedef struct supervis_r { /* result of supervis */
matrix Dfm;
Modified: spnbox/tests/test-actn.mak
===================================================================
--- spnbox/tests/test-actn.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-actn.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-actn: test-actn.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o actn.o
- $(COMPILER) -o test-actn.exe pns.o matrix.o general.o matrixmath.o test-actn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o actn.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-actn.exe pns.o matrix.o general.o matrixmath.o test-actn.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o actn.o ../liblpsolve55.a
matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
$(COMPILER) -c ../../pnheaders/matrix.c
Modified: spnbox/tests/test-ilpadm.mak
===================================================================
--- spnbox/tests/test-ilpadm.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-ilpadm.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-ilpadm-new: test-ilpadm-new.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm-new.o ipsolve.o ipslv.o StructuredIO.o test.o
- $(COMPILER) -o test-ilpadm-new.exe pns.o matrix.o general.o matrixmath.o test-ilpadm-new.o ilpadm-new.o ipsolve.o MemoryManager.o StructuredIO.o test.o ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+test-ilpadm: test-ilpadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm.o ipsolve.o ipslv.o StructuredIO.o test.o
+ $(COMPILER) -o test-ilpadm.exe pns.o matrix.o general.o matrixmath.o test-ilpadm.o ilpadm.o ipsolve.o MemoryManager.o StructuredIO.o test.o ipslv.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
@@ -15,8 +15,8 @@
matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../matrixmath.c
-ilpadm-new.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm-new.c
- $(COMPILER) -c ../ilpadm-new.c
+ilpadm.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm.c
+ $(COMPILER) -c ../ilpadm.c
ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
$(COMPILER) -c ../ipsolve.c
@@ -33,5 +33,5 @@
StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
$(COMPILER) -c StructuredIO.c
-test-ilpadm-new.o: test-ilpadm-new.c ../spnbox.h ../../pnheaders/general.h
- $(COMPILER) -c test-ilpadm-new.c
+test-ilpadm.o: test-ilpadm.c ../spnbox.h ../../pnheaders/general.h
+ $(COMPILER) -c test-ilpadm.c
Modified: spnbox/tests/test-ipslv.mak
===================================================================
--- spnbox/tests/test-ipslv.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-ipslv.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,6 +1,6 @@
test-ipslv.exe: test-ipslv.o ipslv.o
- gcc -g -o test-ipslv.exe ipslv.o test-ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ gcc -g -o test-ipslv.exe ipslv.o test-ipslv.o ../liblpsolve55.a
test-ipslv.o: test-ipslv.c ../spnbox.h
gcc -g -c test-ipslv.c
Modified: spnbox/tests/test-ipsolve.mak
===================================================================
--- spnbox/tests/test-ipsolve.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-ipsolve.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-ipsolve: test-ipsolve.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o
- $(COMPILER) -o test-ipsolve.exe pns.o matrix.o general.o matrixmath.o test-ipsolve.o ipsolve.o ipslv.o MemoryManager.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-ipsolve.exe pns.o matrix.o general.o matrixmath.o test-ipsolve.o ipsolve.o ipslv.o MemoryManager.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-isadm.mak
===================================================================
--- spnbox/tests/test-isadm.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-isadm.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-isadm: test-isadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o isadm.o readpns.o
- $(COMPILER) -o test-isadm.exe pns.o matrix.o general.o matrixmath.o test-isadm.o MemoryManager.o readpns.o isadm.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-isadm.exe pns.o matrix.o general.o matrixmath.o test-isadm.o MemoryManager.o readpns.o isadm.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-linenf.c
===================================================================
--- spnbox/tests/test-linenf.c 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-linenf.c 2009-06-29 22:54:48 UTC (rev 127)
@@ -32,6 +32,11 @@
int NullMatrix(matrix* m);
int NullArray(int* Array, int Length);
+int is_verbose()
+{
+ return VRB_MAX;
+}
+
int main()
{
linenf_problem problem, solution;
Modified: spnbox/tests/test-linenf.mak
===================================================================
--- spnbox/tests/test-linenf.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-linenf.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-linenf: test-linenf.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o linenf.o test-linenf.o ilpadm.o
- $(COMPILER) -o test-linenf.exe pns.o matrix.o general.o matrixmath.o test-linenf.o ipsolve.o ipslv.o linenf.o ilpadm.o MemoryManager.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-linenf.exe pns.o matrix.o general.o matrixmath.o test-linenf.o ipsolve.o ipslv.o linenf.o ilpadm.o MemoryManager.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-msplit.mak
===================================================================
--- spnbox/tests/test-msplit.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-msplit.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-mpsplit: test-msplit.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o msplit.o
- $(COMPILER) -o test-msplit.exe test-msplit.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o msplit.o matrixmath.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-msplit.exe test-msplit.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o msplit.o matrixmath.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-nltrans.mak
===================================================================
--- spnbox/tests/test-nltrans.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-nltrans.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-nltrans: test-nltrans.o pns.o matrix.o general.o matrixmath.o ipsolve.o MemoryManager.o ipslv.o StructuredIO.o nltrans.o
- $(COMPILER) -o test-nltrans.exe pns.o matrix.o general.o matrixmath.o test-nltrans.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-nltrans.exe pns.o matrix.o general.o matrixmath.o test-nltrans.o ipsolve.o ipslv.o MemoryManager.o StructuredIO.o nltrans.o ../liblpsolve55.a
matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
$(COMPILER) -c ../../pnheaders/matrix.c
Modified: spnbox/tests/test-pn2acpn.mak
===================================================================
--- spnbox/tests/test-pn2acpn.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-pn2acpn.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-pn2acpn: test-pn2acpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o pn2acpn.o
- $(COMPILER) -o test-pn2acpn.exe test-pn2acpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2acpn.o matrixmath.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-pn2acpn.exe test-pn2acpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2acpn.o matrixmath.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-pn2eacpn.mak
===================================================================
--- spnbox/tests/test-pn2eacpn.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-pn2eacpn.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-pn2eacpn: test-pn2eacpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o pn2eacpn.o nltrans.o ipsolve.o ipslv.o
- $(COMPILER) -o test-pn2eacpn.exe test-pn2eacpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2eacpn.o matrixmath.o nltrans.o ipsolve.o ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-pn2eacpn.exe test-pn2eacpn.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o pn2eacpn.o matrixmath.o nltrans.o ipsolve.o ipslv.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
Modified: spnbox/tests/test-reduce.mak
===================================================================
--- spnbox/tests/test-reduce.mak 2009-06-29 22:34:52 UTC (rev 126)
+++ spnbox/tests/test-reduce.mak 2009-06-29 22:54:48 UTC (rev 127)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
test-reduce: test-reduce.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o matrixmath.o chkcons.o reduce.o ipsolve.o ipslv.o
- $(COMPILER) -o test-reduce.exe test-reduce.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o reduce.o matrixmath.o chkcons.o ipsolve.o ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+ $(COMPILER) -o test-reduce.exe test-reduce.o matrix.o StructuredIO.o MemoryManager.o general.o pns.o reduce.o matrixmath.o chkcons.o ipsolve.o ipslv.o ../liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ste...@us...> - 2009-06-29 22:36:07
|
Revision: 126
http://pntool.svn.sourceforge.net/pntool/?rev=126&view=rev
Author: StephenCamp
Date: 2009-06-29 22:34:52 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Deleting old copies of lpsolve.
Removed Paths:
-------------
spnbox/lp_solve_5.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ste...@us...> - 2009-06-29 22:25:24
|
Revision: 125
http://pntool.svn.sourceforge.net/pntool/?rev=125&view=rev
Author: StephenCamp
Date: 2009-06-29 22:24:10 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
New folder for lpsolve (3rd party MILP solver).
Added Paths:
-----------
third-party/lp_solve_5.5/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Ste...@us...> - 2009-06-29 22:20:11
|
Revision: 124
http://pntool.svn.sourceforge.net/pntool/?rev=124&view=rev
Author: StephenCamp
Date: 2009-06-29 22:19:26 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Cleaned up the code in ilpadm.c to make it more readable.
Rewrote test-ilpadm.c to use new test functionality and to take test problems from a script file instead of hardcoded data.
Added common test functions to test.c/h.
Fixed miscellaneous minor bugs and comment errors in other files.
Modified Paths:
--------------
spnbox/ilpadm.c
spnbox/spnbox.h
spnbox/tests/test-ilpadm.c
spnbox/tests/test-ilpadm.mak
spnbox/tests/test-pn2eacpn.c
spnbox/tests/test-pn2eacpn.mak
Added Paths:
-----------
spnbox/tests/test-ilpadm.txt
spnbox/tests/test.c
spnbox/tests/test.h
Modified: spnbox/ilpadm.c
===================================================================
--- spnbox/ilpadm.c 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/ilpadm.c 2009-06-29 22:19:26 UTC (rev 124)
@@ -5,15 +5,26 @@
#include "matrixmath.h"
#include "MemoryManager.h"
+/*Subroutine declarations. See subroutine definitions for descriptions.*/
+static int CheckParams(matrix* L, matrix* D, int** Tuc, int* TucCount, int** Tuo, int* TuoCount);
+static void InitLPProblems(matrix *M1, matrix* M2, double** N1, double** N2, short** CType1, short** CType2, double** LoBounds, double** Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, matrix *D, MemoryManager * mem);
+static ilpadm_r InitOther(matrix* CDeltas, matrix *L, matrix* D, int *Tuc, int TucCount, int* Tuo, int TuoCount, MemoryManager* mem);
+static int TransformType(matrix* CDeltas, matrix* L, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint);
+static void BuildLP1(matrix *M1, matrix* CDeltas, double* Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint);
+static int RedoLP1(matrix* L, int* b, ipsolve_r* solution, int Constraint);
+static void BuildLP1Alternate(matrix* M2, matrix* CDeltas, matrix* L, int *Tuc, int TucCount, int *Tuo, int TuoCount, int Constraint);
+static void BuildLP2(matrix* M2, matrix* L, matrix* CDeltas, double* Cost, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint);
+static void ApplySolution(ilpadm_r* result, ipsolve_r* res, int Constraint, int Places, int Constraints);
+static FinalizeSolution(ilpadm_r* result, matrix* L, int* b, int Places, int Constraints);
static void disp(char* beginning, char* parameter, char* end, int i, int p);
ilpadm_r ilpadm(matrix* L, int* b, matrix* D, int TucCount, int* Tuc, int TuoCount, int* Tuo, int* m0)
{
/*The parameters to return.*/
- ilpadm_r Return;
+ ilpadm_r result;
/*The return value from ipsolve*/
- ipsolve_r IntegerSolution;
+ ipsolve_r LPSolution;
/*Variables. L is a constraint matrix.
L has as many columns as there are places in the Petri net represented by D,
@@ -21,47 +32,144 @@
L has as many rows as there are constraints.
D is the incidence matrix of a Petri net. It has as many rows as there are
places and as many columns as there are transitions.
- ConstraintDeltas is a matrix of the change in constraint-met state (negative
- means more met, 0 just met, positive means less met) that will occur when
- uncontrollable or unobservable transitions fire. Each row holds all the deltas
- for a specific constraint, and each column holds all the deltas for a specific
- transition*/
+ CDeltas is a matrix of the change in constraint-met state (negative means more
+ met, 0 just met, positive means less met) that will occur when uncontrollable
+ or unobservable transitions fire. Each row holds all the deltas for a specific
+ constraint, and each column holds all the deltas for a specific transition*/
int Constraints, Places, Transitions;
- matrix ConstraintDeltasUCT, ConstraintDeltasUOT;
+ matrix CDeltas;
- /*Flags and generic variables.*/
- int i = 0, j = 0, k, x, UCTDeltasNegative, UOTDeltasZero, flag;
+ /*Generic variables.*/
+ int i = 0, j = 0;
- matrix ConstraintsMet;
- matrix Marking0;
-
/*The constraint matrices M1 & 2 , constraint vector N1 & 2, constraint type
- vector ConstraintType1 & 2, and lower bounds LoBounds that will be used for
- the linear programming problem when developing the transform. 2 is identical
- to one in all cases except it has an extra constraint row. Which one we need
- is determined per loop iteration.*/
+ vector CType1 & 2, and lower bounds LoBounds that will be used for the linear
+ programming problem when developing the transform. 2 is identical to 1 in all
+ cases except it has an extra constraint row. Which one we need is determined
+ per loop iteration.*/
double *N1, *N2, *LoBounds, *Cost;
- short *ConstraintType1, *ConstraintType2;
+ short *CType1, *CType2;
matrix M1, M2;
/*Keep track of dynamically allocated memory so we can free it at the end.*/
MemoryManager memory;
/*Initialize the return value to an error value.*/
- AllocateMatrixType(2, &Return.La, 0, 0);
- AllocateMatrixType(2, &Return.R1, 0, 0);
- AllocateMatrixType(2, &Return.R2, 0, 0);
- Return.ba = 0;
- Return.how = HOW_ERROR;
- Return.dhow = 0;
+ memset(&result, 0, sizeof(ilpadm_r));
+ result.how = HOW_ERROR;
/*Check the parameters. Fail if any required parameters have not been given
and fill in defaults for any nonrequired parameters. L and D are required and
at least one of Tuc or Tuo is required. All other parameters are optional.*/
- if (! (L && D))
+ if (! CheckParams(L, D, &Tuc, &TucCount, &Tuo, &TuoCount))
+ {
+ return result;
+ }
+
+ Constraints = NumberOfRows(*L);
+ Places = NumberOfColumns(*L);
+ Transitions = NumberOfColumns(*D);
+
+ /*Create the memory manager.*/
+ memory = CreateMemoryManager(10, 5, 10, 5);
+
+ /*Allocate space for and initialize the descriptions of the two types of
+ linear programming problems that are possible when determining the
+ transformation of any given constraint. Most of the problem will not change
+ from constraint to constraint, so we can initialize within this function
+ before the main constraint-processing loop.*/
+ InitLPProblems(&M1, &M2, &N1, &N2, &CType1, &CType2, &LoBounds, &Cost, Tuc, TucCount, Tuo, TuoCount, D, &memory);
+
+ /*Allocate space for and initialize some other quantities that will be used
+ mid-problem.*/
+ result = InitOther(&CDeltas, L, D, Tuc, TucCount, Tuo, TuoCount, &memory);
+
+ if(is_verbose() >= VRB_ILPADM)
{
+ printf("\n");
+ }
+
+ for (i = 0; i < Constraints; i++)
+ {
+ /*Status on each row defaults to OK.*/
+ result.dhow[i] = HOW_OK;
+
+ /*The ipsolve solution, used later, defaults to empty.*/
+ memset(&LPSolution, 0, sizeof(ipsolve_r));
+
+ /*See what kind of transformation needs to be done on the current constraint.*/
+ switch(TransformType(&CDeltas, L, b, m0, Tuc, TucCount, Tuo, TuoCount, i))
+ {
+ case -1:
+ /*The constraint is infeasible. Set messages.*/
+ result.dhow[i] = HOW_INFEASIBLE;
+ disp("The transformation is infeasible due to the initial marking", "", ".", i, Constraints);
+ break;
+ case 0:
+ /*No transformation is necessary.*/
+ result.dhow[i] = HOW_OK;
+ disp("No transformation is necessary", "", ".", i, Constraints);
+ /*Copy the original marking constraint row, untransformed. Do so by
+ leaving this row of R1 all zeros and making this element along R2's
+ diagonal equal to 1.*/
+ SetMatrixEl(&result.R2, i, i, 1);
+ break;
+ case 1:
+ /*A type-1 transformation, one that ignores initial marking, should be done.
+ Build the last few parameters of the linear programming problem.*/
+ BuildLP1(&M1, &CDeltas, Cost, Tuc, TucCount, Tuo, TuoCount, i);
+ /*Solve the linear programming problem.*/
+ LPSolution = ipsolve(&M1, N1, Cost, 0, 0, LoBounds, CType1);
+ /*There are conditions under which we may need to resolve the problem with
+ an additional constraint. Test for them.*/
+ if (RedoLP1(L, b, &LPSolution, i))
+ {
+ /*Build the alternate linear programming problem and solve it.*/
+ BuildLP1Alternate(&M2, &CDeltas, L, Tuc, TucCount, Tuo, TuoCount, i);
+ LPSolution = ipsolve(&M2, N2, Cost, 0, 0, LoBounds, CType2);
+ //Set the status message as appropriate.
+ if (LPSolution.res)
+ {
+ result.dhow[i] = LPSolution.mhow;
+ }
+ else
+ {
+ result.dhow[i] = HOW_NOTSOLVED;
+ }
+ }
+ /*Apply the resultes of the linear programming problem to the
+ transformation matrices.*/
+ ApplySolution(&result, &LPSolution, i, Places, Constraints);
+ break;
+ case 2:
+ /*A type-2 transformation, one that takes into account the initial
+ marking, should be done. Build the last few parameters of the linear
+ programming problem.*/
+ BuildLP2(&M2, L, &CDeltas, Cost, b, m0, Tuc, TucCount, Tuo, TuoCount, i);
+ /*Solve the LP.*/
+ LPSolution = ipsolve(&M2, N2, Cost, 0, 0, LoBounds, CType2);
+ result.dhow[i] = LPSolution.mhow;
+ /*Apply the results to the transformation matrices.*/
+ ApplySolution(&result, &LPSolution, i, Places, Constraints);
+ break;
+ }
+ }
+
+ /*Finalize the solution.*/
+ FinalizeSolution(&result, L, b, Places, Constraints);
+ //Free memory and return.
+ FreeMemory(&memory);
+ return result;
+}
+
+int CheckParams(matrix* L, matrix* D, int** Tuc, int* TucCount, int** Tuo, int* TuoCount)
+{
+ int Constraints, Places, Transitions;
+ /*L and D are both required.*/
+ if (! (L && D))
+ {
merror(0, "ilpadm: Required parameters were null pointers");
- return Return;
+ return 0;
}
Constraints = NumberOfRows(*L);
Places = NumberOfColumns(*L);
@@ -71,81 +179,72 @@
if (Places != NumberOfRows(*D))
{
merror(0, "ilpadm: L does not have the same number of columns as D does rows");
- return Return;
+ return 0;
}
- /*At least one of Tuc or Tuo must be provided. If not, there is no
+ /*Make sure that nullity of array pointers and zero in array lengths agree.*/
+ if (! *Tuc)
+ {
+ *TucCount = 0;
+ }
+ else if (! *TucCount)
+ {
+ *Tuc = 0;
+ }
+ if (! *Tuo)
+ {
+ *TuoCount = 0;
+ }
+ else if (! *TuoCount)
+ {
+ *Tuo = 0;
+ }
+ /*At least one of Tuc or Tuo must be provided. If not, there is no
transformation to perform, since there are no unobservable or uncontrollable
transitions.*/
- if (!( Tuc || Tuo))
+ if (!( *Tuc || *Tuo))
{
merror(0, "ilpadm: Both Tuc and Tuo are null pointers");
- }
- /*Create the memory manager.*/
- memory = CreateMemoryManager(10, 5, 10, 5);
-
- /*If we make it past the tests, then the how message defaults to OK.*/
- Return.how = HOW_OK;
-
- if(is_verbose() >= VRB_ILPADM)
- {
- printf("\n");
- }
+ return 0;
+ }
+ return 1;
+}
+void InitLPProblems(matrix *M1, matrix* M2, double** N1, double** N2, short** CType1, short** CType2, double** LoBounds, double** Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, matrix *D, MemoryManager * mem)
+{
+ int Places, i;
+ Places = NumberOfRows(*D);
+
/*Allocate space and initialize values.*/
- MAllocateMatrixType(&memory, 2, &M1, TucCount + TuoCount, Places + 1);
- MAllocateMatrixType(&memory, 2, &M2, TucCount + TuoCount + 1, Places + 1);
- N1 = mcalloc(&memory, (TucCount + TuoCount), sizeof(double));
- N2 = mcalloc(&memory, (TucCount + TuoCount + 1), sizeof(double));
- LoBounds = mcalloc(&memory, (Places + 1), sizeof(double));
- Cost = mcalloc(&memory, (Places + 1), sizeof(double));
- ConstraintType1 = mcalloc(&memory, (TucCount + TuoCount), sizeof(short));
- ConstraintType2 = mcalloc(&memory, (TucCount + TuoCount + 1), sizeof(short));
-
- /*Allocate space for R1. It will be added to the constraint matrix, so it
- should have a row for each constraint and a column for each place, just like
- the original constraint matrix.*/
- AllocateMatrixType(2, &Return.R1, Constraints, Places);
- /*Allocate space for R2. It will be a square matrix with the same number of
- rows and columns as L has rows.*/
- AllocateMatrixType(2, &Return.R2, Constraints, Constraints);
+ MAllocateMatrixType(mem, 2, M1, TucCount + TuoCount, Places + 1);
+ MAllocateMatrixType(mem, 2, M2, TucCount + TuoCount + 1, Places + 1);
+ *N1 = mcalloc(mem, (TucCount + TuoCount), sizeof(double));
+ *N2 = mcalloc(mem, (TucCount + TuoCount + 1), sizeof(double));
+ *LoBounds = mcalloc(mem, (Places + 1), sizeof(double));
+ *Cost = mcalloc(mem, (Places + 1), sizeof(double));
+ *CType1 = mcalloc(mem, (TucCount + TuoCount), sizeof(short));
+ *CType2 = mcalloc(mem, (TucCount + TuoCount + 1), sizeof(short));
/*If there are uncontrollable transitions, Tuc is an array of indexes to the
columns in D that contain them. Fill the first TucCount rows of M with these
columns. Since we are filling rows with columns, transpose M1 and M2 and
transpose them again after this block. Also, initialize the constraint types,
constraint vectors, and so forth.*/
- TransposeMatrix(&M1);
- TransposeMatrix(&M2);
- if(Tuc)
- {
- MAllocateMatrixType(&memory, 2, &ConstraintDeltasUCT, Constraints, TucCount);
-
+ TransposeMatrix(M1);
+ TransposeMatrix(M2);
+
+ if(Tuc)
+ {
for (i = 0; i < TucCount; i++)
{
/*Each integer problem constraint corresponding to an uncontrollable
transition is a <= type.*/
- ConstraintType1[i] = -1;
- ConstraintType2[i] = -1;
+ (*CType1)[i] = -1;
+ (*CType2)[i] = -1;
/*Copy a single column, index Tuc[i], from D to the appropriate row of M1
and M2.*/
- CopyBlock(Places, 1, D, 0, Tuc[i], &M1, 0, i);
- CopyBlock(Places, 1, D, 0, Tuc[i], &M2, 0, i);
-
- /*We need a record of the changes to constraint-met state that occur for
- each of the uncontrollable and unobservable transitions. This corresponds
- to the matrix product of L * an incidence matrix containing only those
- transitions. We cannot use a regular matrix product because we just want
- to multiply by one column of D. We take the matrix product by loop.*/
- for (j = 0; j < Constraints; j++)
- {
- x = 0;
- for (k = 0; k < Places; k++)
- {
- x += GetMatrixEl(L, j, k) * GetMatrixEl(D, k, Tuc[i]);
- }
- SetMatrixEl(&ConstraintDeltasUCT, j, i, x);
- }
+ CopyBlock(Places, 1, D, 0, Tuc[i], M1, 0, i);
+ CopyBlock(Places, 1, D, 0, Tuc[i], M2, 0, i);
}
}
else
@@ -154,31 +253,15 @@
}
/*Do the same thing for unobservable transitions.*/
if(Tuo)
- {
- MAllocateMatrixType(&memory, 2, &ConstraintDeltasUOT, Constraints, TuoCount);
+ {
for (i = 0; i < TuoCount; i++)
{
/*The constraint types corresponding to unobservable transitions are =.
They default to this. No need to change.*/
/*Copy a single column, index Tuo[i], from D to the appropriate row of M1
and M2.*/
- CopyBlock(Places, 1, D, 0, Tuo[i], &M1, 0, i + TucCount);
- CopyBlock(Places, 1, D, 0, Tuo[i], &M2, 0, i + TucCount);
-
- /*We need a record of the changes to constraint-met state that occur for
- each of the uncontrollable and unobservable transitions. This corresponds
- to the matrix product of L * an incidence matrix containing only those
- transitions. We cannot use a regular matrix product because we just want
- to multiply by one column of D. We take the matrix product by loop.*/
- for (j = 0; j < Constraints; j++)
- {
- x = 0;
- for (k = 0; k < Places; k++)
- {
- x += GetMatrixEl(L, j, k) * GetMatrixEl(D, k, Tuo[i]);
- }
- SetMatrixEl(&ConstraintDeltasUOT, j, i, x);
- }
+ CopyBlock(Places, 1, D, 0, Tuo[i], M1, 0, i + TucCount);
+ CopyBlock(Places, 1, D, 0, Tuo[i], M2, 0, i + TucCount);
}
}
else
@@ -186,251 +269,284 @@
TuoCount = 0;
}
//The last constraint type 2 is another <=
- ConstraintType2[TucCount + TuoCount] = -1;
+ (*CType2)[TucCount + TuoCount] = -1;
/*N1 is all zeros - no change necessary. N2 is all zeros except for the last
element.*/
- N2[TucCount + TuoCount] = -1;
+ (*N2)[TucCount + TuoCount] = -1;
/*LoBounds all zeros except the last one*/
- LoBounds[Places] = 1;
+ (*LoBounds)[Places] = 1;
/*Un-transpose M1 and M2.*/
- TransposeMatrix(&M1);
- TransposeMatrix(&M2);
+ TransposeMatrix(M1);
+ TransposeMatrix(M2);
+}
- /*We'll need a matrix form of the initial marking, as a column vector. Build
- it now.*/
- if (m0)
- {
- Marking0 = vector2matrix(m0, Places, 1);
- ManageMatrix(&memory, &Marking0);
- }
-
- /* Pre-allocate space for the array of messages corresponding to the status of
- each row.*/
- Return.dhow = tcalloc(Constraints, sizeof(char*));
-
- for (i = 0; i < Constraints; i++)
- {
- /*Status on each row defaults to OK.*/
- Return.dhow[i] = HOW_OK;
-
-
- /*UCTDeltasNegative if the current constraint is such that there are no
- uncontrollable transitions the firing of which will ever cause it to change
- from met to unmet. Set the UOTDeltasZero if the current constraint is such
- that there are no unobservable transitions the firing of which will affect
- the constraint-met state at all. Both of these flags get set if there are no
- appropriate transitions at all. Each column of the incidence matrix
- corresponds to the change in marking that will occur if the corresponding
- transition fires. So, a constraint row times an incidence column yields a
- single number that will be negative if the transition firing causes the
- constraint to become more met, positive if it causes it to become less met,
- and 0 if it does not affect the state of the constraint. Each element of the
- ConstraintDeltas matrices represents such a multiplication. Rows are
- constraints and columns are transitions.*/
- UCTDeltasNegative = 1;
- UOTDeltasZero = 1;
+ilpadm_r InitOther(matrix* CDeltas, matrix *L, matrix* D, int *Tuc, int TucCount, int* Tuo, int TuoCount, MemoryManager* mem)
+{
+ int Constraints, Places, i, j;
+ ilpadm_r result;
+
+ Constraints = NumberOfRows(*L);
+ Places = NumberOfRows(*D);
+
+ /*Initialize the return structure. Message defaults to OK, make space for
+ per-constraint messages.*/
+ memset(&result, 0, sizeof(ilpadm_r));
+ result.how = HOW_OK;
+ result.dhow = tcalloc(Constraints, sizeof(char*));
+
+ /*Allocate space for R1. It will be added to the constraint matrix, so it
+ should have a row for each constraint and a column for each place, just like
+ the original constraint matrix.*/
+ AllocateMatrixType(2, &result.R1, Constraints, Places);
+ /*Allocate space for R2. It will be a square matrix with the same number of
+ rows and columns as L has rows.*/
+ AllocateMatrixType(2, &result.R2, Constraints, Constraints);
+ /*We need a record of the changes to constraint-met state that occur for
+ each of the uncontrollable and unobservable transitions. This corresponds
+ to the matrix product of L * an incidence matrix containing only those
+ transitions. It has a row for each constraint and a column for each
+ uncontrollable and unobervable transition. */
+ MAllocateMatrixType(mem, 2, CDeltas, Constraints, TucCount + TuoCount);
+ for (i = 0; i < Constraints; i++)
+ {
for (j = 0; j < TucCount; j++)
- {
- if(GetMatrixEl(&ConstraintDeltasUCT, i, j) > 0)
+ {
+ SetMatrixEl(CDeltas, i, j, MultiplyVector(L, D, i, Tuc[j], 0));
+ }
+ for (j = 0; j < TuoCount; j++)
+ {
+ SetMatrixEl(CDeltas, i, j + TucCount, MultiplyVector(L, D, i, Tuo[j], 0));
+ }
+ }
+ return result;
+}
+
+int TransformType(matrix* CDeltas, matrix* L, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
+{
+ int UCTDeltasNegative = 1, UOTDeltasZero = 1, i;
+
+ /*First, check whether a transformation is feasible given the initial
+ marking and marking constraint vector (if they have been given)*/
+ if (m0 && b && MultiplyVector(L, (matrix*) m0, Constraint, MULTIPLYVECTOR_ARRAY, 0) > b[Constraint])
+ {
+ return -1;
+ }
+
+/*UCTDeltasNegative if the current constraint is such that there are no
+ uncontrollable transitions the firing of which will ever cause it to change
+ from met to unmet. Set the UOTDeltasZero if the current constraint is such
+ that there are no unobservable transitions the firing of which will affect
+ the constraint-met state at all. Both of these flags get set if there are no
+ appropriate transitions at all. Each column of the incidence matrix
+ corresponds to the change in marking that will occur if the corresponding
+ transition fires. So, a constraint row times an incidence column yields a
+ single number that will be negative if the transition firing causes the
+ constraint to become more met, positive if it causes it to become less met,
+ and 0 if it does not affect the state of the constraint. Each element of the
+ ConstraintDeltas matrix represents such a multiplication. Rows are
+ constraints and columns are transitions.*/
+ UCTDeltasNegative = 1;
+ UOTDeltasZero = 1;
+ for (i = 0; i < TucCount; i++)
+ {
+ if(GetMatrixEl(CDeltas, Constraint, i) > 0)
+ {
+ UCTDeltasNegative = 0;
+ break;
+ }
+ }
+ for (i = 0; i < TuoCount; i++)
+ {
+ if(GetMatrixEl(CDeltas, Constraint, i + TucCount))
+ {
+ UOTDeltasZero = 0;
+ break;
+ }
+ }
+
+ /*If the current constraint row is such that the firing of no
+ unobservable transition will change its met state and no uncontrollable
+ transition will ever cause it to become unmet, then no transformation is
+ necessary.*/
+ if(UCTDeltasNegative && UOTDeltasZero)
+ {
+ return 0;
+ }
+ /*Otherwise, transformation is necessary. If there is an initial marking
+ vector, the constraint we are about to solve for will have to be met by
+ it. This constitutes an extra constrain row in the linear programming problem.
+ Use the LP parameters with room for an extra row.*/
+ else if (m0 && b)
+ {
+ return 2;
+ }
+ /*If not it we don't need the extra row. Use the smaller LP parameters.*/
+ else
+ {
+ return 1;
+ }
+}
+
+void BuildLP1(matrix *M1, matrix* CDeltas, double* Cost, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
+{
+ int i, Places;
+ Places = NumberOfColumns(*M1) - 1;
+ /*Build the last column of the constraint vector.*/
+ for (i = 0; i < TucCount; i++)
+ {
+ SetMatrixEl(M1, i, Places, GetMatrixEl(CDeltas, Constraint, i));
+ }
+ for (i = TucCount; i < TuoCount + TucCount; i++)
+ {
+ SetMatrixEl(M1, i, Places, GetMatrixEl(CDeltas, Constraint, i));
+ }
+ /*Fill the cost vector with ones.*/
+ for (i = 0; i <= Places; i++)
+ {
+ Cost[i] = 1;
+ }
+}
+
+int RedoLP1(matrix* L, int* b, ipsolve_r* solution, int Constraint)
+{
+ /*We want to run a check. If b is nonempty and if the algorithm below
+ results in the setting of the flag, we will have to modify the problem
+ slightly and re-solve.*/
+ int flag, i;
+ if (solution->res && b)
+ {
+ flag = 1;
+ for(i = 0; i < NumberOfColumns(*L); i++)
+ {
+ if (solution->res[i] + solution->res[NumberOfColumns(*L)] * GetMatrixEl(L, Constraint, i))
{
- UCTDeltasNegative = 0;
+ flag = 0;
break;
}
}
- for (j = 0; j < TuoCount; j++)
+ if (flag && b[Constraint] <= -1) return 1;
+ }
+ return 0;
+}
+
+void BuildLP1Alternate(matrix* M2, matrix* CDeltas, matrix* L, int *Tuc, int TucCount, int *Tuo, int TuoCount, int Constraint)
+{
+ int i, j, Places;
+ /*We add one additional constraint to the linear programming problem. Its
+ coefficients are are a row of -1s followed by the inverse sum of all elements
+ in the current constraint vector row and its constant is a 1. Constraint type
+ should be set to greater than. N2 and ConstraintType2 are already set up this
+ way. We just need to fill the last row of M2 with the appropriate numbers and
+ put in the numbers we calculated for the last column of M2.*/
+ j = 0;
+ Places = NumberOfColumns(*M2) - 1;
+ for(i = 0; i < Places; i++)
+ {
+ SetMatrixEl(M2, TucCount + TuoCount, i, 1);
+ j += GetMatrixEl(L, Constraint, i);
+ }
+ SetMatrixEl(M2, TucCount + TuoCount, Places, j);
+ /*Fill the last column of M2 as M1 was filled.*/
+ for (i = 0; i < TucCount; i++)
+ {
+ SetMatrixEl(M2, i, Places, GetMatrixEl(CDeltas, Constraint, i));
+ }
+ for (i = 0; i < TuoCount; i++)
+ {
+ SetMatrixEl(M2, i + TucCount, Places, GetMatrixEl(CDeltas, Constraint, i + TucCount));
+ }
+}
+
+void BuildLP2(matrix* M2, matrix* L, matrix* CDeltas, double* Cost, int* b, int* m0, int* Tuc, int TucCount, int* Tuo, int TuoCount, int Constraint)
+{
+ int i, Places;
+ Places = NumberOfColumns(*L);
+
+ /*Build the last column of the constraint matrix (not counting the extra
+ row). Each element should be the change in current constraint
+ satisfaction that occurs when the transition corresponding to the
+ current row is fired. These values can be found in the products found
+ earlier.*/
+ for (i = 0; i < TucCount; i++)
+ {
+ SetMatrixEl(M2, i, Places, GetMatrixEl(CDeltas, Constraint, i));
+ }
+ for (i = TucCount; i < TuoCount + TucCount; i++)
+ {
+ SetMatrixEl(M2, i, Places, GetMatrixEl(CDeltas, Constraint, i));
+ }
+ /*Build the cost vector and the last row of the constraint matrix. They
+ begin with the initial marking.*/
+ for (i = 0; i < Places; i++)
+ {
+ /*The last row of the M2 constraint vector begins with the the initial
+ marking vector.*/
+ SetMatrixEl(M2, TucCount + TuoCount, i, m0[i]);
+ Cost[i] = m0[i];
+ }
+ /*The cost vector and the last constraint of the integer problem both
+ end with this number*/
+ Cost[Places] = MultiplyVector(L, (matrix*) m0, Constraint, MULTIPLYVECTOR_ARRAY, 0) - b[Constraint] - 1;
+ SetMatrixEl(M2, TucCount + TuoCount, Places, Cost[Places]);
+}
+
+void ApplySolution(ilpadm_r* result, ipsolve_r* LPSolution, int Constraint, int Places, int Constraints)
+{
+ int i;
+ /*LPSolution.res contains results from type 1 or 2 transformation solutions
+ if it contains anything. Copy it into the appropriate places.*/
+ if (LPSolution->res)
+ {
+ /*The last element of the solution gets copied to the current element in
+ the main diagonal of R2.*/
+ SetMatrixEl(&result->R2, Constraint, Constraint, LPSolution->res[Places]);
+ //The rest of the solution gets copied to the current row of R1.
+ for(i = 0; i < Places; i++)
{
- if(GetMatrixEl(&ConstraintDeltasUOT, i, j))
- {
- UOTDeltasZero = 0;
- break;
- }
- }
-
- /*See what action is necessary.*/
- /*First, check whether a transformation is feasible given the initial
- marking and marking constraint vector (if they have been given)*/
- if (m0 && b ? MultiplyVector(L, &Marking0, i, 0, 0) > b[i] : 0)
- {
- Return.dhow[i] = HOW_INFEASIBLE;
- disp("The transformation is infeasible due to the initial marking", "", ".", i, Constraints);
- }
- /*Otherwise, if the current constraint row is such that the firing of no
- unobservable transition will change its met state and no uncontrollable
- transition will ever cause it to become unmet, then no transformation is
- necessary.*/
- else if(UCTDeltasNegative && UOTDeltasZero)
- {
- Return.dhow[i] = HOW_OK;
- disp("No transformation is necessary", "", ".", i, Constraints);
- /*Copy the original marking constraint row, untransformed. Do so by
- leaving this row of R1 all zeros and making this element along R2's
- diagonal equal to 1.*/
- SetMatrixEl(&Return.R2, i, i, 1);
- }
- else
- {
- /*Otherwise, transformation is necessary. If there is an initial marking
- vector, the constraint we are about to solve for will have to be met by
- it.*/
- if(m0 && b)
- {
- /*Build the last column of the constraint matrix (not counting the extra
- row). Each element should be the change in current constraint
- satisfaction that occurs when the transition corresponding to the
- current row is fired. These values can be found in the products found
- earlier.*/
- for (j = 0; j < TucCount; j++)
- {
- SetMatrixEl(&M2, j, Places, GetMatrixEl(&ConstraintDeltasUCT, i, j));
- }
- for (j = 0; j < TuoCount; j++)
- {
- SetMatrixEl(&M2, j + TucCount, Places, GetMatrixEl(&ConstraintDeltasUOT, i, j));
- }
- /*Build the cost vector and the last row of the constraint matrix. They
- begin with the initial marking.*/
- for (j = 0; j < Places; j++)
- {
- /*The last row of the M2 constraint vector begins with the the initial
- marking vector.*/
- SetMatrixEl(&M2, TucCount + TuoCount, j, m0[j]);
- Cost[j] = m0[j];
- }
- /*The cost vector and the last constraint of the integer problem both
- end with this number*/
- Cost[Places] = MultiplyVector(L, &Marking0, i, 0, 0) - b[i] - 1;
- SetMatrixEl(&M2, TucCount + TuoCount, Places, Cost[Places]);
-
- /*Solve the integer problem. ipsolve syntax is:
- ipsolve_r ipsolve(matrix* L, double* B, double* f, short int *IntList,
- double *ub, double *lb, short int *ctype);*/
- IntegerSolution = ipsolve(&M2, N2, Cost, 0, 0, LoBounds, ConstraintType2);
- Return.dhow[i] = IntegerSolution.mhow;
- }
- else
- {
- /*If there was no initial marking vector, than it does not come into
- play as a constraint in the integer problem. Build the last column of
- the constraint vector.*/
- for (j = 0; j < TucCount; j++)
- {
- SetMatrixEl(&M1, j, Places, GetMatrixEl(&ConstraintDeltasUCT, i, j));
- }
- for (j = 0; j < TuoCount; j++)
- {
- SetMatrixEl(&M1, j + TucCount, Places, GetMatrixEl(&ConstraintDeltasUOT, i, j));
- }
- /*Fill the cost vector with ones.*/
- for (j = 0; j <= Places; j++)
- {
- Cost[j] = 1;
- }
- /*Solve the integer problem.*/
- IntegerSolution = ipsolve(&M1, N1, Cost, 0, 0, LoBounds, ConstraintType1);
- /*We want to run a check. If b is nonempty and if the algorithm below
- results in the setting of the flag, we will have to modify the problem
- slightly and re-solve.*/
- if (IntegerSolution.res && b)
- {
- flag = 1;
- for(j = 0; j < Places; j++)
- {
- if (IntegerSolution.res[j] + IntegerSolution.res[Places] * GetMatrixEl(L, i, j))
- {
- flag = 0;
- break;
- }
- }
- if (flag && b[i] <= -1)
- {
- /*We resolve the integer problem, but with one additional
- constraint. Its coefficients are are a row of -1s followed by the
- inverse sum of all elements in the current constraint vector row and
- its constant is a 1. Constraint type should be set to greater than.
- N2 and ConstraintType2 are already set up this way. We just need to
- fill the last row of M2 with the appropriate numbers and put in the
- numbers we calculated above for the last column of M2.*/
- k = 0;
- for(j = 0; j < Places; j++)
- {
- SetMatrixEl(&M2, TucCount + TuoCount, j, 1);
- k += GetMatrixEl(L, i, j);
- }
- SetMatrixEl(&M2, TucCount + TuoCount, Places, k);
- /*Fill the last column of M2 as M1 was filled.*/
- for (j = 0; j < TucCount; j++)
- {
- SetMatrixEl(&M2, j, Places, GetMatrixEl(&ConstraintDeltasUCT, i, j));
- }
- for (j = 0; j < TuoCount; j++)
- {
- SetMatrixEl(&M2, j + TucCount, Places, GetMatrixEl(&ConstraintDeltasUOT, i, j));
- }
- //Solve the new problem
- IntegerSolution = ipsolve(&M2, N2, Cost, 0, 0, LoBounds, ConstraintType2);
- //Set the status message as appropriate.
- if (IntegerSolution.res)
- {
- Return.dhow[i] = IntegerSolution.mhow;
- }
- else
- {
- Return.dhow[i] = HOW_NOTSOLVED;
- }
- }
- }
- }
- /*When we get here, IntegerSolution.res contains whatever solution we are
- going to get. Copy it into the appropriate places.*/
- if (IntegerSolution.res)
- {
- /*The last element of the solution gets copied to the current element in
- the main diagonal of R2.*/
- SetMatrixEl(&Return.R2, i, i, IntegerSolution.res[Places]);
- //The rest of the solution gets copied to the current row of R1.
- for(j = 0; j < Places; j++)
- {
- SetMatrixEl(&Return.R1, i, j, IntegerSolution.res[j]);
- }
- //Now, free the memory set aside by ipsolve for its result.
- free(IntegerSolution.res);
- IntegerSolution.res = 0;
- }
-
- /*If we are in verbose mode and the status is anything other than OK, we
- want to show so.*/
- if(strcmp(IntegerSolution.mhow, HOW_OK))
- {
- disp("The problem is ", IntegerSolution.mhow, ".", i, Constraints);
- }
- }
- }
- /*Check for unsolved or infeasible solutions. The overall message should
+ SetMatrixEl(&result->R1, Constraint, i, LPSolution->res[i]);
+ }
+ //Now, free the memory set aside by ipsolve for its result.
+ free(LPSolution->res);
+ LPSolution->res = 0;
+
+ /*If we are in verbose mode and the status is anything other than OK, we
+ want to show so.*/
+ if(strcmp(LPSolution->mhow, HOW_OK))
+ {
+ disp("The problem is ", LPSolution->mhow, ".", Constraint, Constraints);
+ }
+ }
+}
+
+FinalizeSolution(ilpadm_r* result, matrix* L, int* b, int Places, int Constraints)
+{
+ int i, j, x;
+ /*Check for unsolved or infeasible solutions. The overall message should
prioritize to reporting infeasibilities, then report unsolved problems.*/
for(i = 0; i < Places; i++)
{
- if(Return.dhow[i] == HOW_INFEASIBLE)
+ if(result->dhow[i] == HOW_INFEASIBLE)
{
- Return.how = HOW_IMPOSSIBLE;
+ result->how = HOW_IMPOSSIBLE;
break;
}
- if(Return.dhow[i] == HOW_NOTSOLVED)
+ if(result->dhow[i] == HOW_NOTSOLVED)
{
- Return.how = HOW_NOTSOLVED;
+ result->how = HOW_NOTSOLVED;
}
}
/*Get La according to formula: La = R1 + R2 * L*/
/*Because R2 is a diagonal matrix, we can optimize things slightly here by
manually multiplying and examining only the diagonal, and then manually
adding.*/
- AllocateMatrixType(2, &Return.La, Constraints, Places);
+ AllocateMatrixType(2, &result->La, Constraints, Places);
for (i = 0; i < Constraints; i++)
{
x = 0;
for(j = 0; j < Places; j++)
{
- SetMatrixEl(&Return.La, i, j, (GetMatrixEl(&Return.R2, i, i) * GetMatrixEl(L, i, j)) + GetMatrixEl(&Return.R1, i, j));
+ SetMatrixEl(&result->La, i, j, (GetMatrixEl(&result->R2, i, i) * GetMatrixEl(L, i, j)) + GetMatrixEl(&result->R1, i, j));
}
}
/*If b is available, get ba according to algorithm: ba = (R2 * a column vector
@@ -438,15 +554,12 @@
rather than matrix operations.*/
if(b)
{
- Return.ba = tcalloc(Constraints, sizeof(int));
+ result->ba = tcalloc(Constraints, sizeof(int));
for (i = 0; i < Constraints; i++)
{
- Return.ba[i] = (GetMatrixEl(&Return.R2, i, i) * (b[i] + 1)) - 1;
+ result->ba[i] = (GetMatrixEl(&result->R2, i, i) * (b[i] + 1)) - 1;
}
}
- //Free memory.
- FreeMemory(&memory);
- return Return;
}
void disp(char* beginning, char* parameter, char* end, int i, int p)
Modified: spnbox/spnbox.h
===================================================================
--- spnbox/spnbox.h 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/spnbox.h 2009-06-29 22:19:26 UTC (rev 124)
@@ -141,6 +141,7 @@
#define VRB_REDUCE 3
#define VRB_DP 2
#define VRB_ILPADM 2
+#define VRB_MAX 10
msplit_r msplit(matrix* Dm, matrix* Dp, int* mask, matrix* M, matrix* L0, matrix* L, int* ipl, int ipCount, int* dpl, int dpCount, int** TD, int* TDCount);
/*MSPLIT - split transitions to make a Petri net PT-ordinary.
Modified: spnbox/tests/test-ilpadm.c
===================================================================
--- spnbox/tests/test-ilpadm.c 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/tests/test-ilpadm.c 2009-06-29 22:19:26 UTC (rev 124)
@@ -1,243 +1,61 @@
-#include "../../pnheaders/general.h"
-#include "../spnbox.h"
+#include "test.h"
-/*Define the is_verbose function appropriately for testing.*/
-int is_verbose()
+int main(int argc, char* argv[])
{
- return VRB_REDUCE;
-}
-
-void ShowProblem(matrix* L, int* B, matrix* D, int TucCount, int* Tuc, int TuoCount, int* Tuo, int* m0, ilpadm_r* result);
-
-//ilpadm_r ilpadm(matrix* L, int* b, matrix* D, int TucCount, int int* Tuc, int TuoCount, int int* Tuo, int* m0, int verbose);
-int main()
-{
- /*all correct solutions will satisfy La*m0 <= ba, La*D(:, Tuc) <= 0, and La*D(:, Tuo) = 0.
+
+ /*all correct solutions will satisfy La*m0 <= ba, La*D(:, Tuc) <= 0, and La*D(:, Tuo) = 0.
Also, a correct solution will satisfy that for all nonnegative integer vectors m, if La*m <= ba, then L*m <= b.*/
- /*Example 1 data*/
- ilpadm_r ans1;
- matrix D1, L1;
- int DData1[] = {-1, 0, 1, 1, -1, 0, 0, 1, -1};
- int LData1[] = {0, 0, 1};
- int B1[] = {1};
- int m01[] = {3, 0, 0};
- int Tuc1[] = {1};
-
- /*Example 2 Data
- D = [-1 0 1; 1 -1 0; 1 -1 0; 0 1 -1]; m0 = [3; 0; 0; 0];
- Tuc = [2]; Tuo = [];
- L = [0 0 0 1]; b = 1;*/
+ char InDesc[] = "matrix D, indexarray Tuc, indexarray Tuo, matrix L, arrayi B, arrayi m0";
+ char OutDesc[] = "string Message, matrix La, arrayi Ba";
- ilpadm_r ans2;
- matrix D2, L2;
- int DData2[] = {-1, 0, 1, 1, -1, 0, 0, 1, -1};
- int LData2[] = {0, 0, 1};
- int B2[] = {1};
- int m02[] = {3, 0, 0};
- int Tuc2[] = {1};
-
- /*Example 3 Data
- D = [-1 -1 0 1; 1 0 -1 0; 0 1 -1 0; 0 0 1 -1;]; m0 = [3; 0; 0; 0];
- Tuc = 3; Tuo = [];
- L = [0 0 0 1]; b = 1;*/
- ilpadm_r ans3;
- matrix D3, L3;
- int DData3[] = {-1, -1, 0, 1, 1, 0, -1, 0, 0, 1, -1, 0, 0, 0, 1, -1};
- int LData3[] = {0, 0, 0, 1};
- int B3[] = {1};
- int m03[] = {3, 0, 0, 0};
- int Tuc3[] = {2};
+ ilpadm_r answer;
+ matrix D, L;
+ int BCount, m0Count, TucCount, TuoCount;
+ int *B, *m0, *Tuc, *Tuo, *InFilled, OutFilled[3];
+ FILE* input;
+ MemoryManager mem;
- /*Example 4 Data
- D = [-1 0 0 1; 0 -1 0 2; 2 1 -2 0; 0 0 1 -2]; m0 = [1 2 0 2]';
- Tuc = 3; Tuo = [];
- L = [0 0 0 1]; b = 2;*/
- ilpadm_r ans4;
- matrix D4, L4;
- int DData4[] = {-1, 0, 0, 1, 0, -1, 0, 2, 2, 1, -2, 0, 0, 0, 1, -2};
- int LData4[] = {0, 0, 0, 1};
- int B4[] = {2};
- int m04[] = {1, 2, 0, 2};
- int Tuc4[] = {2};
+ mem = CreateMemoryManager(10, 10, 0, 0);
- /*Example 5 data
- D = [-1 1 0; -1 0 1; 2 -1 -1]; m0 = [1; 1; 0]; Tuc = []; Tuo = 1;
- L = [-1 0 -1; 0 -1 -1]; b = [-1; -1];*/
- ilpadm_r ans5;
- matrix D5, L5;
- int DData5[] = {-1, 1, 0, -1, 0, 1, 2, -1, -1};
- int LData5[] = {-1, 0, -1, 0, -1, -1};
- int B5[] = {-1, -1};
- int m05[] = {1, 1, 0};
- int Tuo5[] = {0};
-
- /*Return values for further examples.*/
- ilpadm_r ans6, ans7, ans8;
-
- /*Example 1*/
- D1 = vector2matrix(DData1, 3, 3);
- L1 = vector2matrix(LData1, 1, 3);
- printf("\n------------------------------------------\n");
- printf("Problem 1\n");
- ans1 = ilpadm(&L1, B1, &D1, 1, Tuc1, 0, 0, m01);
-
- ShowProblem(&L1, B1, &D1, 1, Tuc1, 0, 0, m01, &ans1);
-
- /*Example 2*/
- D2 = vector2matrix(DData2, 3, 3);
- L2 = vector2matrix(LData2, 1, 3);
- printf("\n------------------------------------------\n");
- printf("Problem 2\n");
- ans2 = ilpadm(&L2, B2, &D2, 1, Tuc2, 0, 0, m02);
-
- ShowProblem(&L2, B2, &D2, 1, Tuc2, 0, 0, m02, &ans2);
-
- /*Example 3*/
- D3 = vector2matrix(DData3, 4, 4);
- L3 = vector2matrix(LData3, 1, 4);
- printf("\n------------------------------------------\n");
- printf("Problem 3\n");
- ans3 = ilpadm(&L3, B3, &D3, 1, Tuc3, 0, 0, m03);
-
- ShowProblem(&L3, B3, &D3, 1, Tuc3, 0, 0, m03, &ans3);
-
- /*Example 4*/
- D4 = vector2matrix(DData4, 4, 4);
- L4 = vector2matrix(LData4, 1, 4);
- printf("\n------------------------------------------\n");
- printf("Problem 4\n");
- ans4 = ilpadm(&L4, B4, &D4, 1, Tuc4, 0, 0, m04);
-
- ShowProblem(&L4, B4, &D4, 1, Tuc4, 0, 0, m04, &ans4);
+ /*Set the verbosity level to maximum*/
+ setverbose(VRB_MAX);
- /*Example 5*/
- D5 = vector2matrix(DData5, 3, 3);
- L5 = vector2matrix(LData5, 2, 3);
- printf("\n------------------------------------------\n");
- printf("Problem 5\n");
- ans5 = ilpadm(&L5, B5, &D5, 0, 0, 1, Tuo5, m05);
-
- ShowProblem(&L5, B5, &D5, 0, 0, 1, Tuo5, m05, &ans5);
+ if (! (input = GetInput(argc, argv)))
+ {
+ return 1;
+ }
- /*Examples 6 and forward reuse data from earlier examples but leave out various parameters to test the parameter-
- handling abilities of ilpadm.*/
-
- /*Example 6 - no initial marking*/
- printf("\n------------------------------------------\n");
- printf("Problem 6\n");
- ans6 = ilpadm(&L5, B5, &D5, 0, 0, 1, Tuo5, 0);
-
- ShowProblem(&L5, B5, &D5, 0, 0, 1, Tuo5, 0, &ans6);
-
- /*Example 7 - no constraint vector*/
- printf("\n------------------------------------------\n");
- printf("Problem 7\n");
- ans7 = ilpadm(&L2, 0, &D2, 1, Tuc2, 0, 0, m02);
-
- ShowProblem(&L2, 0, &D2, 1, Tuc2, 0, 0, m02, &ans7);
-
- /*Example 8 - neither constraint vector nor initial marking*/
- printf("\n------------------------------------------\n");
- printf("Problem 8\n");
- ans8 = ilpadm(&L2, 0, &D2, 1, Tuc2, 0, 0, 0);
-
- ShowProblem(&L2, 0, &D2, 1, Tuc2, 0, 0, m02, &ans8);
-
+ while (ParseStructure(input, InDesc, &InFilled, &mem, &D, &Tuc, &TucCount, &Tuo, &TuoCount, &L, &B, &BCount, &m0, &m0Count))
+ {
+ /*Display the problem.*/
+ DisplayStructure(InDesc, InFilled, &D, Tuc, TucCount, InFilled[0] ? NumberOfColumns(D) : 0, Tuo, TuoCount, InFilled[0] ? NumberOfColumns(D) : 0, &L, B, BCount, m0, m0Count);
+
+ /*Solve the problem.*/
+ answer = ilpadm(InFilled[3] ? &L : 0, InFilled[4] ? B : 0, InFilled[0] ? &D : 0, TucCount, InFilled[1] ? Tuc : 0, TuoCount, InFilled[2] ? Tuo : 0, InFilled[5] ? m0 : 0);
+
+ OutFilled[0] = 1;
+ OutFilled[1] = 1;
+ ManageMatrix(&mem, &answer.La);
+ if (answer.ba)
+ {
+ OutFilled[2] = 1;
+ ManageMemory(&mem, answer.ba);
+ }
+ else
+ {
+ OutFilled[2] = 0;
+ }
+
+ /*Show the solution*/
+ printf("\nSolution:\n");
+ DisplayStructure(OutDesc, OutFilled, answer.how, &answer.La, answer.ba, NumberOfRows(answer.La));
+ printf("--------------------------------------------------------------------------------\n");
+
+ /*Clear and re-initialize dynamic memory log and loop again.*/
+ FreeMemory(&mem);
+ mem = CreateMemoryManager(10, 10, 0, 0);
+ }
+ FreeMemory(&mem);
+ return 0;
}
-
-void ShowProblem(matrix* L, int* B, matrix* D, int TucCount, int* Tuc, int TuoCount, int* Tuo, int* m0, ilpadm_r* result)
-{
- int i, j;
- printf("\n");
- ShowMatrix(D, "Incidence Matrix");
- j = 0;
- for (i = 0; i < NumberOfColumns(*D); i++)
- {
- if (j < TucCount)
- {
- if(Tuc[j] == i)
- {
- printf("*\t");
- j++;
- }
- else
- {
- printf("\t");
- }
- }
- else
- {
- printf("\t");
- }
- }
- printf("Uncontrollable Transitions\n");
-
- j = 0;
- for (i = 0; i < NumberOfColumns(*D); i++)
- {
- if (j < TuoCount)
- {
- if(Tuo[j] == i)
- {
- printf("*\t");
- j++;
- }
- else
- {
- printf("\t");
- }
- }
- else
- {
- printf("\t");
- }
- }
- printf("Unobservable Transitions\n");
-
- if (m0)
- {
- printf("Initial Marking:\t[");
- for (i = 0; i < NumberOfRows(*D); i++)
- {
- printf(i == NumberOfRows(*D) - 1 ? "%d]\n" : "%d\t", m0[i]);
- }
- }
-
- printf("Marking Constraints:\n");
- for (i = 0; i < NumberOfRows(*L); i++)
- {
- for (j = 0; j < NumberOfColumns(*L); j++)
- {
- printf("%d\t", GetMatrixEl(L, i, j));
- }
- printf("<=\t");
- if(B)
- {
- printf("%d\n", B[i]);
- }
- else
- {
- printf("?\n");
- }
- }
-
- printf("Solution message: %s\n", result->how);
- printf("Solution Marking Constraints:\n");
- for (i = 0; i < NumberOfRows(result->La); i++)
- {
- for (j = 0; j < NumberOfColumns(result->La); j++)
- {
- printf("%d\t", GetMatrixEl(&result->La, i, j));
- }
- printf("<=\t");
- if(result->ba)
- {
- printf("%d\tType: %s\n", result->ba[i], result->dhow[i]);
- }
- else
- {
- printf("?\tType: %s\n", result->dhow[i]);
- }
- }
-}
Modified: spnbox/tests/test-ilpadm.mak
===================================================================
--- spnbox/tests/test-ilpadm.mak 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/tests/test-ilpadm.mak 2009-06-29 22:19:26 UTC (rev 124)
@@ -1,7 +1,7 @@
COMPILER=gcc -g -ggdb
-test-ilpadm: test-ilpadm.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm.o ipsolve.o ipslv.o
- $(COMPILER) -o test-ilpadm.exe pns.o matrix.o general.o matrixmath.o test-ilpadm.o ilpadm.o ipsolve.o MemoryManager.o ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
+test-ilpadm-new: test-ilpadm-new.o pns.o matrix.o general.o matrixmath.o MemoryManager.o ilpadm-new.o ipsolve.o ipslv.o StructuredIO.o test.o
+ $(COMPILER) -o test-ilpadm-new.exe pns.o matrix.o general.o matrixmath.o test-ilpadm-new.o ilpadm-new.o ipsolve.o MemoryManager.o StructuredIO.o test.o ipslv.o ../lp_solve_5.5/lpsolve55/liblpsolve55.a
general.o: ../../pnheaders/general.c ../../pnheaders/general.h
$(COMPILER) -c ../../pnheaders/general.c
@@ -15,8 +15,8 @@
matrixmath.o: ../matrixmath.c ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../matrixmath.c
-ilpadm.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm.c
- $(COMPILER) -c ../ilpadm.c
+ilpadm-new.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ilpadm-new.c
+ $(COMPILER) -c ../ilpadm-new.c
ipsolve.o: ../spnbox.h ../matrixmath.h ../../pnheaders/general.h ../../pnheaders/matrix.h ../MemoryManager.h ../ipsolve.c
$(COMPILER) -c ../ipsolve.c
@@ -26,6 +26,12 @@
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
+
+test.o: test.c test.h ../MemoryManager.h ../../pnheaders/pns.h ../../pnheaders/general.h ../../pnheaders/matrix.h
+ $(COMPILER) -c test.c
-test-ilpadm.o: test-ilpadm.c ../spnbox.h ../../pnheaders/general.h
- $(COMPILER) -c test-ilpadm.c
+StructuredIO.o: ../MemoryManager.h ../../pnheaders/matrix.h StructuredIO.h StructuredIO.c
+ $(COMPILER) -c StructuredIO.c
+
+test-ilpadm-new.o: test-ilpadm-new.c ../spnbox.h ../../pnheaders/general.h
+ $(COMPILER) -c test-ilpadm-new.c
Added: spnbox/tests/test-ilpadm.txt
===================================================================
--- spnbox/tests/test-ilpadm.txt (rev 0)
+++ spnbox/tests/test-ilpadm.txt 2009-06-29 22:19:26 UTC (rev 124)
@@ -0,0 +1,146 @@
+echo Example 1
+D 3 3
+-1 0 1
+1 -1 0
+0 1 -1
+
+L 1 3
+0 0 1
+
+B 1 1
+
+m0 3
+3 0 0
+
+Tuc 1
+1
+
+done
+
+echo Example 2
+D 3 3
+-1 0 1
+1 -1 0
+0 1 -1
+
+m0 3
+3 0 0
+
+Tuc 1
+1
+
+L 1 3
+0 0 1
+
+B 1 1
+
+done
+
+echo Example 3
+D 4 4
+-1 -1 0 1
+1 0 -1 0
+0 1 -1 0
+0 0 1 -1
+
+m0 4
+3 0 0 0
+Tuc 1
+2
+
+L 1 4
+0 0 0 1
+
+B 1 1
+done
+
+echo Example 4
+D 4 4
+-1 0 0 1
+0 -1 0 2
+2 1 -2 0
+0 0 1 -2
+
+m0 4
+1 2 0 2
+
+L 1 4
+0 0 0 1
+
+B 1 2
+
+Tuc 1 2
+
+done
+echo Example 5
+D 3 3
+-1 1 0
+-1 0 1
+2 -1 -1
+
+L 2 3
+-1 0 -1
+0 -1 -1
+
+B 2
+-1 -1
+
+Tuo 1 0
+
+m0 3
+1 1 0
+
+done
+
+echo Example 6
+echo This uses the data from Example 5 but supplies no initial marking.
+D 3 3
+-1 1 0
+-1 0 1
+2 -1 -1
+
+L 2 3
+-1 0 -1
+0 -1 -1
+
+B 2
+-1 -1
+
+Tuo 1 0
+
+done
+
+echo Example 7
+echo This reuses the data from Example 2 but supplies no constraint vector.
+D 3 3
+-1 0 1
+1 -1 0
+0 1 -1
+
+m0 3
+3 0 0
+
+Tuc 1
+1
+
+L 1 3
+0 0 1
+
+done
+
+echo Example 8
+echo This reuses the data from Example 2 but supplies neither constraint vector
+echo nor initial marking.
+D 3 3
+-1 0 1
+1 -1 0
+0 1 -1
+
+Tuc 1
+1
+
+L 1 3
+0 0 1
+
+done
+quit
Modified: spnbox/tests/test-pn2eacpn.c
===================================================================
--- spnbox/tests/test-pn2eacpn.c 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/tests/test-pn2eacpn.c 2009-06-29 22:19:26 UTC (rev 124)
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include "../../pnheaders/general.h"
#include "../../pnheaders/pns.h"
#include "../../pnheaders/matrix.h"
#include "../matrixmath.h"
@@ -6,7 +7,7 @@
#include "../MemoryManager.h"
#include "StructuredIO.h"
-/*Reference materil:
+/*Reference material:
pn2eacpn function definition:
pn2eacpn_r pn2eacpn(matrix* Dm, matrix* Dp, int* Mask, matrix* MX, matrix* L0, matrix* L, int *ipl, int ipCount, int* dpl, int dpCount, int** TD, int* TDCount)
Modified: spnbox/tests/test-pn2eacpn.mak
===================================================================
--- spnbox/tests/test-pn2eacpn.mak 2009-06-29 19:36:18 UTC (rev 123)
+++ spnbox/tests/test-pn2eacpn.mak 2009-06-29 22:19:26 UTC (rev 124)
@@ -12,9 +12,6 @@
matrix.o: ../../pnheaders/matrix.c ../../pnheaders/matrix.h ../../pnheaders/pns.h
$(COMPILER) -c ../../pnheaders/matrix.c
-reader.o: ../spnbox.h ../MemoryManager.h reader.c
- $(COMPILER) -c reader.c
-
MemoryManager.o: ../MemoryManager.h ../MemoryManager.c ../../pnheaders/general.h ../../pnheaders/matrix.h
$(COMPILER) -c ../MemoryManager.c
Added: spnbox/tests/test.c
===================================================================
--- spnbox/tests/test.c (rev 0)
+++ spnbox/tests/test.c 2009-06-29 22:19:26 UTC (rev 124)
@@ -0,0 +1,79 @@
+#include "test.h"
+
+int verbose;
+
+int is_verbose()
+{
+ /*We want maximum verbosity. reduce uses chkcons, so return whichever
+ verbosity threshold is higher.*/
+ return verbose;
+}
+
+void setverbose(int vrb)
+{
+ verbose = vrb;
+}
+
+FILE* GetInput(int argc, char* argv[])
+{
+ FILE* file;
+ if (argc > 1)
+ {
+ if (file = fopen(argv[1], "r"))
+ {
+ printf("Taking input from file '%s'...\n", argv[1]);
+ return file;
+ }
+ else
+ {
+ printf("Failed to open file '%s' for read access!\n", argv[1]);
+ return 0;
+ }
+ }
+ else
+ {
+ printf("Taking input from console...\n");
+ return stdin;
+ }
+}
+
+int HasSelfLoops(matrix* Dm, matrix* Dp)
+{
+ int i, j;
+ for (i = 0; i < NumberOfRows(*Dm); i++)
+ {
+ for (j = 0; j < NumberOfColumns(*Dm); j++)
+ {
+ if (GetMatrixEl(Dm, i, j) && GetMatrixEl(Dp, i, j))
+ {
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+void FillDmDp(int* Filled, matrix* D, matrix* Dm, matrix* Dp)
+{
+ /*If D has been filled...*/
+ if (Filled[0])
+ {
+ /*We want to ignore any given Dm and Dp and instead fill Dm and Dp with
+ matrices developed from D.*/
+ if (Filled[1])
+ {
+ DeallocateMatrix(Dm);
+ }
+ if (Filled[2])
+ {
+ DeallocateMatrix(Dp);
+ }
+ AllocateMatrixType(2, Dm, NumberOfRows(*D), NumberOfColumns(*D));
+ AllocateMatrixType(2, Dp, NumberOfRows(*D), NumberOfColumns(*D));
+ d2dd(D, Dm, Dp);
+ Filled[0] = 0;
+ Filled[1] = 1;
+ Filled[2] = 1;
+ }
+}
+
Added: spnbox/tests/test.h
===================================================================
--- spnbox/tests/test.h (rev 0)
+++ spnbox/tests/test.h 2009-06-29 22:19:26 UTC (rev 124)
@@ -0,0 +1,28 @@
+#ifndef TEST_H
+#define TEST_H
+
+#include <stdio.h>
+#include "../../pnheaders/pns.h"
+#include "../../pnheaders/matrix.h"
+#include "../matrixmath.h"
+#include "../spnbox.h"
+#include "../MemoryManager.h"
+#include "StructuredIO.h"
+
+/*This file defines some functions that are commonly used in testing spnbox
+functions, and includes the things commonly included.*/
+
+/*A way to set the verbosity level. is_verbose, declared in pns, is implemented
+in test.c*/
+void setverbose(int vrb);
+
+/*Get the file pointer that input will be taken from.*/
+FILE* GetInput(int argc, char* argv[]);
+
+/*Determine if the given i/o matrices have self-loops.*/
+int HasSelfLoops(matrix* Dm, matrix* Dp);
+
+/*If D was filled, fill Dm and Dp as appropriate.*/
+void FillDmDp(int* Filled, matrix* D, matrix* Dm, matrix* Dp);
+
+#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mio...@us...> - 2009-06-29 19:36:19
|
Revision: 123
http://pntool.svn.sourceforge.net/pntool/?rev=123&view=rev
Author: miordache
Date: 2009-06-29 19:36:18 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
Added Paths:
-----------
third-party/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mio...@us...> - 2009-06-29 19:30:53
|
Revision: 122
http://pntool.svn.sourceforge.net/pntool/?rev=122&view=rev
Author: miordache
Date: 2009-06-29 19:30:28 +0000 (Mon, 29 Jun 2009)
Log Message:
-----------
lets place third party software in the directory third-party
Modified Paths:
--------------
README.txt
Modified: README.txt
===================================================================
--- README.txt 2009-06-28 23:44:26 UTC (rev 121)
+++ README.txt 2009-06-29 19:30:28 UTC (rev 122)
@@ -3,9 +3,18 @@
Drew Crawford administrates this repo. If you need help, send me an e-mail: dr...@se...
Here's the directory structure:
-pnheaders - these files are maintained by Dr. Iordache. Codegen (and maybe others) compile against these libraries.
-translator - this code takes a high-level-language spec and turns it into a pns datastructure. Maintained by Bion Oren. Uses ANTLR (translator/clibs/).
-spnbox - this code generates supervisors? Maintained by Stephen Camp. Uses MILP solver.
-codegen - these files are maintained by Drew Crawford and Kris Eggert. This will become the code generating portion of the petri net.
-Feel free to add more directories! Track your code in here!
\ No newline at end of file
+codegen - these files are maintained by Drew Crawford and Kris Eggert.
+ This will become the code generating portion of the petri net.
+
+pnheaders - these files are maintained by Dr. Iordache. They provide functions
+ for the manipulation of PN objects.
+
+spnbox - this code performs the supervisory control. Maintained by
+ Stephen Camp. Uses LPSOLVE as the MILP solver. LPSOLVE is
+ distributed under the LGPL licence.
+
+translator - this code takes a high-level-language spec and turns it into a pns datastructure. Maintained by Bion Oren. Uses ANTLR
+ (translator/clibs/). ANTLR is distributed under the BSD license.
+
+Feel free to add more directories! Track your code in here!
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Drew C. <dr...@se...> - 2009-06-29 06:17:14
|
Somebody lost a 128mb flash drive in the advanced lab. If it's you, let me know your CPO number and I will make sure it gets back to you. Thanks, Drew |
|
From: <com...@us...> - 2009-06-28 23:44:28
|
Revision: 121
http://pntool.svn.sourceforge.net/pntool/?rev=121&view=rev
Author: compaqdrew
Date: 2009-06-28 23:44:26 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Updating documentation
Modified Paths:
--------------
codegen/README.txt
codegen/src/MakeGen.c
codegen/src/codegen.xcodeproj/drew.mode1v3
codegen/src/codegen.xcodeproj/drew.pbxuser
Modified: codegen/README.txt
===================================================================
--- codegen/README.txt 2009-06-28 23:43:57 UTC (rev 120)
+++ codegen/README.txt 2009-06-28 23:44:26 UTC (rev 121)
@@ -2,6 +2,25 @@
Currently, codegen is being developed as a standalone application, because the other parts of pntool are not ready yet. You can see the wrapper program and sample data we call ourselves with in main.c.
-Drew Crawford maintains the xcodebuild process, which is currently the most-up-to-date build method. The official way to build is with xcodebuild.
+The xcodebuild process (as seen in test_supervisor.sh) is maintained by Drew Crawford for debugging purposes.
-There are makefiles in here, but I don't think they work nor do I know where they came from. You're welcome to try them and/or update them to work.
\ No newline at end of file
+If you want to build and test codegen-standalone on full autopilot, cd into codegen and use
+
+bash demo.sh
+
+This is currently the recommended method of testing codegen.
+
+You can also make codegen as a standalone tool; cd into the codegen directory and use
+
+make
+
+
+To build codegen as a static library (series of .o files), cd into codegen and use
+
+make static
+
+To use codegen as part of the Concurrency Tool suite, cd into pntool and use
+
+make
+
+This is not working at the time of this writing because the other tools aren't properly integrated.
\ No newline at end of file
Modified: codegen/src/MakeGen.c
===================================================================
--- codegen/src/MakeGen.c 2009-06-28 23:43:57 UTC (rev 120)
+++ codegen/src/MakeGen.c 2009-06-28 23:44:26 UTC (rev 121)
@@ -65,7 +65,7 @@
fprintf(makefile,intbuffer);
fprintf(makefile," ");
}
- fprintf(makefile,"\n");
+ fprintf(makefile,"\n\techo All built. If you want to test, please run $(SUPERVISOR).out\n");
//pnsheader target
fprintf(makefile,"PNSLIB: $(PNSLIB)\n");
Modified: codegen/src/codegen.xcodeproj/drew.mode1v3
===================================================================
--- codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-28 23:43:57 UTC (rev 120)
+++ codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-28 23:44:26 UTC (rev 121)
@@ -216,7 +216,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3AC8A5F10FF831E800DE2863</string>
+ <string>3AC8A5F60FF836F800DE2863</string>
<key>history</key>
<array>
<string>3AC8A5B90FF82D8100DE2863</string>
@@ -320,8 +320,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>16</integer>
- <integer>13</integer>
+ <integer>5</integer>
<integer>3</integer>
<integer>0</integer>
</array>
@@ -364,7 +363,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>supervisor_static_include.h</string>
+ <string>MakeGen.c</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -372,11 +371,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>supervisor_static_include.h</string>
+ <string>MakeGen.c</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3AC8A5F00FF831E800DE2863</string>
+ <string>3AC8A5F50FF836F800DE2863</string>
<key>history</key>
<array>
<string>3A7FCEED0FBC046D00EF8097</string>
@@ -403,9 +402,9 @@
<string>3AC8A5D20FF8312800DE2863</string>
<string>3AC8A5D30FF8312800DE2863</string>
<string>3AC8A5D50FF8312800DE2863</string>
- <string>3AC8A5EC0FF831E800DE2863</string>
<string>3AC8A5ED0FF831E800DE2863</string>
- <string>3AC8A5E50FF831C500DE2863</string>
+ <string>3AC8A5F20FF836F800DE2863</string>
+ <string>3AC8A5F30FF836F800DE2863</string>
</array>
<key>prevStack</key>
<array>
@@ -444,6 +443,7 @@
<string>3AC8A5E70FF831C500DE2863</string>
<string>3AC8A5EE0FF831E800DE2863</string>
<string>3AC8A5EF0FF831E800DE2863</string>
+ <string>3AC8A5F40FF836F800DE2863</string>
</array>
</dict>
<key>SplitCount</key>
Modified: codegen/src/codegen.xcodeproj/drew.pbxuser
===================================================================
--- codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-28 23:43:57 UTC (rev 120)
+++ codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-28 23:44:26 UTC (rev 121)
@@ -175,6 +175,11 @@
3AC8A5EF0FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5EF0FF831E800DE2863 /* PBXTextBookmark */;
3AC8A5F00FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5F00FF831E800DE2863 /* PBXTextBookmark */;
3AC8A5F10FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5F10FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F20FF836F800DE2863 /* PBXTextBookmark */ = 3AC8A5F20FF836F800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F30FF836F800DE2863 /* PBXTextBookmark */ = 3AC8A5F30FF836F800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F40FF836F800DE2863 /* PBXTextBookmark */ = 3AC8A5F40FF836F800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F50FF836F800DE2863 /* PBXTextBookmark */ = 3AC8A5F50FF836F800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F60FF836F800DE2863 /* PBXTextBookmark */ = 3AC8A5F60FF836F800DE2863 /* PBXTextBookmark */;
3AEAF9100FB2697C00D61E73 = 3AEAF9100FB2697C00D61E73 /* PBXTextBookmark */;
3AEAF9120FB2697C00D61E73 = 3AEAF9120FB2697C00D61E73 /* PBXTextBookmark */;
3AEAF9130FB2697C00D61E73 = 3AEAF9130FB2697C00D61E73 /* PBXTextBookmark */;
@@ -950,9 +955,9 @@
};
3AC8A5440FF81EE900DE2863 /* MakeGen.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1011, 1302}}";
- sepNavSelRange = "{319, 0}";
- sepNavVisRange = "{17, 1288}";
+ sepNavIntBoundsRect = "{{0, 0}, {1011, 1330}}";
+ sepNavSelRange = "{1837, 0}";
+ sepNavVisRange = "{927, 1136}";
};
};
3AC8A55F0FF827A900DE2863 /* PBXTextBookmark */ = {
@@ -1120,7 +1125,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 14";
rLen = 0;
- rLoc = 2418;
+ rLoc = 2488;
rType = 0;
vrLen = 211;
vrLoc = 0;
@@ -1270,7 +1275,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 72";
rLen = 0;
- rLoc = 2050;
+ rLoc = 2120;
rType = 0;
vrLen = 997;
vrLoc = 903;
@@ -1307,7 +1312,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 72";
rLen = 0;
- rLoc = 2050;
+ rLoc = 2120;
rType = 0;
vrLen = 997;
vrLoc = 903;
@@ -1453,7 +1458,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 92";
rLen = 0;
- rLoc = 2416;
+ rLoc = 2486;
rType = 0;
vrLen = 1213;
vrLoc = 0;
@@ -1503,7 +1508,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 92";
rLen = 0;
- rLoc = 2416;
+ rLoc = 2486;
rType = 0;
vrLen = 1213;
vrLoc = 0;
@@ -1553,7 +1558,7 @@
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
name = "MakeGen.c: 92";
rLen = 0;
- rLoc = 2416;
+ rLoc = 2486;
rType = 0;
vrLen = 1213;
vrLoc = 0;
@@ -1668,6 +1673,56 @@
vrLen = 1249;
vrLoc = 6344;
};
+ 3AC8A5F20FF836F800DE2863 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 26";
+ rLen = 0;
+ rLoc = 671;
+ rType = 0;
+ vrLen = 1135;
+ vrLoc = 0;
+ };
+ 3AC8A5F30FF836F800DE2863 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
+ name = "MakeGen.c: 16";
+ rLen = 0;
+ rLoc = 319;
+ rType = 0;
+ vrLen = 1270;
+ vrLoc = 17;
+ };
+ 3AC8A5F40FF836F800DE2863 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 26";
+ rLen = 0;
+ rLoc = 671;
+ rType = 0;
+ vrLen = 1135;
+ vrLoc = 0;
+ };
+ 3AC8A5F50FF836F800DE2863 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
+ name = "MakeGen.c: 68";
+ rLen = 0;
+ rLoc = 1837;
+ rType = 0;
+ vrLen = 1136;
+ vrLoc = 927;
+ };
+ 3AC8A5F60FF836F800DE2863 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 471";
+ rLen = 0;
+ rLoc = 11644;
+ rType = 0;
+ vrLen = 1249;
+ vrLoc = 6344;
+ };
3AEAF9040FB2696400D61E73 /* supervisorCompiler.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1011, 626}}";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <com...@us...> - 2009-06-28 23:44:00
|
Revision: 120
http://pntool.svn.sourceforge.net/pntool/?rev=120&view=rev
Author: compaqdrew
Date: 2009-06-28 23:43:57 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Demo script; makefile changes
Modified Paths:
--------------
Makefile
codegen/Makefile
codegen/demo.sh
codegen/includes.txt
codegen/src/MakeGen.c
codegen/src/codegen.h
codegen/src/codegen.xcodeproj/drew.mode1v3
codegen/src/codegen.xcodeproj/drew.pbxuser
codegen/src/main.c
codegen/src/petriNetSerializer.h
codegen/src/plantCompiler.c
codegen/src/plantCompiler.h
codegen/src/supervisorCompiler.h
Removed Paths:
-------------
codegen/src/includes.txt
Modified: Makefile
===================================================================
--- Makefile 2009-06-28 23:43:10 UTC (rev 119)
+++ Makefile 2009-06-28 23:43:57 UTC (rev 120)
@@ -37,7 +37,7 @@
# cd $(TRANSLATOR); make
main_function.o: $(PNHEADERS)/main_function.c $(PNHEADERS)/pns.h $(SPNBOX)/spnbox.h $(CODEGEN)/src/codegen.h
- $(COMPILER) -c $(PNHEADERS)/main_function.c -Ispnbox -Icodegen/src
+ $(COMPILER) -c $(PNHEADERS)/main_function.c -Ispnbox -I$(CODEGEN)/src -I$(PNHEADERS)
clean:
rm -f main_function.o
Modified: codegen/Makefile
===================================================================
--- codegen/Makefile 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/Makefile 2009-06-28 23:43:57 UTC (rev 120)
@@ -30,10 +30,14 @@
$(COMPILER) -I../pnheaders -o src/$*.o -c src/$*.c
clean:
echo "$(B)Cleaning...$(E)"
+ if test -f compiled.Makefile; \
+ then make -f compiled.Makefile clean; \
+ fi
rm -f $(OBJS)
rm -f $(STANDALONE)
rm -f codegen
rm -f compiled.Makefile
+ rm -f plant-*.c
echo "$(B)Done$(E)"
distclean: clean
echo "$(B)Making distclean...$(E)"
Modified: codegen/demo.sh
===================================================================
--- codegen/demo.sh 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/demo.sh 2009-06-28 23:43:57 UTC (rev 120)
@@ -1,6 +1,14 @@
echo -e "\033[32mMaking...\033[0m"
make
-echo -e "\033[32mDone...\033[0m"
+echo -e "\033[32mDone\033[0m"
echo -e "\033[32mGenerating code...\033[0m"
./codegen
-echo -e "\033[32mDone\033[0m"
\ No newline at end of file
+echo -e "\033[32mDone\033[0m"
+echo -e "\033[32mMaking...\033[0m"
+make -f compiled.Makefile
+echo -e "\033[32mDone...\033[0m"
+echo -e "\033[32mBringing up supervisor...\033[0m"
+./supervisor.out
+echo -e "\033[32mDone...\033[0m"
+
+
Modified: codegen/includes.txt
===================================================================
--- codegen/includes.txt 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/includes.txt 2009-06-28 23:43:57 UTC (rev 120)
@@ -1,18 +1,8 @@
-Place 1:
-printf("This is PLACE 1!");
+PLANT1:
-Place 2:
-printf("This is PLACE 2!");
+//PLANT 1 INCLUDES
-Place 3:
-printf("This is PLACE 3!");
- printf("This is PLACE 3b!");
-
-PLANT 2:
-Place 1:
-printf("This is PLANT 2: PLACE 1!");
+PLANT2:
-Place 2:
-printf("This is PLANT 2: PLACE 2!");
-printf("This is PLANT 2: PLACE 2b!");
\ No newline at end of file
+//PLANT 2 INCLUDES
\ No newline at end of file
Modified: codegen/src/MakeGen.c
===================================================================
--- codegen/src/MakeGen.c 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/src/MakeGen.c 2009-06-28 23:43:57 UTC (rev 120)
@@ -12,26 +12,29 @@
void makeTarget(char* VARIABLE_NAME,FILE* makefile)
{
fprintf(makefile, VARIABLE_NAME);
- fprintf(makefile," : $(");
+ fprintf(makefile," : PNSLIB\n");
+ fprintf(makefile,"\t$(COMPILER) -I$(PNSLIBSRC) -I$(CODEGENSRC) -DPIPES -o $(");
fprintf(makefile,VARIABLE_NAME);
- fprintf(makefile,")\n");
- fprintf(makefile,"\t$(COMPILER) $(");
+ fprintf(makefile,").out $(");
fprintf(makefile,VARIABLE_NAME);
- fprintf(makefile,")\n");
+ fprintf(makefile,").c $(PNSLIB)\n");
}
void makeMake(char* sname, process** prarray, int num)
{
FILE* makefile = fopen("compiled.Makefile", "w");
fprintf(makefile,"#Generated by codegen\n");
- //objs
- fprintf(makefile,"SUPERVISOR = src/");
- //strip the c off the sname
+ //some global stuff
+ fprintf(makefile,"CODEGENSRC = src\n");
+ fprintf(makefile,"PNSLIBSRC = ../pnheaders\n");
+ fprintf(makefile,"PNSLIB = $(PNSLIBSRC)/pns.o $(PNSLIBSRC)/matrix.o $(PNSLIBSRC)/general.o\n");
+ //supervisor
+ fprintf(makefile,"SUPERVISOR = ");
char buffer[255];
- buffer[0] = 0;
+ buffer[0]=0;
strcat(buffer,sname);
- buffer[strlen(buffer)-1]=0;
- strcat(buffer,"o\n");
+ buffer[strlen(buffer)-2]=0; //strip .c
fprintf(makefile,buffer);
+ fprintf(makefile,"\n");
//similarly, loop through the plants
int i;
for(i = 0; i < num; i++)
@@ -42,14 +45,49 @@
sprintf(intbuffer,"%d",i);
fprintf(makefile,intbuffer);
fprintf(makefile," = ");
- buffer[0]=0;
- strcat(buffer,prarray[i]->name);
- buffer[strlen(buffer)-1]=0;
- strcat(buffer,"o\n");
+ buffer[0]=0;
+ strcat(buffer,prarray[i]->name);
+ buffer[strlen(buffer)-2]=0; //strip .c
fprintf(makefile,buffer);
+ fprintf(makefile,"\n");
}
fprintf(makefile,"COMPILER = gcc -g\n");
//now do the targets
+ //all target
+ fprintf(makefile,"all: SUPERVISOR ");
+ for(i = 0; i < num; i++)
+ {
+ fprintf(makefile,"PLANT");
+ char intbuffer[10];
+ intbuffer[0]=0;
+ sprintf(intbuffer,"%d",i);
+ fprintf(makefile,intbuffer);
+ fprintf(makefile," ");
+ }
+ fprintf(makefile,"\n");
+ //pnsheader target
+
+ fprintf(makefile,"PNSLIB: $(PNSLIB)\n");
+ fprintf(makefile,"\t $(COMPILER) -c $(PNSLIB)\n");
makeTarget("SUPERVISOR",makefile);
+ //plant targets
+
+ for(i = 0; i < num; i++)
+ {
+ char varbuffer[30];
+ char intbuffer[10];
+ intbuffer[0]=0;
+ varbuffer[0]=0;
+ sprintf(intbuffer,"%d",i);
+ strcat(varbuffer,"PLANT");
+ strcat(varbuffer,intbuffer);
+ makeTarget(varbuffer, makefile);
+ }
+ //clean target
+ fprintf(makefile, "clean: \n");
+ fprintf(makefile,"\t rm -rf *.out\n");
+ fprintf(makefile,"\t rm -rf *.dSYM\n");
+
+ printf("Makefile written to compiled.Makefile. If you want to make, use 'make -f compiled.Makefile'\n");
}
\ No newline at end of file
Modified: codegen/src/codegen.h
===================================================================
--- codegen/src/codegen.h 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/src/codegen.h 2009-06-28 23:43:57 UTC (rev 120)
@@ -7,7 +7,7 @@
* * The methods not in the .h file should be treated as private
*/
-#include "../../pnheaders/pns.h"
+#include "pns.h"
int GenerateProgram(pns *supervisor, char* sname, process** prarray, int num);
/* Generates the supervisor and the process source files. It also generates
Modified: codegen/src/codegen.xcodeproj/drew.mode1v3
===================================================================
--- codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/src/codegen.xcodeproj/drew.mode1v3 2009-06-28 23:43:57 UTC (rev 120)
@@ -216,10 +216,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3AC8A57E0FF827A900DE2863</string>
+ <string>3AC8A5F10FF831E800DE2863</string>
<key>history</key>
<array>
- <string>3A4754A90FF73DE300EE18BA</string>
+ <string>3AC8A5B90FF82D8100DE2863</string>
</array>
</dict>
<key>SplitCount</key>
@@ -320,7 +320,8 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>17</integer>
+ <integer>16</integer>
+ <integer>13</integer>
<integer>3</integer>
<integer>0</integer>
</array>
@@ -363,7 +364,7 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>petriNetSerializer.h</string>
+ <string>supervisor_static_include.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -371,11 +372,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
- <string>petriNetSerializer.h</string>
+ <string>supervisor_static_include.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3AC8A57D0FF827A900DE2863</string>
+ <string>3AC8A5F00FF831E800DE2863</string>
<key>history</key>
<array>
<string>3A7FCEED0FBC046D00EF8097</string>
@@ -386,24 +387,25 @@
<string>3A65A9550FC12C01004E4F00</string>
<string>3A5D84730FCCA60900465DF2</string>
<string>3A5D84E40FCCAA6700465DF2</string>
- <string>3A62EEFF0FD5FF7900E60F50</string>
<string>3A09E2E20FED6EEA003FAB0D</string>
<string>3AF91D650FF70813009F6B4F</string>
<string>3AF91D660FF70813009F6B4F</string>
<string>3AF91D670FF70813009F6B4F</string>
- <string>3AF91D7E0FF708B2009F6B4F</string>
<string>3AF91D7F0FF708B2009F6B4F</string>
<string>3A47543F0FF732C700EE18BA</string>
- <string>3A4754470FF7330D00EE18BA</string>
<string>3AC8A55F0FF827A900DE2863</string>
- <string>3AC8A5600FF827A900DE2863</string>
<string>3AC8A5610FF827A900DE2863</string>
- <string>3AC8A5620FF827A900DE2863</string>
<string>3AC8A5630FF827A900DE2863</string>
- <string>3AC8A5640FF827A900DE2863</string>
<string>3AC8A5650FF827A900DE2863</string>
- <string>3AC8A5660FF827A900DE2863</string>
- <string>3AC8A5670FF827A900DE2863</string>
+ <string>3AC8A57F0FF8282C00DE2863</string>
+ <string>3AC8A5A50FF82D0E00DE2863</string>
+ <string>3AC8A5D10FF8312800DE2863</string>
+ <string>3AC8A5D20FF8312800DE2863</string>
+ <string>3AC8A5D30FF8312800DE2863</string>
+ <string>3AC8A5D50FF8312800DE2863</string>
+ <string>3AC8A5EC0FF831E800DE2863</string>
+ <string>3AC8A5ED0FF831E800DE2863</string>
+ <string>3AC8A5E50FF831C500DE2863</string>
</array>
<key>prevStack</key>
<array>
@@ -431,27 +433,17 @@
<string>3AF91D6B0FF70813009F6B4F</string>
<string>3AF91D6C0FF70813009F6B4F</string>
<string>3A4754420FF732C700EE18BA</string>
- <string>3AC8A5680FF827A900DE2863</string>
- <string>3AC8A5690FF827A900DE2863</string>
- <string>3AC8A56A0FF827A900DE2863</string>
<string>3AC8A56B0FF827A900DE2863</string>
- <string>3AC8A56C0FF827A900DE2863</string>
- <string>3AC8A56D0FF827A900DE2863</string>
- <string>3AC8A56E0FF827A900DE2863</string>
- <string>3AC8A56F0FF827A900DE2863</string>
<string>3AC8A5700FF827A900DE2863</string>
- <string>3AC8A5710FF827A900DE2863</string>
- <string>3AC8A5720FF827A900DE2863</string>
- <string>3AC8A5730FF827A900DE2863</string>
- <string>3AC8A5740FF827A900DE2863</string>
- <string>3AC8A5750FF827A900DE2863</string>
- <string>3AC8A5760FF827A900DE2863</string>
- <string>3AC8A5770FF827A900DE2863</string>
- <string>3AC8A5780FF827A900DE2863</string>
- <string>3AC8A5790FF827A900DE2863</string>
- <string>3AC8A57A0FF827A900DE2863</string>
- <string>3AC8A57B0FF827A900DE2863</string>
- <string>3AC8A57C0FF827A900DE2863</string>
+ <string>3AC8A5AA0FF82D0E00DE2863</string>
+ <string>3AC8A5D60FF8312800DE2863</string>
+ <string>3AC8A5D70FF8312800DE2863</string>
+ <string>3AC8A5D80FF8312800DE2863</string>
+ <string>3AC8A5D90FF8312800DE2863</string>
+ <string>3AC8A5DA0FF8312800DE2863</string>
+ <string>3AC8A5E70FF831C500DE2863</string>
+ <string>3AC8A5EE0FF831E800DE2863</string>
+ <string>3AC8A5EF0FF831E800DE2863</string>
</array>
</dict>
<key>SplitCount</key>
@@ -509,9 +501,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>3AC8A5340FF81CB200DE2863</string>
+ <string>3AC8A5DC0FF8312800DE2863</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>3AC8A5350FF81CB200DE2863</string>
+ <string>3AC8A5DD0FF8312800DE2863</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -645,10 +637,8 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>1C530D57069F1CE1000CFCEE</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>3ACFDCB10FDA81C200C504DE</string>
- <string>3A232CB10FB21F7F00A5C7C2</string>
<string>/Users/drew/Dropbox/Code/pntool/codegen/src/codegen.xcodeproj</string>
</array>
<key>WindowString</key>
@@ -851,13 +841,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>3AC8A5370FF81CB200DE2863</string>
+ <string>3AC8A5DF0FF8312800DE2863</string>
<string>1C162984064C10D400B95A72</string>
- <string>3AC8A5380FF81CB200DE2863</string>
- <string>3AC8A5390FF81CB200DE2863</string>
- <string>3AC8A53A0FF81CB200DE2863</string>
- <string>3AC8A53B0FF81CB200DE2863</string>
- <string>3AC8A53C0FF81CB200DE2863</string>
+ <string>3AC8A5E00FF8312800DE2863</string>
+ <string>3AC8A5E10FF8312800DE2863</string>
+ <string>3AC8A5E20FF8312800DE2863</string>
+ <string>3AC8A5E30FF8312800DE2863</string>
+ <string>3AC8A5E40FF8312800DE2863</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@@ -1011,7 +1001,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>3A09E2FC0FED6F4E003FAB0D</string>
+ <string>3AC8A5B20FF82D0E00DE2863</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
Modified: codegen/src/codegen.xcodeproj/drew.pbxuser
===================================================================
--- codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-28 23:43:10 UTC (rev 119)
+++ codegen/src/codegen.xcodeproj/drew.pbxuser 2009-06-28 23:43:57 UTC (rev 120)
@@ -76,114 +76,21 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 267918248;
- PBXWorkspaceStateSaveDate = 267918248;
+ PBXPerProjectTemplateStateSaveDate = 267922835;
+ PBXWorkspaceStateSaveDate = 267922835;
};
perUserProjectItems = {
- 3A09E2E10FED6EEA003FAB0D = 3A09E2E10FED6EEA003FAB0D /* PBXTextBookmark */;
3A09E2E20FED6EEA003FAB0D = 3A09E2E20FED6EEA003FAB0D /* PBXTextBookmark */;
3A09E2E70FED6EEA003FAB0D = 3A09E2E70FED6EEA003FAB0D /* PBXTextBookmark */;
3A232C980FB21F7F00A5C7C2 = 3A232C980FB21F7F00A5C7C2 /* PBXTextBookmark */;
3A232CA00FB21F7F00A5C7C2 = 3A232CA00FB21F7F00A5C7C2 /* PBXTextBookmark */;
3A232CA10FB21F7F00A5C7C2 = 3A232CA10FB21F7F00A5C7C2 /* PBXTextBookmark */;
3A47543F0FF732C700EE18BA = 3A47543F0FF732C700EE18BA /* PBXTextBookmark */;
- 3A4754400FF732C700EE18BA = 3A4754400FF732C700EE18BA /* PBXTextBookmark */;
- 3A4754410FF732C700EE18BA = 3A4754410FF732C700EE18BA /* PBXTextBookmark */;
3A4754420FF732C700EE18BA = 3A4754420FF732C700EE18BA /* PBXTextBookmark */;
- 3A4754430FF732C700EE18BA = 3A4754430FF732C700EE18BA /* PBXTextBookmark */;
- 3A4754460FF732C700EE18BA = 3A4754460FF732C700EE18BA /* PBXTextBookmark */;
3A4754470FF7330D00EE18BA = 3A4754470FF7330D00EE18BA /* PBXTextBookmark */;
- 3A4754480FF7330D00EE18BA = 3A4754480FF7330D00EE18BA /* PBXTextBookmark */;
- 3A4754490FF7330D00EE18BA = 3A4754490FF7330D00EE18BA /* PBXTextBookmark */;
- 3A47544A0FF7330D00EE18BA = 3A47544A0FF7330D00EE18BA /* PBXTextBookmark */;
- 3A47544C0FF7335F00EE18BA = 3A47544C0FF7335F00EE18BA /* PBXTextBookmark */;
- 3A47544D0FF7335F00EE18BA = 3A47544D0FF7335F00EE18BA /* PBXTextBookmark */;
- 3A47544E0FF7337500EE18BA = 3A47544E0FF7337500EE18BA /* PBXTextBookmark */;
- 3A47544F0FF7337500EE18BA = 3A47544F0FF7337500EE18BA /* PBXTextBookmark */;
- 3A4754500FF733C400EE18BA = 3A4754500FF733C400EE18BA /* PBXTextBookmark */;
- 3A4754510FF733C400EE18BA = 3A4754510FF733C400EE18BA /* PBXTextBookmark */;
- 3A4754520FF7340100EE18BA = 3A4754520FF7340100EE18BA /* PBXTextBookmark */;
- 3A4754530FF7340100EE18BA = 3A4754530FF7340100EE18BA /* PBXTextBookmark */;
- 3A4754540FF7346300EE18BA = 3A4754540FF7346300EE18BA /* PBXTextBookmark */;
- 3A4754550FF7346300EE18BA = 3A4754550FF7346300EE18BA /* PBXTextBookmark */;
- 3A4754560FF7347100EE18BA = 3A4754560FF7347100EE18BA /* PBXTextBookmark */;
- 3A4754570FF7347100EE18BA = 3A4754570FF7347100EE18BA /* PBXTextBookmark */;
- 3A47545A0FF7348000EE18BA = 3A47545A0FF7348000EE18BA /* PBXTextBookmark */;
- 3A47545B0FF7348000EE18BA = 3A47545B0FF7348000EE18BA /* PBXTextBookmark */;
- 3A47545D0FF734FD00EE18BA = 3A47545D0FF734FD00EE18BA /* PBXTextBookmark */;
- 3A47545E0FF734FD00EE18BA = 3A47545E0FF734FD00EE18BA /* PBXTextBookmark */;
- 3A47545F0FF7351000EE18BA = 3A47545F0FF7351000EE18BA /* PBXTextBookmark */;
- 3A4754600FF7351000EE18BA = 3A4754600FF7351000EE18BA /* PBXTextBookmark */;
- 3A4754610FF7353C00EE18BA = 3A4754610FF7353C00EE18BA /* PBXTextBookmark */;
- 3A4754620FF7353C00EE18BA = 3A4754620FF7353C00EE18BA /* PBXTextBookmark */;
- 3A4754630FF7355500EE18BA = 3A4754630FF7355500EE18BA /* PBXTextBookmark */;
- 3A4754640FF7355500EE18BA = 3A4754640FF7355500EE18BA /* PBXTextBookmark */;
- 3A4754650FF7356E00EE18BA = 3A4754650FF7356E00EE18BA /* PBXTextBookmark */;
- 3A4754660FF7356E00EE18BA = 3A4754660FF7356E00EE18BA /* PBXTextBookmark */;
- 3A4754670FF7358300EE18BA = 3A4754670FF7358300EE18BA /* PBXTextBookmark */;
- 3A4754680FF7358300EE18BA = 3A4754680FF7358300EE18BA /* PBXTextBookmark */;
- 3A47546B0FF7361D00EE18BA = 3A47546B0FF7361D00EE18BA /* PBXTextBookmark */;
- 3A47546C0FF7361D00EE18BA = 3A47546C0FF7361D00EE18BA /* PBXTextBookmark */;
- 3A47546D0FF7361D00EE18BA = 3A47546D0FF7361D00EE18BA /* PBXTextBookmark */;
- 3A47546E0FF7367500EE18BA = 3A47546E0FF7367500EE18BA /* PBXTextBookmark */;
- 3A47546F0FF7367500EE18BA = 3A47546F0FF7367500EE18BA /* PBXTextBookmark */;
- 3A4754700FF736B800EE18BA = 3A4754700FF736B800EE18BA /* PBXTextBookmark */;
- 3A4754710FF736B800EE18BA = 3A4754710FF736B800EE18BA /* PBXTextBookmark */;
- 3A4754720FF7373E00EE18BA = 3A4754720FF7373E00EE18BA /* PBXTextBookmark */;
- 3A4754730FF7373E00EE18BA = 3A4754730FF7373E00EE18BA /* PBXTextBookmark */;
- 3A4754740FF7375A00EE18BA = 3A4754740FF7375A00EE18BA /* PBXTextBookmark */;
- 3A4754750FF7375A00EE18BA = 3A4754750FF7375A00EE18BA /* PBXTextBookmark */;
- 3A4754760FF7379600EE18BA = 3A4754760FF7379600EE18BA /* PBXTextBookmark */;
- 3A4754770FF7379600EE18BA = 3A4754770FF7379600EE18BA /* PBXTextBookmark */;
- 3A4754780FF737DF00EE18BA = 3A4754780FF737DF00EE18BA /* PBXTextBookmark */;
- 3A4754790FF737DF00EE18BA = 3A4754790FF737DF00EE18BA /* PBXTextBookmark */;
- 3A47547A0FF7387000EE18BA = 3A47547A0FF7387000EE18BA /* PBXTextBookmark */;
- 3A47547B0FF7387000EE18BA = 3A47547B0FF7387000EE18BA /* PBXTextBookmark */;
- 3A47547C0FF738A200EE18BA = 3A47547C0FF738A200EE18BA /* PBXTextBookmark */;
- 3A47547D0FF738A200EE18BA = 3A47547D0FF738A200EE18BA /* PBXTextBookmark */;
- 3A47547E0FF738B400EE18BA = 3A47547E0FF738B400EE18BA /* PBXTextBookmark */;
- 3A47547F0FF738B400EE18BA = 3A47547F0FF738B400EE18BA /* PBXTextBookmark */;
- 3A4754800FF7393F00EE18BA = 3A4754800FF7393F00EE18BA /* PBXTextBookmark */;
- 3A4754810FF7393F00EE18BA = 3A4754810FF7393F00EE18BA /* PBXTextBookmark */;
- 3A4754820FF7395900EE18BA = 3A4754820FF7395900EE18BA /* PBXTextBookmark */;
- 3A4754830FF7395900EE18BA = 3A4754830FF7395900EE18BA /* PBXTextBookmark */;
- 3A4754840FF7397700EE18BA = 3A4754840FF7397700EE18BA /* PBXTextBookmark */;
- 3A4754850FF7397700EE18BA = 3A4754850FF7397700EE18BA /* PBXTextBookmark */;
- 3A4754860FF739C800EE18BA = 3A4754860FF739C800EE18BA /* PBXTextBookmark */;
- 3A4754870FF739C800EE18BA = 3A4754870FF739C800EE18BA /* PBXTextBookmark */;
- 3A4754880FF739FF00EE18BA = 3A4754880FF739FF00EE18BA /* PBXTextBookmark */;
- 3A4754890FF739FF00EE18BA = 3A4754890FF739FF00EE18BA /* PBXTextBookmark */;
- 3A47548A0FF73A4100EE18BA = 3A47548A0FF73A4100EE18BA /* PBXTextBookmark */;
- 3A47548B0FF73A4100EE18BA = 3A47548B0FF73A4100EE18BA /* PBXTextBookmark */;
- 3A47548C0FF73A7600EE18BA = 3A47548C0FF73A7600EE18BA /* PBXTextBookmark */;
- 3A47548D0FF73A7600EE18BA = 3A47548D0FF73A7600EE18BA /* PBXTextBookmark */;
- 3A47548E0FF73ADC00EE18BA = 3A47548E0FF73ADC00EE18BA /* PBXTextBookmark */;
- 3A47548F0FF73ADC00EE18BA = 3A47548F0FF73ADC00EE18BA /* PBXTextBookmark */;
- 3A4754910FF73B8A00EE18BA = 3A4754910FF73B8A00EE18BA /* PBXTextBookmark */;
- 3A4754920FF73B8A00EE18BA = 3A4754920FF73B8A00EE18BA /* PBXTextBookmark */;
- 3A4754930FF73BE600EE18BA = 3A4754930FF73BE600EE18BA /* PBXTextBookmark */;
- 3A4754940FF73BE600EE18BA = 3A4754940FF73BE600EE18BA /* PBXTextBookmark */;
- 3A4754960FF73BFD00EE18BA = 3A4754960FF73BFD00EE18BA /* PBXTextBookmark */;
- 3A4754970FF73BFD00EE18BA = 3A4754970FF73BFD00EE18BA /* PBXTextBookmark */;
- 3A4754980FF73C2200EE18BA = 3A4754980FF73C2200EE18BA /* PBXTextBookmark */;
- 3A4754990FF73C2200EE18BA = 3A4754990FF73C2200EE18BA /* PBXTextBookmark */;
- 3A47549A0FF73C5300EE18BA = 3A47549A0FF73C5300EE18BA /* PBXTextBookmark */;
- 3A47549B0FF73C5300EE18BA = 3A47549B0FF73C5300EE18BA /* PBXTextBookmark */;
- 3A47549C0FF73CB900EE18BA = 3A47549C0FF73CB900EE18BA /* PBXTextBookmark */;
- 3A47549D0FF73CB900EE18BA = 3A47549D0FF73CB900EE18BA /* PBXTextBookmark */;
- 3A47549E0FF73CE800EE18BA = 3A47549E0FF73CE800EE18BA /* PBXTextBookmark */;
- 3A47549F0FF73CE800EE18BA = 3A47549F0FF73CE800EE18BA /* PBXTextBookmark */;
- 3A4754A10FF73D3200EE18BA = 3A4754A10FF73D3200EE18BA /* PBXTextBookmark */;
- 3A4754A20FF73D3200EE18BA = 3A4754A20FF73D3200EE18BA /* PBXTextBookmark */;
- 3A4754A40FF73D8C00EE18BA = 3A4754A40FF73D8C00EE18BA /* PBXTextBookmark */;
- 3A4754A50FF73D8C00EE18BA = 3A4754A50FF73D8C00EE18BA /* PBXTextBookmark */;
- 3A4754A60FF73DD200EE18BA = 3A4754A60FF73DD200EE18BA /* PBXTextBookmark */;
- 3A4754A70FF73DD200EE18BA = 3A4754A70FF73DD200EE18BA /* PBXTextBookmark */;
- 3A4754A80FF73DE300EE18BA = 3A4754A80FF73DE300EE18BA /* PBXTextBookmark */;
3A4754A90FF73DE300EE18BA = 3A4754A90FF73DE300EE18BA /* PBXTextBookmark */;
3A5D84730FCCA60900465DF2 = 3A5D84730FCCA60900465DF2 /* PBXTextBookmark */;
3A5D84E40FCCAA6700465DF2 = 3A5D84E40FCCAA6700465DF2 /* PBXTextBookmark */;
- 3A62EEFF0FD5FF7900E60F50 = 3A62EEFF0FD5FF7900E60F50 /* PBXTextBookmark */;
3A65A7580FC0D5C2004E4F00 = 3A65A7580FC0D5C2004E4F00 /* PBXTextBookmark */;
3A65A75C0FC0D5C2004E4F00 = 3A65A75C0FC0D5C2004E4F00 /* PBXTextBookmark */;
3A65A7690FC0D8CA004E4F00 = 3A65A7690FC0D8CA004E4F00 /* PBXTextBookmark */;
@@ -200,91 +107,87 @@
3A99A6650FB8E3DC00B1F47C = 3A99A6650FB8E3DC00B1F47C /* PBXTextBookmark */;
3A99A6C60FB8E78600B1F47C = 3A99A6C60FB8E78600B1F47C /* PBXTextBookmark */;
3A99A7400FB8EC6800B1F47C = 3A99A7400FB8EC6800B1F47C /* PBXTextBookmark */;
- 3AC8A5330FF81CB200DE2863 /* PBXTextBookmark */ = 3AC8A5330FF81CB200DE2863 /* PBXTextBookmark */;
- 3AC8A5360FF81CB200DE2863 /* PBXTextBookmark */ = 3AC8A5360FF81CB200DE2863 /* PBXTextBookmark */;
- 3AC8A53D0FF81D5E00DE2863 /* PBXTextBookmark */ = 3AC8A53D0FF81D5E00DE2863 /* PBXTextBookmark */;
- 3AC8A53E0FF81D5E00DE2863 /* PBXTextBookmark */ = 3AC8A53E0FF81D5E00DE2863 /* PBXTextBookmark */;
- 3AC8A53F0FF81D7C00DE2863 /* PBXTextBookmark */ = 3AC8A53F0FF81D7C00DE2863 /* PBXTextBookmark */;
- 3AC8A5400FF81D7C00DE2863 /* PBXTextBookmark */ = 3AC8A5400FF81D7C00DE2863 /* PBXTextBookmark */;
- 3AC8A54D0FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A54D0FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A54E0FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A54E0FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5510FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5510FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5520FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5520FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5530FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5530FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5540FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5540FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5550FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5550FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5560FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5560FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5570FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5570FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5580FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5580FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A5590FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A5590FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A55A0FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A55A0FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A55B0FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A55B0FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A55C0FF827A700DE2863 /* PBXTextBookmark */ = 3AC8A55C0FF827A700DE2863 /* PBXTextBookmark */;
- 3AC8A55F0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A55F0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5600FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5600FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5610FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5610FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5620FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5620FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5630FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5630FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5640FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5640FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5650FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5650FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5660FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5660FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5670FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5670FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5680FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5680FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5690FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5690FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56A0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56A0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56B0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56B0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56C0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56C0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56D0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56D0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56E0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56E0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A56F0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A56F0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5700FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5700FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5710FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5710FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5720FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5720FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5730FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5730FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5740FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5740FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5750FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5750FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5760FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5760FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5770FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5770FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5780FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5780FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5790FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A5790FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A57A0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A57A0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A57B0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A57B0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A57C0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A57C0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A57D0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A57D0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A57E0FF827A900DE2863 /* PBXTextBookmark */ = 3AC8A57E0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A55F0FF827A900DE2863 = 3AC8A55F0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5600FF827A900DE2863 = 3AC8A5600FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5610FF827A900DE2863 = 3AC8A5610FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5620FF827A900DE2863 = 3AC8A5620FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5630FF827A900DE2863 = 3AC8A5630FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5650FF827A900DE2863 = 3AC8A5650FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5680FF827A900DE2863 = 3AC8A5680FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5690FF827A900DE2863 = 3AC8A5690FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56A0FF827A900DE2863 = 3AC8A56A0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56B0FF827A900DE2863 = 3AC8A56B0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56C0FF827A900DE2863 = 3AC8A56C0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56D0FF827A900DE2863 = 3AC8A56D0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56E0FF827A900DE2863 = 3AC8A56E0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A56F0FF827A900DE2863 = 3AC8A56F0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5700FF827A900DE2863 = 3AC8A5700FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5710FF827A900DE2863 = 3AC8A5710FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5720FF827A900DE2863 = 3AC8A5720FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5730FF827A900DE2863 = 3AC8A5730FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5740FF827A900DE2863 = 3AC8A5740FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5750FF827A900DE2863 = 3AC8A5750FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5760FF827A900DE2863 = 3AC8A5760FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5770FF827A900DE2863 = 3AC8A5770FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5780FF827A900DE2863 = 3AC8A5780FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A5790FF827A900DE2863 = 3AC8A5790FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A57A0FF827A900DE2863 = 3AC8A57A0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A57B0FF827A900DE2863 = 3AC8A57B0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A57C0FF827A900DE2863 = 3AC8A57C0FF827A900DE2863 /* PBXTextBookmark */;
+ 3AC8A57F0FF8282C00DE2863 = 3AC8A57F0FF8282C00DE2863 /* PBXTextBookmark */;
+ 3AC8A5800FF8282C00DE2863 = 3AC8A5800FF8282C00DE2863 /* PBXTextBookmark */;
+ 3AC8A5810FF8282C00DE2863 = 3AC8A5810FF8282C00DE2863 /* PBXTextBookmark */;
+ 3AC8A5820FF8282C00DE2863 = 3AC8A5820FF8282C00DE2863 /* PBXTextBookmark */;
+ 3AC8A5A40FF82D0E00DE2863 = 3AC8A5A40FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5A50FF82D0E00DE2863 = 3AC8A5A50FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5A60FF82D0E00DE2863 = 3AC8A5A60FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5A90FF82D0E00DE2863 = 3AC8A5A90FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5AA0FF82D0E00DE2863 = 3AC8A5AA0FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5AC0FF82D0E00DE2863 = 3AC8A5AC0FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5AD0FF82D0E00DE2863 = 3AC8A5AD0FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5AE0FF82D0E00DE2863 = 3AC8A5AE0FF82D0E00DE2863 /* PBXTextBookmark */;
+ 3AC8A5B50FF82D8100DE2863 = 3AC8A5B50FF82D8100DE2863 /* PBXTextBookmark */;
+ 3AC8A5B60FF82D8100DE2863 = 3AC8A5B60FF82D8100DE2863 /* PBXTextBookmark */;
+ 3AC8A5B70FF82D8100DE2863 = 3AC8A5B70FF82D8100DE2863 /* PBXTextBookmark */;
+ 3AC8A5B90FF82D8100DE2863 = 3AC8A5B90FF82D8100DE2863 /* PBXTextBookmark */;
+ 3AC8A5D10FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D10FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D20FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D20FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D30FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D30FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D40FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D40FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D50FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D50FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D60FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D60FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D70FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D70FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D80FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D80FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5D90FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5D90FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5DA0FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5DA0FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5DB0FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5DB0FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5DE0FF8312800DE2863 /* PBXTextBookmark */ = 3AC8A5DE0FF8312800DE2863 /* PBXTextBookmark */;
+ 3AC8A5E50FF831C500DE2863 /* PBXTextBookmark */ = 3AC8A5E50FF831C500DE2863 /* PBXTextBookmark */;
+ 3AC8A5E60FF831C500DE2863 /* PBXTextBookmark */ = 3AC8A5E60FF831C500DE2863 /* PBXTextBookmark */;
+ 3AC8A5E70FF831C500DE2863 /* PBXTextBookmark */ = 3AC8A5E70FF831C500DE2863 /* PBXTextBookmark */;
+ 3AC8A5E80FF831C500DE2863 /* PBXTextBookmark */ = 3AC8A5E80FF831C500DE2863 /* PBXTextBookmark */;
+ 3AC8A5E90FF831C500DE2863 /* PBXTextBookmark */ = 3AC8A5E90FF831C500DE2863 /* PBXTextBookmark */;
+ 3AC8A5EA0FF831D300DE2863 /* PBXTextBookmark */ = 3AC8A5EA0FF831D300DE2863 /* PBXTextBookmark */;
+ 3AC8A5EB0FF831D300DE2863 /* PBXTextBookmark */ = 3AC8A5EB0FF831D300DE2863 /* PBXTextBookmark */;
+ 3AC8A5EC0FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5EC0FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5ED0FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5ED0FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5EE0FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5EE0FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5EF0FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5EF0FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F00FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5F00FF831E800DE2863 /* PBXTextBookmark */;
+ 3AC8A5F10FF831E800DE2863 /* PBXTextBookmark */ = 3AC8A5F10FF831E800DE2863 /* PBXTextBookmark */;
3AEAF9100FB2697C00D61E73 = 3AEAF9100FB2697C00D61E73 /* PBXTextBookmark */;
3AEAF9120FB2697C00D61E73 = 3AEAF9120FB2697C00D61E73 /* PBXTextBookmark */;
3AEAF9130FB2697C00D61E73 = 3AEAF9130FB2697C00D61E73 /* PBXTextBookmark */;
3AEE0D8F0FB3ACB600248D5F = 3AEE0D8F0FB3ACB600248D5F /* PBXTextBookmark */;
3AEE0D900FB3ACB600248D5F = 3AEE0D900FB3ACB600248D5F /* PBXTextBookmark */;
- 3AF1CBDF0FF49FD8002E11EE = 3AF1CBDF0FF49FD8002E11EE /* PBXTextBookmark */;
- 3AF91D640FF70813009F6B4F = 3AF91D640FF70813009F6B4F /* PBXTextBookmark */;
3AF91D650FF70813009F6B4F = 3AF91D650FF70813009F6B4F /* PBXTextBookmark */;
3AF91D660FF70813009F6B4F = 3AF91D660FF70813009F6B4F /* PBXTextBookmark */;
3AF91D670FF70813009F6B4F = 3AF91D670FF70813009F6B4F /* PBXTextBookmark */;
- 3AF91D680FF70813009F6B4F = 3AF91D680FF70813009F6B4F /* PBXTextBookmark */;
3AF91D690FF70813009F6B4F = 3AF91D690FF70813009F6B4F /* PBXTextBookmark */;
3AF91D6A0FF70813009F6B4F = 3AF91D6A0FF70813009F6B4F /* PBXTextBookmark */;
3AF91D6B0FF70813009F6B4F = 3AF91D6B0FF70813009F6B4F /* PBXTextBookmark */;
3AF91D6C0FF70813009F6B4F = 3AF91D6C0FF70813009F6B4F /* PBXTextBookmark */;
- 3AF91D6D0FF70813009F6B4F = 3AF91D6D0FF70813009F6B4F /* PBXTextBookmark */;
- 3AF91D7E0FF708B2009F6B4F = 3AF91D7E0FF708B2009F6B4F /* PBXTextBookmark */;
3AF91D7F0FF708B2009F6B4F = 3AF91D7F0FF708B2009F6B4F /* PBXTextBookmark */;
- 3AF91D810FF708B2009F6B4F = 3AF91D810FF708B2009F6B4F /* PBXTextBookmark */;
- 3AF91D820FF708B2009F6B4F = 3AF91D820FF708B2009F6B4F /* PBXTextBookmark */;
- 3AF91D830FF708B2009F6B4F = 3AF91D830FF708B2009F6B4F /* PBXTextBookmark */;
- 3AF91D880FF70933009F6B4F = 3AF91D880FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D8A0FF70933009F6B4F = 3AF91D8A0FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D8B0FF70933009F6B4F = 3AF91D8B0FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D8C0FF70933009F6B4F = 3AF91D8C0FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D8E0FF70933009F6B4F = 3AF91D8E0FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D900FF70933009F6B4F = 3AF91D900FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D910FF70933009F6B4F = 3AF91D910FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D920FF70933009F6B4F = 3AF91D920FF70933009F6B4F /* PBXTextBookmark */;
- 3AF91D960FF70AD3009F6B4F = 3AF91D960FF70AD3009F6B4F /* PBXTextBookmark */;
- 3AF91D970FF70AD3009F6B4F = 3AF91D970FF70AD3009F6B4F /* PBXTextBookmark */;
- 3AF91D9A0FF711D9009F6B4F = 3AF91D9A0FF711D9009F6B4F /* PBXTextBookmark */;
- 3AF91D9B0FF711D9009F6B4F = 3AF91D9B0FF711D9009F6B4F /* PBXTextBookmark */;
};
sourceControlManager = 3A232C620FB214E900A5C7C2 /* Source Control */;
userBuildSettings = {
@@ -292,22 +195,12 @@
};
08FB7796FE84155DC02AAC07 /* main.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1025, 980}}";
- sepNavSelRange = "{29, 0}";
- sepNavVisRange = "{0, 971}";
+ sepNavIntBoundsRect = "{{0, 0}, {1011, 980}}";
+ sepNavSelRange = "{1666, 0}";
+ sepNavVisRange = "{251, 1399}";
sepNavWindowFrame = "{{199, 162}, {1027, 575}}";
};
};
- 3A09E2E10FED6EEA003FAB0D /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A5B60FB8C45B00B1F47C /* text.c */;
- name = "text.c: 17";
- rLen = 4;
- rLoc = 263;
- rType = 0;
- vrLen = 920;
- vrLoc = 0;
- };
3A09E2E20FED6EEA003FAB0D /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A752B7E0FE6A2B300091C76 /* pns.h */;
@@ -342,7 +235,7 @@
ignoreCount = 0;
lineNumber = 176;
location = codegen;
- modificationTime = 267219111.612896;
+ modificationTime = 267922699.957455;
state = 2;
};
3A13FC1E0FDA5F810051F833 /* supervisor_static_include.h:310 */ = {
@@ -359,7 +252,7 @@
ignoreCount = 0;
lineNumber = 310;
location = codegen;
- modificationTime = 267219111.612992;
+ modificationTime = 267922699.957462;
state = 2;
};
3A13FC220FDA5F970051F833 /* supervisor_static_include.h:303 */ = {
@@ -375,7 +268,7 @@
ignoreCount = 0;
lineNumber = 303;
location = codegen;
- modificationTime = 267219111.613271;
+ modificationTime = 267922699.957612;
state = 2;
};
3A13FC250FDA5FBA0051F833 /* supervisorCompler.c:174 */ = {
@@ -391,7 +284,7 @@
ignoreCount = 0;
lineNumber = 174;
location = codegen;
- modificationTime = 267219111.613516;
+ modificationTime = 267922699.957716;
state = 2;
};
3A13FC660FDA62D90051F833 /* supervisor_static_include.h:326 */ = {
@@ -408,7 +301,7 @@
ignoreCount = 0;
lineNumber = 326;
location = codegen;
- modificationTime = 267219111.613607;
+ modificationTime = 267922699.957726;
state = 2;
};
3A13FC680FDA62DA0051F833 /* supervisor_static_include.h:301 */ = {
@@ -424,7 +317,7 @@
ignoreCount = 0;
lineNumber = 301;
location = codegen;
- modificationTime = 267219111.613867;
+ modificationTime = 267922699.957816;
state = 2;
};
3A13FC750FDA64190051F833 /* supervisor_static_include.h:339 */ = {
@@ -441,7 +334,7 @@
ignoreCount = 0;
lineNumber = 339;
location = codegen;
- modificationTime = 267219111.614107;
+ modificationTime = 267922699.957918;
state = 2;
};
3A13FC780FDA64220051F833 /* supervisor_static_include.h:332 */ = {
@@ -458,7 +351,7 @@
ignoreCount = 0;
lineNumber = 332;
location = codegen;
- modificationTime = 267219111.614566;
+ modificationTime = 267922699.958003;
state = 2;
};
3A13FC800FDA64DC0051F833 /* supervisor_static_include.h:341 */ = {
@@ -475,7 +368,7 @@
ignoreCount = 0;
lineNumber = 341;
location = codegen;
- modificationTime = 267219111.614813;
+ modificationTime = 267922699.958088;
state = 2;
};
3A13FC830FDA66170051F833 /* supervisor_static_include.h:334 */ = {
@@ -491,7 +384,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 334;
- modificationTime = 267219111.768971;
+ modificationTime = 267922700.446616;
state = 0;
};
3A232C5F0FB214C800A5C7C2 /* codegen */ = {
@@ -545,7 +438,7 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1219, 826}}";
sepNavSelRange = "{413, 39}";
- sepNavVisRange = "{110, 958}";
+ sepNavVisRange = "{110, 1028}";
sepNavWindowFrame = "{{-826, 332}, {750, 558}}";
};
};
@@ -554,7 +447,7 @@
fRef = 08FB7796FE84155DC02AAC07 /* main.c */;
name = "main.c: 21";
rLen = 0;
- rLoc = 1000;
+ rLoc = 984;
rType = 0;
vrLen = 437;
vrLoc = 36;
@@ -564,7 +457,7 @@
fRef = 3A232C820FB21E0600A5C7C2 /* codegen.h */;
name = "codegen.h: 10";
rLen = 0;
- rLoc = 276;
+ rLoc = 260;
rType = 0;
vrLen = 312;
vrLoc = 0;
@@ -609,7 +502,7 @@
ignoreCount = 0;
lineNumber = 114;
location = codegen;
- modificationTime = 267219111.612714;
+ modificationTime = 267922699.957433;
state = 2;
};
3A3A77E70FC891BD00DB2D28 /* petriNetSerializer.c:33 */ = {
@@ -626,7 +519,7 @@
ignoreCount = 0;
lineNumber = 33;
location = codegen;
- modificationTime = 267219111.612794;
+ modificationTime = 267922699.95744;
state = 2;
};
3A3A783D0FC894C600DB2D28 /* supervisorCompler.c:116 */ = {
@@ -642,7 +535,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 116;
- modificationTime = 267219111.61281;
+ modificationTime = 267922699.957448;
state = 2;
};
3A4754340FF732AB00EE18BA /* supervisorCompiler.c */ = {
@@ -662,26 +555,6 @@
vrLen = 878;
vrLoc = 85;
};
- 3A4754400FF732C700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A4754340FF732AB00EE18BA /* supervisorCompiler.c */;
- name = "supervisorCompiler.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1330;
- vrLoc = 0;
- };
- 3A4754410FF732C700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A5B60FB8C45B00B1F47C /* text.c */;
- name = "text.c: 17";
- rLen = 4;
- rLoc = 263;
- rType = 0;
- vrLen = 878;
- vrLoc = 85;
- };
3A4754420FF732C700EE18BA /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A4754340FF732AB00EE18BA /* supervisorCompiler.c */;
@@ -692,904 +565,16 @@
vrLen = 1330;
vrLoc = 0;
};
- 3A4754430FF732C700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 08FB7796FE84155DC02AAC07 /* main.c */;
- name = "main.c: 55";
- rLen = 0;
- rLoc = 1682;
- rType = 0;
- vrLen = 1463;
- vrLoc = 0;
- };
- 3A4754460FF732C700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 440";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1282;
- vrLoc = 5612;
- };
3A4754470FF7330D00EE18BA /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 08FB7796FE84155DC02AAC07 /* main.c */;
name = "main.c: 55";
rLen = 0;
- rLoc = 1682;
+ rLoc = 1666;
rType = 0;
vrLen = 1463;
vrLoc = 0;
};
- 3A4754480FF7330D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 08FB7796FE84155DC02AAC07 /* main.c */;
- name = "main.c: 55";
- rLen = 0;
- rLoc = 1682;
- rType = 0;
- vrLen = 1463;
- vrLoc = 0;
- };
- 3A4754490FF7330D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1172;
- vrLoc = 0;
- };
- 3A47544A0FF7330D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 440";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1282;
- vrLoc = 5610;
- };
- 3A47544C0FF7335F00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 477";
- rLen = 0;
- rLoc = 12960;
- rType = 0;
- vrLen = 1134;
- vrLoc = 11656;
- };
- 3A47544D0FF7335F00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 440";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1282;
- vrLoc = 5612;
- };
- 3A47544E0FF7337500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1172;
- vrLoc = 0;
- };
- 3A47544F0FF7337500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 440";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1282;
- vrLoc = 5610;
- };
- 3A4754500FF733C400EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 137";
- rLen = 0;
- rLoc = 3847;
- rType = 0;
- vrLen = 985;
- vrLoc = 2688;
- };
- 3A4754510FF733C400EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 441";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1356;
- vrLoc = 5697;
- };
- 3A4754520FF7340100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 97";
- rLen = 0;
- rLoc = 2767;
- rType = 0;
- vrLen = 1165;
- vrLoc = 2152;
- };
- 3A4754530FF7340100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 441";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1348;
- vrLoc = 5790;
- };
- 3A4754540FF7346300EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 105";
- rLen = 0;
- rLoc = 2986;
- rType = 0;
- vrLen = 1069;
- vrLoc = 1943;
- };
- 3A4754550FF7346300EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 441";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1370;
- vrLoc = 5885;
- };
- 3A4754560FF7347100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 105";
- rLen = 24;
- rLoc = 2962;
- rType = 0;
- vrLen = 1089;
- vrLoc = 1943;
- };
- 3A4754570FF7347100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 441";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1370;
- vrLoc = 5905;
- };
- 3A47545A0FF7348000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 105";
- rLen = 0;
- rLoc = 2961;
- rType = 0;
- vrLen = 1092;
- vrLoc = 1943;
- };
- 3A47545B0FF7348000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 441";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1370;
- vrLoc = 5908;
- };
- 3A47545D0FF734FD00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 179";
- rLen = 0;
- rLoc = 4808;
- rType = 0;
- vrLen = 959;
- vrLoc = 3695;
- };
- 3A47545E0FF734FD00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1249;
- vrLoc = 5821;
- };
- 3A47545F0FF7351000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 169";
- rLen = 0;
- rLoc = 4620;
- rType = 0;
- vrLen = 972;
- vrLoc = 3409;
- };
- 3A4754600FF7351000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5349;
- };
- 3A4754610FF7353C00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 91";
- rLen = 0;
- rLoc = 2517;
- rType = 0;
- vrLen = 1170;
- vrLoc = 2151;
- };
- 3A4754620FF7353C00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1400;
- vrLoc = 5828;
- };
- 3A4754630FF7355500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1174;
- vrLoc = 0;
- };
- 3A4754640FF7355500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5408;
- };
- 3A4754650FF7356E00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 347";
- rLen = 0;
- rLoc = 8924;
- rType = 0;
- vrLen = 1073;
- vrLoc = 7822;
- };
- 3A4754660FF7356E00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5408;
- };
- 3A4754670FF7358300EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1172;
- vrLoc = 0;
- };
- 3A4754680FF7358300EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 451";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5406;
- };
- 3A47546B0FF7361D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- comments = "error: syntax error before ')' token";
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- rLen = 0;
- rLoc = 549;
- rType = 1;
- };
- 3A47546C0FF7361D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 507";
- rLen = 0;
- rLoc = 13866;
- rType = 0;
- vrLen = 1206;
- vrLoc = 11937;
- };
- 3A47546D0FF7361D00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5427;
- };
- 3A47546E0FF7367500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 505";
- rLen = 0;
- rLoc = 13733;
- rType = 0;
- vrLen = 1170;
- vrLoc = 11974;
- };
- 3A47546F0FF7367500EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5427;
- };
- 3A4754700FF736B800EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 520";
- rLen = 0;
- rLoc = 14163;
- rType = 0;
- vrLen = 1205;
- vrLoc = 11974;
- };
- 3A4754710FF736B800EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5427;
- };
- 3A4754720FF7373E00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 509";
- rLen = 0;
- rLoc = 13727;
- rType = 0;
- vrLen = 1171;
- vrLoc = 11889;
- };
- 3A4754730FF7373E00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1283;
- vrLoc = 5427;
- };
- 3A4754740FF7375A00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1114;
- vrLoc = 0;
- };
- 3A4754750FF7375A00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1183;
- vrLoc = 5405;
- };
- 3A4754760FF7379600EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 509";
- rLen = 0;
- rLoc = 13712;
- rType = 0;
- vrLen = 1212;
- vrLoc = 12047;
- };
- 3A4754770FF7379600EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1183;
- vrLoc = 5405;
- };
- 3A4754780FF737DF00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 525";
- rLen = 0;
- rLoc = 14100;
- rType = 0;
- vrLen = 1043;
- vrLoc = 12370;
- };
- 3A4754790FF737DF00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 452";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1183;
- vrLoc = 5405;
- };
- 3A47547A0FF7387000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 74";
- rLen = 0;
- rLoc = 2053;
- rType = 0;
- vrLen = 1258;
- vrLoc = 905;
- };
- 3A47547B0FF7387000EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5532;
- };
- 3A47547C0FF738A200EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 25";
- rLen = 0;
- rLoc = 649;
- rType = 0;
- vrLen = 1112;
- vrLoc = 0;
- };
- 3A47547D0FF738A200EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A47547E0FF738B400EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 513";
- rLen = 0;
- rLoc = 13689;
- rType = 0;
- vrLen = 972;
- vrLoc = 12602;
- };
- 3A47547F0FF738B400EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A4754800FF7393F00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 501";
- rLen = 0;
- rLoc = 13353;
- rType = 0;
- vrLen = 1253;
- vrLoc = 12060;
- };
- 3A4754810FF7393F00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A4754820FF7395900EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 500";
- rLen = 0;
- rLoc = 13327;
- rType = 0;
- vrLen = 1253;
- vrLoc = 12060;
- };
- 3A4754830FF7395900EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A4754840FF7397700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 499";
- rLen = 0;
- rLoc = 13243;
- rType = 0;
- vrLen = 1169;
- vrLoc = 12060;
- };
- 3A4754850FF7397700EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A4754860FF739C800EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 538";
- rLen = 0;
- rLoc = 14064;
- rType = 0;
- vrLen = 970;
- vrLoc = 13013;
- };
- 3A4754870FF739C800EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A4754880FF739FF00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 539";
- rLen = 0;
- rLoc = 14135;
- rType = 0;
- vrLen = 1010;
- vrLoc = 13013;
- };
- 3A4754890FF739FF00EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A47548A0FF73A4100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 546";
- rLen = 0;
- rLoc = 14176;
- rType = 0;
- vrLen = 1012;
- vrLoc = 13013;
- };
- 3A47548B0FF73A4100EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 457";
- rLen = 0;
- rLoc = 11644;
- rType = 0;
- vrLen = 1158;
- vrLoc = 5530;
- };
- 3A47548C0FF73A7600EE18BA /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 497";
- rLen = 0;
- rLoc = 13100;
- rType = 0;
- vrLen = 1157;
- vrLoc = 11900;
- };
- 3A47548D0FF73A7600EE18BA /* PBXTextBookmark */...
[truncated message content] |
|
From: <com...@us...> - 2009-06-28 23:43:11
|
Revision: 119
http://pntool.svn.sourceforge.net/pntool/?rev=119&view=rev
Author: compaqdrew
Date: 2009-06-28 23:43:10 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Working on demo scripting and makefile generation
Added Paths:
-----------
codegen/demo.sh
codegen/src/MakeGen.c
codegen/src/MakeGen.h
Added: codegen/demo.sh
===================================================================
--- codegen/demo.sh (rev 0)
+++ codegen/demo.sh 2009-06-28 23:43:10 UTC (rev 119)
@@ -0,0 +1,6 @@
+echo -e "\033[32mMaking...\033[0m"
+make
+echo -e "\033[32mDone...\033[0m"
+echo -e "\033[32mGenerating code...\033[0m"
+./codegen
+echo -e "\033[32mDone\033[0m"
\ No newline at end of file
Added: codegen/src/MakeGen.c
===================================================================
--- codegen/src/MakeGen.c (rev 0)
+++ codegen/src/MakeGen.c 2009-06-28 23:43:10 UTC (rev 119)
@@ -0,0 +1,55 @@
+/*
+ * MakeGen.c
+ * codegen
+ *
+ * Created by Drew on 6/28/09.
+ * Copyright 2009 __MyCompanyName__. All rights reserved.
+ *
+ */
+
+#include "MakeGen.h"
+
+void makeTarget(char* VARIABLE_NAME,FILE* makefile)
+{
+ fprintf(makefile, VARIABLE_NAME);
+ fprintf(makefile," : $(");
+ fprintf(makefile,VARIABLE_NAME);
+ fprintf(makefile,")\n");
+ fprintf(makefile,"\t$(COMPILER) $(");
+ fprintf(makefile,VARIABLE_NAME);
+ fprintf(makefile,")\n");
+}
+void makeMake(char* sname, process** prarray, int num)
+{
+ FILE* makefile = fopen("compiled.Makefile", "w");
+ fprintf(makefile,"#Generated by codegen\n");
+ //objs
+ fprintf(makefile,"SUPERVISOR = src/");
+ //strip the c off the sname
+ char buffer[255];
+ buffer[0] = 0;
+ strcat(buffer,sname);
+ buffer[strlen(buffer)-1]=0;
+ strcat(buffer,"o\n");
+ fprintf(makefile,buffer);
+ //similarly, loop through the plants
+ int i;
+ for(i = 0; i < num; i++)
+ {
+ fprintf(makefile,"PLANT");
+ char intbuffer[10];
+ intbuffer[0]=0;
+ sprintf(intbuffer,"%d",i);
+ fprintf(makefile,intbuffer);
+ fprintf(makefile," = ");
+ buffer[0]=0;
+ strcat(buffer,prarray[i]->name);
+ buffer[strlen(buffer)-1]=0;
+ strcat(buffer,"o\n");
+ fprintf(makefile,buffer);
+ }
+ fprintf(makefile,"COMPILER = gcc -g\n");
+
+ //now do the targets
+ makeTarget("SUPERVISOR",makefile);
+}
\ No newline at end of file
Added: codegen/src/MakeGen.h
===================================================================
--- codegen/src/MakeGen.h (rev 0)
+++ codegen/src/MakeGen.h 2009-06-28 23:43:10 UTC (rev 119)
@@ -0,0 +1,10 @@
+/*
+ * MakeGen.h
+ * codegen
+ *
+ * Created by Drew on 6/28/09.
+ * Copyright 2009 __MyCompanyName__. All rights reserved.
+ *
+ */
+#include "pns.h"
+void makeMake(char* sname, process** prarray, int num);
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
