diff -Nru zimpl-3.3.2/CHANGELOG zimpl-3.3.4/CHANGELOG --- zimpl-3.3.2/CHANGELOG 2014-02-28 10:38:39.884618742 +0000 +++ zimpl-3.3.4/CHANGELOG 2017-03-07 17:20:10.000000000 +0000 @@ -1,3 +1,21 @@ +3.3.4 8. Mar 2017 Release + + - added cppcheck target to makefile + + - scan-build make OPT=dbg works + + - Corrected the spacing of the NAME field in MPS output. + + - Fixed bug in library call regarding setting + the random seed by arguments. + + - Fixed two bugs in the examples of the documentation + found by Maximilian Ernestus + +3.3.3 1. Jul 2015 Release + + - Added Windows Makefile. + 3.3.2 27. Feb 2014 Release - All -O6 changed to -O3 in submakefiles. diff -Nru zimpl-3.3.2/check/bool.zpl zimpl-3.3.4/check/bool.zpl --- zimpl-3.3.2/check/bool.zpl 2010-06-10 19:42:40.000000000 +0000 +++ zimpl-3.3.4/check/bool.zpl 2017-03-07 17:20:10.000000000 +0000 @@ -8,7 +8,7 @@ #* */ #* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #* -#* Copyright (C) 2001-2006 by Thorsten Koch +#* Copyright (C) 2001-2017 by Thorsten Koch #* #* This program is free software; you can redistribute it and/or #* modify it under the terms of the GNU General Public License diff -Nru zimpl-3.3.2/check/check.sh zimpl-3.3.4/check/check.sh --- zimpl-3.3.2/check/check.sh 2011-10-25 08:18:01.000000000 +0000 +++ zimpl-3.3.4/check/check.sh 2017-03-07 17:20:10.000000000 +0000 @@ -172,7 +172,7 @@ COUNT=`expr $COUNT + 1` NAME=`basename $i .zpl` ../$1 -v0 $i 2>$NAME.err - diff $NAME.err $NAME.err.ref >/dev/null + fgrep -v "Aborted (core dumped)" $NAME.err | diff - $NAME.err.ref >/dev/null case $? in 0) echo Test $i "(err)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test $i "(err)" FAIL ;; @@ -189,7 +189,7 @@ NAME=`basename $i .zpl` # DIFFOPT=`awk -f ../exdiffopt.awk $NAME.err.ref` ../$1 -v0 $i 2>$NAME.err - diff $NAME.err $NAME.err.ref >/dev/null + fgrep -v "Aborted (core dumped)" $NAME.err | diff - $NAME.err.ref >/dev/null case $? in 0) echo Test $i "(err)" OK;; 1) echo Test $i "(err)" FAIL "(ignored)";; diff -Nru zimpl-3.3.2/check/define.zpl zimpl-3.3.4/check/define.zpl --- zimpl-3.3.2/check/define.zpl 2010-06-10 19:42:40.000000000 +0000 +++ zimpl-3.3.4/check/define.zpl 2017-03-07 17:20:10.000000000 +0000 @@ -8,7 +8,7 @@ #* */ #* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #* -#* Copyright (C) 2001-2006 by Thorsten Koch +#* Copyright (C) 2001-2017 by Thorsten Koch #* #* This program is free software; you can redistribute it and/or #* modify it under the terms of the GNU General Public License diff -Nru zimpl-3.3.2/check/errors/e700_1.err.ref zimpl-3.3.4/check/errors/e700_1.err.ref --- zimpl-3.3.2/check/errors/e700_1.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e700_1.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 700: log(): Numerical result out of range +*** Error 700: log(0.000000): Numerical result out of range *** File: e700_1.zpl Line 2 *** param x := log(0); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e700_2.err.ref zimpl-3.3.4/check/errors/e700_2.err.ref --- zimpl-3.3.2/check/errors/e700_2.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e700_2.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 700: log(): Numerical argument out of domain +*** Error 700: log(-1.000000): Numerical argument out of domain *** File: e700_2.zpl Line 2 *** param x := log(-1); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e700_3.err.ref zimpl-3.3.4/check/errors/e700_3.err.ref --- zimpl-3.3.2/check/errors/e700_3.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e700_3.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 700: log(): Numerical result out of range +*** Error 700: log(0.000000): Numerical result out of range *** File: e700_3.zpl Line 2 *** param x := log(1/10^400); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e701.err.ref zimpl-3.3.4/check/errors/e701.err.ref --- zimpl-3.3.2/check/errors/e701.err.ref 2003-09-28 11:08:56.000000000 +0000 +++ zimpl-3.3.4/check/errors/e701.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 701: sqrt(): Numerical argument out of domain +*** Error 701: sqrt(-1.000000): Numerical argument out of domain *** File: e701.zpl Line 2 *** param x := sqrt(-1); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e702_1.err.ref zimpl-3.3.4/check/errors/e702_1.err.ref --- zimpl-3.3.2/check/errors/e702_1.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e702_1.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 702: ln(): Numerical result out of range +*** Error 702: ln(0.000000): Numerical result out of range *** File: e702_1.zpl Line 2 *** param x := ln(0); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e702_2.err.ref zimpl-3.3.4/check/errors/e702_2.err.ref --- zimpl-3.3.2/check/errors/e702_2.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e702_2.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 702: ln(): Numerical argument out of domain +*** Error 702: ln(-1.000000): Numerical argument out of domain *** File: e702_2.zpl Line 2 *** param x := ln(-1); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e702_3.err.ref zimpl-3.3.4/check/errors/e702_3.err.ref --- zimpl-3.3.2/check/errors/e702_3.err.ref 2003-09-27 11:57:01.000000000 +0000 +++ zimpl-3.3.4/check/errors/e702_3.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,4 @@ -*** Error 702: ln(): Numerical result out of range +*** Error 702: ln(0.000000): Numerical result out of range *** File: e702_3.zpl Line 2 *** param x := ln(1/10^400); *** ^^^ diff -Nru zimpl-3.3.2/check/errors/e800.err.ref zimpl-3.3.4/check/errors/e800.err.ref --- zimpl-3.3.2/check/errors/e800.err.ref 2003-09-09 10:50:46.000000000 +0000 +++ zimpl-3.3.4/check/errors/e800.err.ref 2017-03-07 17:20:10.000000000 +0000 @@ -1,3 +1,3 @@ -*** Error 800: File e800.zpl Line 2 : parse error, expecting `ASGN' or `'['' +*** Error 800: File e800.zpl Line 2 : syntax error, unexpected $undefined, expecting ASGN or '[' *** param x = 5; *** ^^^ diff -Nru zimpl-3.3.2/check/presol.mps.ref zimpl-3.3.4/check/presol.mps.ref --- zimpl-3.3.2/check/presol.mps.ref 2011-10-25 08:18:01.000000000 +0000 +++ zimpl-3.3.4/check/presol.mps.ref 2017-03-07 17:20:10.000000000 +0000 @@ -15,7 +15,7 @@ * subto c8: forall in I with i mod 2 == 1: -3 * w[i] == -3; * subto c9: w[2] >= 2; * subto c10: w[4] <= 2; -NAME presol.z +NAME presol.z ROWS N OBJECTIV L c1 diff -Nru zimpl-3.3.2/debian/changelog zimpl-3.3.4/debian/changelog --- zimpl-3.3.2/debian/changelog 2014-05-18 14:35:45.000000000 +0000 +++ zimpl-3.3.4/debian/changelog 2017-07-09 17:06:11.000000000 +0000 @@ -1,3 +1,19 @@ +zimpl (3.3.4-2) unstable; urgency=medium + + * Upload to unstable. + * Update Standards-Version to 4.0.0 (no changes needed). + + -- Joachim Reichel Sun, 09 Jul 2017 19:06:11 +0200 + +zimpl (3.3.4-1) experimental; urgency=medium + + * New upstream release. + * Fix BSD 3-clause license name in debian/copyright. + * Add "export DEB_BUILD_MAINT_OPTIONS = hardening=+all" to debian/rules. + * Update Standards-Version to 3.9.8 (no changes needed). + + -- Joachim Reichel Fri, 07 Apr 2017 21:37:37 +0200 + zimpl (3.3.2-1) unstable; urgency=medium * New upstream release. diff -Nru zimpl-3.3.2/debian/control zimpl-3.3.4/debian/control --- zimpl-3.3.2/debian/control 2014-05-18 14:35:24.000000000 +0000 +++ zimpl-3.3.4/debian/control 2017-07-09 17:06:11.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Joachim Reichel Build-Depends: debhelper (>= 9), libgmp-dev, zlib1g-dev, bison, flex -Standards-Version: 3.9.5 +Standards-Version: 4.0.0 Homepage: http://zimpl.zib.de/ Package: zimpl diff -Nru zimpl-3.3.2/debian/copyright zimpl-3.3.4/debian/copyright --- zimpl-3.3.2/debian/copyright 2012-06-10 12:51:07.000000000 +0000 +++ zimpl-3.3.4/debian/copyright 2017-04-07 20:05:11.000000000 +0000 @@ -14,7 +14,7 @@ Files: src/random.c src/numbdbl.c Copyright: 1997 - 2002, Makoto Matsumoto and Takuji Nishimura 2001-2010 Thorsten Koch -License: BSD 3-clause +License: BSD-3-clause Files: debian/* Copyright: 2006-2011 Joachim Reichel @@ -70,7 +70,7 @@ License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. -License: BSD 3-clause +License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -Nru zimpl-3.3.2/debian/patches/adapt-build-system zimpl-3.3.4/debian/patches/adapt-build-system --- zimpl-3.3.2/debian/patches/adapt-build-system 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/debian/patches/adapt-build-system 2017-04-07 20:23:18.000000000 +0000 @@ -0,0 +1,141 @@ +Author: Joachim Reichel +Description: Fix build system to work with debian/rules. +Fail if not all tests pass. +Index: zimpl-3.3.4/Makefile +=================================================================== +--- zimpl-3.3.4.orig/Makefile ++++ zimpl-3.3.4/Makefile +@@ -55,9 +55,11 @@ ZLIB = true + LINK = static + OPT = opt + COMP = gnu ++ifndef + CC = gcc ++endif + CC_o = -o +-LINKCC = gcc ++LINKCC = $(CC) + LINKCC_o = -o #the white space is important + LIBEXT = .a + YACC = bison +@@ -76,9 +78,10 @@ SRCDIR = src + BINDIR = bin + LIBDIR = lib + +-CPPFLAGS = -I$(SRCDIR) -DVERSION='"$(VERSION)"' +-CFLAGS = -O +-LDFLAGS = -lgmp -lm ++CPPFLAGS += -I$(SRCDIR) -DVERSION='"$(VERSION)"' ++CPPFLAGS += -DNO_MSHELL -D__NO_MATH_INLINES -DNDEBUG ++CFLAGS += -O3 ++LDFLAGS += -lgmp -lz -lm + YFLAGS = -d -t -v + LFLAGS = -d + ARFLAGS = +@@ -103,7 +106,7 @@ LINK = static + endif + + BASE = $(OSTYPE).$(ARCH).$(COMP).$(OPT) +-OBJDIR = obj/O.$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) ++OBJDIR = obj + NAME = zimpl + BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) + LIBNAME = $(NAME)-$(VERSION).$(BASE) +@@ -140,10 +143,10 @@ OBJSRC = $(addprefix $(SRCDIR)/,$(OBJEC + LIBSRC = $(addprefix $(SRCDIR)/,$(LIBOBJ:.o=.c)) #(SRCDIR)/numbdbl.c + + #----------------------------------------------------------------------------- +-include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT) +--include make/local/make.$(HOSTNAME) +--include make/local/make.$(HOSTNAME).$(COMP) +--include make/local/make.$(HOSTNAME).$(COMP).$(OPT) ++#include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT) ++#-include make/local/make.$(HOSTNAME) ++#-include make/local/make.$(HOSTNAME).$(COMP) ++#-include make/local/make.$(HOSTNAME).$(COMP).$(OPT) + #----------------------------------------------------------------------------- + + FLAGS += $(USRFLAGS) +@@ -174,19 +177,16 @@ $(BINLINK) $(BINSHORTLINK): $(BINARY) + cd $(dir $@) && ln -s $(notdir $(BINARY)) $(notdir $@) + + $(BINARY): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARY) +- @echo "-> linking $@" + ifeq ($(COMP), msvc) + $(LINKCC) $(CFLAGS) $(OBJXXX) $(LIBRARY) $(LDFLAGS) $(LINKCC_o)$@ + else + $(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) $(LINKCC_o)$@ + endif + + $(BINARYDBL): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARYDBL) +- @echo "-> linking $@" + $(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) $(CC_o)$@ + + $(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBXXX) +- @echo "-> generating library $@" + -rm -f $(LIBRARY) + $(AR) $(AR_o)$@ $(LIBXXX) $(ARFLAGS) + ifneq ($(RANLIB),) +@@ -196,17 +197,14 @@ endif + libdbl: $(LIBRARYDBL) $(LIBDBLLINK) + + $(LIBRARYDBL): $(OBJDIR) $(LIBDIR) $(LIBDBLXXX) +- @echo "-> generating library $@" + -rm -f $(LIBRARYDBL) + $(AR) $@ $(LIBDBLXXX) $(ARFLAGS) + $(RANLIB) $@ + + $(SRCDIR)/mmlparse2.c: $(SRCDIR)/mmlparse2.y $(SRCDIR)/mme.h +- @echo "-> generating yacc parser $@" + $(YACC) $(YFLAGS) -o $@ $< + + $(SRCDIR)/mmlscan.c: $(SRCDIR)/mmlscan.l $(SRCDIR)/mme.h +- @echo "-> generating lex scanner $@" + $(LEX) $(LFLAGS) -o$@ $< + + lint: $(OBJSRC) $(LIBSRC) +@@ -241,19 +239,16 @@ coverage: + -rm gcov/z.capture + + $(OBJDIR): +- @echo "** creating directory \"$@\"" +- @-mkdir -p $(OBJDIR) ++ -mkdir -p $(OBJDIR) + + $(LIBDIR): +- @echo "** creating directory \"$@\"" +- @-mkdir -p $(LIBDIR) ++ -mkdir -p $(LIBDIR) + + $(BINDIR): +- @echo "** creating directory \"$@\"" +- @-mkdir -p $(BINDIR) ++ -mkdir -p $(BINDIR) + + clean: +- -rm -rf $(OBJDIR)/* $(BINARY) $(LIBRARY) $(LIBRARYDBL) $(LIBLINK) $(BINLINK) $(BINSHORTLINK) ++ -rm -rf $(OBJDIR) $(BINDIR) $(LIBDIR) + + depend: + $(SHELL) -ec '$(DCC) $(DFLAGS) $(CPPFLAGS) $(OBJSRC) $(LIBSRC) \ +@@ -263,7 +258,6 @@ depend: + -include $(DEPEND) + + $(OBJDIR)/%.o: $(SRCDIR)/%.c +- @echo "-> compiling $@" + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(CC_o)$@ + + # --- EOF --------------------------------------------------------------------- +Index: zimpl-3.3.4/check/check.sh +=================================================================== +--- zimpl-3.3.4.orig/check/check.sh ++++ zimpl-3.3.4/check/check.sh +@@ -199,7 +199,7 @@ do + done 2>/dev/null + + if [ $PASS -eq $COUNT ] ; then echo All $PASS tests passed; +-else echo FAILURE! Only $PASS of $COUNT tests passed; ++else echo FAILURE! Only $PASS of $COUNT tests passed; exit 1; + fi + + diff -Nru zimpl-3.3.2/debian/patches/adapt-build-system.patch zimpl-3.3.4/debian/patches/adapt-build-system.patch --- zimpl-3.3.2/debian/patches/adapt-build-system.patch 2014-05-18 14:30:53.000000000 +0000 +++ zimpl-3.3.4/debian/patches/adapt-build-system.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -Author: Joachim Reichel -Description: Fix build system to work with debian/rules. -Fail if not all tests pass. -Index: zimpl-3.3.2/Makefile -=================================================================== ---- zimpl-3.3.2.orig/Makefile -+++ zimpl-3.3.2/Makefile -@@ -56,7 +56,9 @@ ZLIB = true - LINK = normal - OPT = opt - COMP = gnu -+ifndef CC - CC = gcc -+endif - YACC = bison - LEX = flex - DCC = gcc -@@ -71,9 +73,10 @@ SRCDIR = src - BINDIR = bin - LIBDIR = lib - --CPPFLAGS = -I$(SRCDIR) -DVERSION='"$(VERSION)"' --CFLAGS = -O --LDFLAGS = -lgmp -lm -+CPPFLAGS += -I$(SRCDIR) -DVERSION='"$(VERSION)"' -+CPPFLAGS += -DNO_MSHELL -D__NO_MATH_INLINES -DNDEBUG -+CFLAGS += -O3 -+LDFLAGS += -lgmp -lz -lm - YFLAGS = -d -t -v - LFLAGS = -d - ARFLAGS = -@@ -98,7 +101,7 @@ LINK = static - endif - - BASE = $(OSTYPE).$(ARCH).$(COMP).$(OPT) --OBJDIR = obj/O.$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) -+OBJDIR = obj - NAME = zimpl - BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) - LIBNAME = $(NAME)-$(VERSION).$(BASE) -@@ -133,10 +136,10 @@ OBJSRC = $(addprefix $(SRCDIR)/,$(OBJEC - LIBSRC = $(addprefix $(SRCDIR)/,$(LIBOBJ:.o=.c)) #(SRCDIR)/numbdbl.c - - #----------------------------------------------------------------------------- --include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT) ---include make/local/make.$(HOSTNAME) ---include make/local/make.$(HOSTNAME).$(COMP) ---include make/local/make.$(HOSTNAME).$(COMP).$(OPT) -+#include make/make.$(OSTYPE).$(ARCH).$(COMP).$(OPT) -+#-include make/local/make.$(HOSTNAME) -+#-include make/local/make.$(HOSTNAME).$(COMP) -+#-include make/local/make.$(HOSTNAME).$(COMP).$(OPT) - #----------------------------------------------------------------------------- - - FLAGS += $(USRFLAGS) -@@ -167,15 +170,12 @@ $(BINLINK) $(BINSHORTLINK): $(BINARY) - cd $(dir $@) && ln -s $(notdir $(BINARY)) $(notdir $@) - - $(BINARY): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARY) -- @echo "-> linking $@" - $(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) -o $@ - - $(BINARYDBL): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARYDBL) -- @echo "-> linking $@" - $(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) -o $@ - - $(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBXXX) -- @echo "-> generating library $@" - -rm -f $(LIBRARY) - $(AR) $@ $(LIBXXX) $(ARFLAGS) - $(RANLIB) $@ -@@ -183,17 +183,14 @@ $(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBXXX - libdbl: $(LIBRARYDBL) $(LIBDBLLINK) - - $(LIBRARYDBL): $(OBJDIR) $(LIBDIR) $(LIBDBLXXX) -- @echo "-> generating library $@" - -rm -f $(LIBRARYDBL) - $(AR) $@ $(LIBDBLXXX) $(ARFLAGS) - $(RANLIB) $@ - - $(SRCDIR)/mmlparse2.c: $(SRCDIR)/mmlparse2.y $(SRCDIR)/mme.h -- @echo "-> generating yacc parser $@" - $(YACC) $(YFLAGS) -o $@ $< - - $(SRCDIR)/mmlscan.c: $(SRCDIR)/mmlscan.l $(SRCDIR)/mme.h -- @echo "-> generating lex scanner $@" - $(LEX) $(LFLAGS) -o$@ $< - - lint: $(OBJSRC) $(LIBSRC) -@@ -225,19 +222,16 @@ coverage: - -rm gcov/z.capture - - $(OBJDIR): -- @echo "** creating directory \"$@\"" -- @-mkdir -p $(OBJDIR) -+ -mkdir -p $(OBJDIR) - - $(LIBDIR): -- @echo "** creating directory \"$@\"" -- @-mkdir -p $(LIBDIR) -+ -mkdir -p $(LIBDIR) - - $(BINDIR): -- @echo "** creating directory \"$@\"" -- @-mkdir -p $(BINDIR) -+ -mkdir -p $(BINDIR) - - clean: -- -rm -rf $(OBJDIR)/* $(BINARY) $(LIBRARY) $(LIBRARYDBL) $(LIBLINK) $(BINLINK) $(BINSHORTLINK) -+ -rm -rf $(OBJDIR) $(BINDIR) $(LIBDIR) - - depend: - $(SHELL) -ec '$(DCC) $(DFLAGS) $(CPPFLAGS) $(OBJSRC) $(LIBSRC) \ -@@ -247,7 +241,6 @@ depend: - -include $(DEPEND) - - $(OBJDIR)/%.o: $(SRCDIR)/%.c -- @echo "-> compiling $@" - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - - # --- EOF --------------------------------------------------------------------- -Index: zimpl-3.3.2/check/check.sh -=================================================================== ---- zimpl-3.3.2.orig/check/check.sh -+++ zimpl-3.3.2/check/check.sh -@@ -198,10 +198,12 @@ do - rm $NAME.err - done 2>/dev/null - --if [ $PASS -eq $COUNT ] ; then echo All $PASS tests passed; --else echo FAILURE! Only $PASS of $COUNT tests passed; -+if [ $PASS -ne $COUNT ] ; then -+ echo FAILURE! Only $PASS of $COUNT tests passed -+ exit 1 - fi - -+echo All $PASS tests passed - - - diff -Nru zimpl-3.3.2/debian/patches/display-test-failures zimpl-3.3.4/debian/patches/display-test-failures --- zimpl-3.3.2/debian/patches/display-test-failures 2011-11-13 12:49:28.000000000 +0000 +++ zimpl-3.3.4/debian/patches/display-test-failures 2017-04-07 19:58:18.000000000 +0000 @@ -1,8 +1,10 @@ Author: Joachim Reichel Description: Display diffs for failing unit tests. ---- a/check/check.sh -+++ b/check/check.sh -@@ -32,14 +32,14 @@ +Index: zimpl-3.3.4/check/check.sh +=================================================================== +--- zimpl-3.3.4.orig/check/check.sh ++++ zimpl-3.3.4/check/check.sh +@@ -32,14 +32,14 @@ for i in expr param set subto condit var do COUNT=`expr $COUNT + 1` $1 -v0 $i.zpl @@ -19,7 +21,7 @@ case $? in 0) echo Test $i "(tbl)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test $i "(tbl)" FAIL ;; -@@ -51,28 +51,28 @@ +@@ -51,28 +51,28 @@ for i in presol do COUNT=`expr $COUNT + 1` $1 -v0 -Distart=5 -t mps -r -m -n cm $i.zpl @@ -52,7 +54,7 @@ case $? in 0) echo Test $i "(ord)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test $i "(ord)" FAIL ;; -@@ -83,7 +83,7 @@ +@@ -83,7 +83,7 @@ done # COUNT=`expr $COUNT + 1` $1 -v0 -Distart=4 -t hum -n cf presol.zpl @@ -61,7 +63,7 @@ case $? in 0) echo Test presol.zpl "(hum)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test presol.zpl "(hum)" FAIL ;; -@@ -93,7 +93,7 @@ +@@ -93,7 +93,7 @@ done # COUNT=`expr $COUNT + 1` $1 -v0 print.zpl >print.out @@ -70,7 +72,7 @@ case $? in 0) echo Test print.zpl "(out)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test print.zpl "(out)" FAIL ;; -@@ -104,7 +104,7 @@ +@@ -104,7 +104,7 @@ done # COUNT=`expr $COUNT + 1` $1 -v0 -t pip minlp.zpl @@ -79,7 +81,7 @@ case $? in 0) echo Test minlp.zpl "(pip)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test minlp.zpl "(pip)" FAIL ;; -@@ -115,14 +115,14 @@ +@@ -115,14 +115,14 @@ done # $1 -v0 -Dcities=5 -o metaio @selftest_tspste.zpl >metaio.out COUNT=`expr $COUNT + 1` @@ -96,7 +98,7 @@ case $? in 0) echo Test metaio "(out)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test metaio "(out)" FAIL ;; -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ do COUNT=`expr $COUNT + 1` NAME=`basename $i .zpl` ../$1 $i 2>$NAME.warn >/dev/null @@ -105,7 +107,7 @@ case $? in 0) echo Test $i "(warn)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test $i "(warn)" FAIL ;; -@@ -150,13 +150,13 @@ +@@ -150,13 +150,13 @@ done 2>/dev/null COUNT=`expr $COUNT + 2` NAME=w215 ../$1 -m $NAME 2>$NAME.warn >/dev/null @@ -121,12 +123,3 @@ case $? in 0) echo Test $NAME "-2 (warn)" OK; PASS=`expr $PASS + 1` ;; 1) echo Test $NAME "-2 (warn)" FAIL ;; -@@ -172,7 +172,7 @@ - COUNT=`expr $COUNT + 1` - NAME=`basename $i .zpl` - ../$1 -v0 $i 2>$NAME.err -- diff $NAME.err $NAME.err.ref >/dev/null -+ diff -u $NAME.err $NAME.err.ref - case $? in - 0) echo Test $i "(err)" OK; PASS=`expr $PASS + 1` ;; - 1) echo Test $i "(err)" FAIL ;; diff -Nru zimpl-3.3.2/debian/patches/fix-typos-in-manpage zimpl-3.3.4/debian/patches/fix-typos-in-manpage --- zimpl-3.3.2/debian/patches/fix-typos-in-manpage 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/debian/patches/fix-typos-in-manpage 2011-11-13 13:32:07.000000000 +0000 @@ -0,0 +1,47 @@ +Author: Joachim Reichel +Description: Fix encoding errors in manpage. +--- a/doc/zimpl.man ++++ b/doc/zimpl.man +@@ -73,20 +73,20 @@ + .I name + to the specified value. This is equivalent with having this line in the + Zimpl program: param name:=val . +-.IP -f ++.IP \-f + Enable + .BR flex (1) + debugging output. + .IP "\-F filter" + The output is piped through a filter. A %s in the + string is replaced by the output filename. For example: +--F "gzip \-c >%s.gz" would compress all the ++\-F "gzip \-c >%s.gz" would compress all the + output files. +-.IP -h ++.IP \-h + Show program help. + .IP "\-l length" + Sets the maximum length for variable names in LPF output files. +-.IP -m ++.IP \-m + Write a CPLEX .mst Mip STart file. + .IP "\-n cm|cn|cf" + Select the format for the generation of constraint +@@ -102,7 +102,7 @@ + then a 1 .. n number like in + .I cm + and then append all the local variables from the forall statements. +-.IP "-o outfile" ++.IP "\-o outfile" + Sets the base-name for the output files. Default is the name of the + input file without extension. + .IP \-O +@@ -110,7 +110,7 @@ + .IP "\-P filter" + The input is piped through a filter. A %s in the + string is replaced by the input filename. For example: +-\-F "cpp -DWITH_C1 %s" would pass the input file through the ++\-F "cpp \-DWITH_C1 %s" would pass the input file through the + C-preprocessor. + .IP \-r + Write a CPLEX .ord branching order file. diff -Nru zimpl-3.3.2/debian/patches/fix-typos-in-manpage.patch zimpl-3.3.4/debian/patches/fix-typos-in-manpage.patch --- zimpl-3.3.2/debian/patches/fix-typos-in-manpage.patch 2011-11-13 13:32:07.000000000 +0000 +++ zimpl-3.3.4/debian/patches/fix-typos-in-manpage.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -Author: Joachim Reichel -Description: Fix encoding errors in manpage. ---- a/doc/zimpl.man -+++ b/doc/zimpl.man -@@ -73,20 +73,20 @@ - .I name - to the specified value. This is equivalent with having this line in the - Zimpl program: param name:=val . --.IP -f -+.IP \-f - Enable - .BR flex (1) - debugging output. - .IP "\-F filter" - The output is piped through a filter. A %s in the - string is replaced by the output filename. For example: ---F "gzip \-c >%s.gz" would compress all the -+\-F "gzip \-c >%s.gz" would compress all the - output files. --.IP -h -+.IP \-h - Show program help. - .IP "\-l length" - Sets the maximum length for variable names in LPF output files. --.IP -m -+.IP \-m - Write a CPLEX .mst Mip STart file. - .IP "\-n cm|cn|cf" - Select the format for the generation of constraint -@@ -102,7 +102,7 @@ - then a 1 .. n number like in - .I cm - and then append all the local variables from the forall statements. --.IP "-o outfile" -+.IP "\-o outfile" - Sets the base-name for the output files. Default is the name of the - input file without extension. - .IP \-O -@@ -110,7 +110,7 @@ - .IP "\-P filter" - The input is piped through a filter. A %s in the - string is replaced by the input filename. For example: --\-F "cpp -DWITH_C1 %s" would pass the input file through the -+\-F "cpp \-DWITH_C1 %s" would pass the input file through the - C-preprocessor. - .IP \-r - Write a CPLEX .ord branching order file. diff -Nru zimpl-3.3.2/debian/patches/series zimpl-3.3.4/debian/patches/series --- zimpl-3.3.2/debian/patches/series 2014-05-18 14:27:39.000000000 +0000 +++ zimpl-3.3.4/debian/patches/series 2017-04-07 19:57:30.000000000 +0000 @@ -1,4 +1,3 @@ -adapt-build-system.patch +adapt-build-system display-test-failures -fix-typos-in-manpage.patch -#fix-format-security-error.patch +fix-typos-in-manpage diff -Nru zimpl-3.3.2/debian/rules zimpl-3.3.4/debian/rules --- zimpl-3.3.2/debian/rules 2013-04-14 17:39:04.000000000 +0000 +++ zimpl-3.3.4/debian/rules 2017-04-07 20:21:35.000000000 +0000 @@ -2,6 +2,8 @@ # export DH_VERBOSE=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: dh $@ Binary files /tmp/tmpgHLj1k/K0HhEtWohx/zimpl-3.3.2/doc/zimpl.pdf and /tmp/tmpgHLj1k/8aPc06XgzU/zimpl-3.3.4/doc/zimpl.pdf differ diff -Nru zimpl-3.3.2/make/make.cygwin.x86_64.gnu.dbg zimpl-3.3.4/make/make.cygwin.x86_64.gnu.dbg --- zimpl-3.3.2/make/make.cygwin.x86_64.gnu.dbg 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.cygwin.x86_64.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,9 @@ +#--- $Id: make.cygwin.x86.gnu.dbg,v 1.9 2014/01/12 11:07:04 bzfkocht Exp $ +CPPFLAGS += -DWINDOWS -DFREEMEM -D__NO_MATH_INLINES +CFLAGS = -O -g $(GCCWARN) +LDFLAGS = -lgmp -lm -static + +ifeq ($(ZLIB),true) +LDFLAGS += -lz +endif + diff -Nru zimpl-3.3.2/make/make.cygwin.x86_64.gnu.opt zimpl-3.3.4/make/make.cygwin.x86_64.gnu.opt --- zimpl-3.3.2/make/make.cygwin.x86_64.gnu.opt 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.cygwin.x86_64.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,9 @@ +#--- $Id: make.cygwin.x86.gnu.opt,v 1.9 2014/01/12 11:07:04 bzfkocht Exp $ +CPPFLAGS += -DWINDOWS -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES +CFLAGS = -O3 -march=pentiumpro $(GCCWARN) +LDFLAGS = -lgmp -lm -static + +ifeq ($(ZLIB),true) +LDFLAGS += -lz +endif + diff -Nru zimpl-3.3.2/make/make.darwin.ppc.gnu.opt zimpl-3.3.4/make/make.darwin.ppc.gnu.opt --- zimpl-3.3.2/make/make.darwin.ppc.gnu.opt 2014-02-03 13:30:58.365215311 +0000 +++ zimpl-3.3.4/make/make.darwin.ppc.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,4 @@ -#--- $Id: make.darwin.ppc.gnu.opt,v 1.6 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.darwin.ppc.gnu.opt,v 1.7 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES CFLAGS = -O3 LDFLAGS = -Bstatic -lgmp -lm diff -Nru zimpl-3.3.2/make/make.darwin.x86_64.clang.dbg zimpl-3.3.4/make/make.darwin.x86_64.clang.dbg --- zimpl-3.3.2/make/make.darwin.x86_64.clang.dbg 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.darwin.x86_64.clang.dbg 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DFREEMEM -D__NO_MATH_INLINES -CFLAGS = -O0 -m64 -g -fident $(GCCWARN) -LDFLAGS = -lgmp -lm - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS = -static -lgmp -lm -endif - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif diff -Nru zimpl-3.3.2/make/make.darwin.x86_64.clang.opt zimpl-3.3.4/make/make.darwin.x86_64.clang.opt --- zimpl-3.3.2/make/make.darwin.x86_64.clang.opt 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.darwin.x86_64.clang.opt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -CFLAGS += -O3 -m64 -LDFLAGS = -lgmp -lm - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS = -static -lgmp -lm -endif - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif diff -Nru zimpl-3.3.2/make/make.darwin.x86_64.gnu.dbg zimpl-3.3.4/make/make.darwin.x86_64.gnu.dbg --- zimpl-3.3.2/make/make.darwin.x86_64.gnu.dbg 2014-02-03 13:27:19.609994312 +0000 +++ zimpl-3.3.4/make/make.darwin.x86_64.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -4,17 +4,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS = -Bstatic -lgmp -lm -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.darwin.x86_64.gnu.opt zimpl-3.3.4/make/make.darwin.x86_64.gnu.opt --- zimpl-3.3.2/make/make.darwin.x86_64.gnu.opt 2014-02-03 13:31:14.974687408 +0000 +++ zimpl-3.3.4/make/make.darwin.x86_64.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,20 +1,20 @@ -#--- $Id: make.darwin.x86_64.gnu.opt,v 1.7 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.darwin.x86_64.gnu.opt,v 1.8 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES CFLAGS += -O3 -m64 LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS = -Bstatic -lgmp -lm -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.darwin.x86.clang.dbg zimpl-3.3.4/make/make.darwin.x86.clang.dbg --- zimpl-3.3.2/make/make.darwin.x86.clang.dbg 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.darwin.x86.clang.dbg 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DFREEMEM -D__NO_MATH_INLINES -CFLAGS = -O0 -m32 -g -fident $(GCCWARN) -LDFLAGS = -lgmp -lm - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS = -static -lgmp -lm -endif - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif diff -Nru zimpl-3.3.2/make/make.darwin.x86.clang.opt zimpl-3.3.4/make/make.darwin.x86.clang.opt --- zimpl-3.3.2/make/make.darwin.x86.clang.opt 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.darwin.x86.clang.opt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -CFLAGS = -O3 -LDFLAGS = -lgmp -lm - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS = -static -lgmp -lm -endif - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif diff -Nru zimpl-3.3.2/make/make.darwin.x86.gnu.dbg zimpl-3.3.4/make/make.darwin.x86.gnu.dbg --- zimpl-3.3.2/make/make.darwin.x86.gnu.dbg 2014-02-03 13:27:19.600994057 +0000 +++ zimpl-3.3.4/make/make.darwin.x86.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -3,17 +3,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS = -Bstatic -lgmp -lm -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.darwin.x86.gnu.opt zimpl-3.3.4/make/make.darwin.x86.gnu.opt --- zimpl-3.3.2/make/make.darwin.x86.gnu.opt 2014-02-03 13:31:49.911680332 +0000 +++ zimpl-3.3.4/make/make.darwin.x86.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -3,17 +3,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS = -Bstatic -lgmp -lm -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.linux.x86_64.clang.dbg zimpl-3.3.4/make/make.linux.x86_64.clang.dbg --- zimpl-3.3.2/make/make.linux.x86_64.clang.dbg 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.clang.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -1,6 +1,8 @@ -CC = clang -CPPFLAGS += -DFREEMEM -D__NO_MATH_INLINES -CFLAGS = -O0 -m64 -g $(GCCWARN) +#--- $Id: make.linux.x86_64.gnu.dbg,v 1.7 2014/01/12 11:07:04 bzfkocht Exp $ +CC = clang +CPPFLAGS += -DFREEMEM #-D__NO_MATH_INLINES +CFLAGS = -O0 -m64 -g -Weverything -Wno-padded -Wno-switch-enum -Wno-covered-switch-default -Wno-static-in-inline -Wno-pedantic -Wno-format-nonliteral -Wno-shorten-64-to-32 -Wno-disable-macro-expansion + LDFLAGS = -lgmp -lm ifeq ($(ZLIB),true) @@ -11,7 +13,7 @@ LIBRARY = $(LIBDIR)/lib$(LIBNAME).so LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = clang -m64 -shared -o # the trailing space is important +AR = gcc -m64 -shared -o # the trailing space is important ARFLAGS = $(LDFLAGS) RANLIB = true endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.clang.opt zimpl-3.3.4/make/make.linux.x86_64.clang.opt --- zimpl-3.3.2/make/make.linux.x86_64.clang.opt 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.clang.opt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -CFLAGS = -O3 -m64 -mtune=native -LDFLAGS = -lgmp -lm - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS += -static -endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.gnu.dbg zimpl-3.3.4/make/make.linux.x86_64.gnu.dbg --- zimpl-3.3.2/make/make.linux.x86_64.gnu.dbg 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.gnu.opt zimpl-3.3.4/make/make.linux.x86_64.gnu.opt --- zimpl-3.3.2/make/make.linux.x86_64.gnu.opt 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.gnu.opt-gccold zimpl-3.3.4/make/make.linux.x86_64.gnu.opt-gccold --- zimpl-3.3.2/make/make.linux.x86_64.gnu.opt-gccold 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.gnu.opt-gccold 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.gnu.prf zimpl-3.3.4/make/make.linux.x86_64.gnu.prf --- zimpl-3.3.2/make/make.linux.x86_64.gnu.prf 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.gnu.prf 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m64 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m64 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.intel.dbg zimpl-3.3.4/make/make.linux.x86_64.intel.dbg --- zimpl-3.3.2/make/make.linux.x86_64.intel.dbg 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.intel.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -12,10 +12,10 @@ # -wd383,444,810 -ifeq ($(LINK),shared) -LINK = normal -endif +#ifeq ($(LINK),shared) +#LINK = normal +#endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86_64.intel.opt zimpl-3.3.4/make/make.linux.x86_64.intel.opt --- zimpl-3.3.2/make/make.linux.x86_64.intel.opt 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86_64.intel.opt 2017-03-07 17:20:11.000000000 +0000 @@ -9,10 +9,10 @@ LDFLAGS += -lz endif -ifeq ($(LINK),shared) -LINK = normal -endif +#ifeq ($(LINK),shared) +#LINK = normal +#endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86.clang.dbg zimpl-3.3.4/make/make.linux.x86.clang.dbg --- zimpl-3.3.2/make/make.linux.x86.clang.dbg 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.linux.x86.clang.dbg 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DFREEMEM -D__NO_MATH_INLINES -Dinline= -CFLAGS = -O0 -m32 -g -fident -ftrapv $(GCCWARN) -LDFLAGS = -lgmp -lm - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS += -static -endif diff -Nru zimpl-3.3.2/make/make.linux.x86.clang.opt zimpl-3.3.4/make/make.linux.x86.clang.opt --- zimpl-3.3.2/make/make.linux.x86.clang.opt 2014-02-28 10:08:25.581340805 +0000 +++ zimpl-3.3.4/make/make.linux.x86.clang.opt 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -CC = clang -CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -CFLAGS = -O3 -m32 -mtune=native -LDFLAGS = -lgmp -lm - -ifeq ($(ZLIB),true) -LDFLAGS += -lz -endif - -ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so -CFLAGS += -fPIC -AR = clang -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true -endif - -ifeq ($(LINK),static) -LDFLAGS += -static -endif diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.dbg zimpl-3.3.4/make/make.linux.x86.gnu.dbg --- zimpl-3.3.2/make/make.linux.x86.gnu.dbg 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.gcov zimpl-3.3.4/make/make.linux.x86.gnu.gcov --- zimpl-3.3.2/make/make.linux.x86.gnu.gcov 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.gcov 2017-03-07 17:20:11.000000000 +0000 @@ -4,17 +4,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.opt zimpl-3.3.4/make/make.linux.x86.gnu.opt --- zimpl-3.3.2/make/make.linux.x86.gnu.opt 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -8,15 +8,15 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.opt-gccold zimpl-3.3.4/make/make.linux.x86.gnu.opt-gccold --- zimpl-3.3.2/make/make.linux.x86.gnu.opt-gccold 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.opt-gccold 2017-03-07 17:20:11.000000000 +0000 @@ -4,17 +4,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.prf zimpl-3.3.4/make/make.linux.x86.gnu.prf --- zimpl-3.3.2/make/make.linux.x86.gnu.prf 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.prf 2017-03-07 17:20:11.000000000 +0000 @@ -4,17 +4,17 @@ LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.linux.x86.gnu.valgrind zimpl-3.3.4/make/make.linux.x86.gnu.valgrind --- zimpl-3.3.2/make/make.linux.x86.gnu.valgrind 2014-02-03 13:32:06.576153893 +0000 +++ zimpl-3.3.4/make/make.linux.x86.gnu.valgrind 2017-03-07 17:20:11.000000000 +0000 @@ -1,20 +1,20 @@ -#--- $Id: make.linux.x86.gnu.valgrind,v 1.11 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.linux.x86.gnu.valgrind,v 1.12 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -DFREEMEM -D__NO_MATH_INLINES CFLAGS = -O3 -m32 -march=pentiumpro -g LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -m32 -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -m32 -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.linux.x86.intel.dbg zimpl-3.3.4/make/make.linux.x86.intel.dbg --- zimpl-3.3.2/make/make.linux.x86.intel.dbg 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.intel.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -11,10 +11,10 @@ LDFLAGS += -lz endif -ifeq ($(LINK),shared) -LINK = normal -endif +#ifeq ($(LINK),shared) +#LINK = normal +#endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif diff -Nru zimpl-3.3.2/make/make.linux.x86.intel.opt zimpl-3.3.4/make/make.linux.x86.intel.opt --- zimpl-3.3.2/make/make.linux.x86.intel.opt 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.linux.x86.intel.opt 2017-03-07 17:20:11.000000000 +0000 @@ -5,13 +5,13 @@ -wd1173 LDFLAGS = -lgmp -lm -static -ifeq ($(LINK),shared) -LINK = normal -endif +#ifeq ($(LINK),shared) +#LINK = normal +#endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -static -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.mingw.x86_64.msvc.dbg zimpl-3.3.4/make/make.mingw.x86_64.msvc.dbg --- zimpl-3.3.2/make/make.mingw.x86_64.msvc.dbg 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.mingw.x86_64.msvc.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,25 @@ +CPPFLAGS += -DNO_MSHELL -D__NO_MATH_INLINES -D_DLL +CFLAGS = +LDFLAGS = -NODEFAULTLIB:LIBCMT -NODEFAULTLIB:LIBCMTD -STACK:67108864 -OPT:REF -OPT:ICF -NOLOGO -LTCG + + +CC = cl +CC_o = -Fo +CFLAGS = +LINKCC = link +LINKCC_o = -OUT: + +AR = lib -nologo +AR_o = /OUT: + +RANLIB = +LIBEXT = .lib + +CPPFLAGS += -Dpopen=_popen -Dpclose=_pclose -Dinline=_inline -DNDEBUG -DWITH_PCRE=1 -D_WIN64 -W2 -wd4272 -Ox -nologo +CPPFLAGS += -I$(SRCDIR)/WIN -Ilib/pcre -Ilib/zlib -Ilib/pcre -Ilib/mpir.$(ARCH) + +LDFLAGS += lib/libz.$(ARCH).$(OPT).lib \ + lib/libpcre.$(ARCH).$(OPT).lib \ + lib/libmpir.$(ARCH).$(OPT).lib + +LIBBASE += getopt.o diff -Nru zimpl-3.3.2/make/make.mingw.x86_64.msvc.opt zimpl-3.3.4/make/make.mingw.x86_64.msvc.opt --- zimpl-3.3.2/make/make.mingw.x86_64.msvc.opt 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.mingw.x86_64.msvc.opt 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,25 @@ +CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -D_DLL +CFLAGS = -O3 +LDFLAGS = -NODEFAULTLIB:LIBCMT -NODEFAULTLIB:LIBCMTD -STACK:67108864 -OPT:REF -OPT:ICF -NOLOGO -LTCG + + +CC = cl +CC_o = -Fo +CFLAGS = +LINKCC = link +LINKCC_o = -OUT: + +AR = lib -nologo +AR_o = /OUT: + +RANLIB = +LIBEXT = .lib + +CPPFLAGS += -Dpopen=_popen -Dpclose=_pclose -Dinline=_inline -DNDEBUG -DWITH_PCRE=1 -D_WIN64 -W2 -wd4272 -Ox -nologo +CPPFLAGS += -I$(SRCDIR)/WIN -Ilib/pcre -Ilib/zlib -Ilib/pcre -Ilib/mpir.$(ARCH) + +LDFLAGS += lib/libz.$(ARCH).$(OPT).lib \ + lib/libpcre.$(ARCH).$(OPT).lib \ + lib/libmpir.$(ARCH).$(OPT).lib + +LIBBASE += getopt.o \ No newline at end of file diff -Nru zimpl-3.3.2/make/make.mingw.x86.gnu.opt zimpl-3.3.4/make/make.mingw.x86.gnu.opt --- zimpl-3.3.2/make/make.mingw.x86.gnu.opt 2014-02-03 13:32:22.317601198 +0000 +++ zimpl-3.3.4/make/make.mingw.x86.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,4 @@ -#--- $Id: make.mingw.x86.gnu.opt,v 1.2 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.mingw.x86.gnu.opt,v 1.3 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES CFLAGS = -O3 LDFLAGS = -lgmp -lpcreposix -lpcre -lm -static diff -Nru zimpl-3.3.2/make/make.mingw.x86.msvc.dbg zimpl-3.3.4/make/make.mingw.x86.msvc.dbg --- zimpl-3.3.2/make/make.mingw.x86.msvc.dbg 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.mingw.x86.msvc.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,25 @@ +CPPFLAGS += -DNO_MSHELL -D__NO_MATH_INLINES -D_DLL +CFLAGS = +LDFLAGS = -NODEFAULTLIB:LIBCMT -NODEFAULTLIB:LIBCMTD -STACK:67108864 -OPT:REF -OPT:ICF -NOLOGO -LTCG + + +CC = cl +CC_o = -Fo +CFLAGS = +LINKCC = link +LINKCC_o = -OUT: + +AR = lib -nologo +AR_o = /OUT: + +RANLIB = +LIBEXT = .lib + +CPPFLAGS += -Dpopen=_popen -Dpclose=_pclose -Dinline=_inline -DNDEBUG -DWITH_PCRE=1 -D_WIN32 -W2 -wd4272 -Ox -nologo +CPPFLAGS += -I$(SRCDIR)/WIN -Ilib/pcre -Ilib/zlib -Ilib/pcre -Ilib/mpir.$(ARCH) + +LDFLAGS += lib/libz.$(ARCH).$(OPT).lib \ + lib/libpcre.$(ARCH).$(OPT).lib \ + lib/libmpir.$(ARCH).$(OPT).lib + +LIBBASE += getopt.o diff -Nru zimpl-3.3.2/make/make.mingw.x86.msvc.opt zimpl-3.3.4/make/make.mingw.x86.msvc.opt --- zimpl-3.3.2/make/make.mingw.x86.msvc.opt 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/make.mingw.x86.msvc.opt 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,25 @@ +CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -D_DLL +CFLAGS = -O3 +LDFLAGS = -NODEFAULTLIB:LIBCMT -NODEFAULTLIB:LIBCMTD -STACK:67108864 -OPT:REF -OPT:ICF -NOLOGO -LTCG + + +CC = cl +CC_o = -Fo +CFLAGS = +LINKCC = link +LINKCC_o = -OUT: + +AR = lib -nologo +AR_o = /OUT: + +RANLIB = +LIBEXT = .lib + +CPPFLAGS += -Dpopen=_popen -Dpclose=_pclose -Dinline=_inline -DNDEBUG -DWITH_PCRE=1 -D_WIN32 -W2 -wd4272 -Ox -nologo +CPPFLAGS += -I$(SRCDIR)/WIN -Ilib/pcre -Ilib/zlib -Ilib/pcre -Ilib/mpir.$(ARCH) + +LDFLAGS += lib/libz.$(ARCH).$(OPT).lib \ + lib/libpcre.$(ARCH).$(OPT).lib \ + lib/libmpir.$(ARCH).$(OPT).lib + +LIBBASE += getopt.o \ No newline at end of file diff -Nru zimpl-3.3.2/make/make.sunos.sparc.gnu.opt zimpl-3.3.4/make/make.sunos.sparc.gnu.opt --- zimpl-3.3.2/make/make.sunos.sparc.gnu.opt 2014-02-03 13:37:42.348689812 +0000 +++ zimpl-3.3.4/make/make.sunos.sparc.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,4 @@ -#--- $Id: make.sunos.sparc.gnu.opt,v 1.7 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.sunos.sparc.gnu.opt,v 1.8 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES CFLAGS = -O3 LDFLAGS = -Bstatic -lgmp -lm diff -Nru zimpl-3.3.2/make/make.sunos.x86.gnu.dbg zimpl-3.3.4/make/make.sunos.x86.gnu.dbg --- zimpl-3.3.2/make/make.sunos.x86.gnu.dbg 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/make/make.sunos.x86.gnu.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -8,14 +8,14 @@ endif ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -Bstatic -endif +#endif diff -Nru zimpl-3.3.2/make/make.sunos.x86.gnu.opt zimpl-3.3.4/make/make.sunos.x86.gnu.opt --- zimpl-3.3.2/make/make.sunos.x86.gnu.opt 2014-02-03 13:52:38.753304493 +0000 +++ zimpl-3.3.4/make/make.sunos.x86.gnu.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,20 +1,20 @@ -#--- $Id: make.sunos.x86.gnu.opt,v 1.7 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.sunos.x86.gnu.opt,v 1.8 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES CFLAGS = -O3 LDFLAGS = -lgmp -lm ifeq ($(LINK),shared) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).so -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so +#LIBRARY = $(LIBDIR)/lib$(LIBNAME).so +#LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).so CFLAGS += -fPIC -AR = gcc -shared -o # the trailing space is important -ARFLAGS = $(LDFLAGS) -RANLIB = true +#AR = gcc -shared -o # the trailing space is important +#ARFLAGS = $(LDFLAGS) +#RANLIB = true endif -ifeq ($(LINK),static) +#ifeq ($(LINK),static) LDFLAGS += -Bstatic -endif +#endif ifeq ($(ZLIB),true) LDFLAGS += -lz diff -Nru zimpl-3.3.2/make/make.win.x86.mingw-cross.opt zimpl-3.3.4/make/make.win.x86.mingw-cross.opt --- zimpl-3.3.2/make/make.win.x86.mingw-cross.opt 2014-02-03 13:52:55.888764070 +0000 +++ zimpl-3.3.4/make/make.win.x86.mingw-cross.opt 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,4 @@ -#--- $Id: make.win.x86.mingw-cross.opt,v 1.7 2014/01/12 11:07:04 bzfkocht Exp $ +#--- $Id: make.win.x86.mingw-cross.opt,v 1.8 2014/03/03 08:36:28 bzfkocht Exp $ CPPFLAGS += -DNDEBUG -DNO_MSHELL -D__NO_MATH_INLINES -DWITH_PCRE -DPCRE_STATIC CFLAGS = -O3 -march=pentiumpro -g LDFLAGS = -lpcreposix -lpcre -lgmp -lm -static diff -Nru zimpl-3.3.2/make/nmake.win.x86_64.msvc.dbg zimpl-3.3.4/make/nmake.win.x86_64.msvc.dbg --- zimpl-3.3.2/make/nmake.win.x86_64.msvc.dbg 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/nmake.win.x86_64.msvc.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,3 @@ +CPPFLAGS = $(CPPFLAGS) /Dinline= /DWIN64 +CFLAGS = $(CFLAGS) /W4 /Zi /wd4001 /wd4127 /wd4206 /wd4701 /wd4702 /wd4274 /nologo + diff -Nru zimpl-3.3.2/make/nmake.win.x86_64.msvc.opt zimpl-3.3.4/make/nmake.win.x86_64.msvc.opt --- zimpl-3.3.2/make/nmake.win.x86_64.msvc.opt 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/nmake.win.x86_64.msvc.opt 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,3 @@ +CPPFLAGS = $(CPPFLAGS) /Dinline=_inline /DWIN64 /DNDEBUG +CFLAGS = $(CFLAGS) /W2 /wd4274 /Ox /nologo +LDFLAGS = $(LDFLAGS) /LTCG diff -Nru zimpl-3.3.2/make/nmake.win.x86.msvc.dbg zimpl-3.3.4/make/nmake.win.x86.msvc.dbg --- zimpl-3.3.2/make/nmake.win.x86.msvc.dbg 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/nmake.win.x86.msvc.dbg 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,3 @@ +CPPFLAGS = $(CPPFLAGS) /Dinline= /DWIN32 +CFLAGS = $(CFLAGS) /W4 /Zi /wd4001 /wd4127 /wd4206 /wd4701 /wd4702 /wd4274 /nologo + diff -Nru zimpl-3.3.2/make/nmake.win.x86.msvc.opt zimpl-3.3.4/make/nmake.win.x86.msvc.opt --- zimpl-3.3.2/make/nmake.win.x86.msvc.opt 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/make/nmake.win.x86.msvc.opt 2017-03-07 17:20:11.000000000 +0000 @@ -0,0 +1,3 @@ +CPPFLAGS = $(CPPFLAGS) /Dinline=_inline /DWIN32 /DNDEBUG +CFLAGS = $(CFLAGS) /W2 /wd4274 /Ox /nologo +LDFLAGS = $(LDFLAGS) /LTCG diff -Nru zimpl-3.3.2/Makefile zimpl-3.3.4/Makefile --- zimpl-3.3.2/Makefile 2014-02-03 13:27:18.902974196 +0000 +++ zimpl-3.3.4/Makefile 2017-03-07 17:20:10.000000000 +0000 @@ -1,4 +1,3 @@ -# $Id: Makefile,v 1.86 2014/01/12 11:07:04 bzfkocht Exp $ #* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #* * #* File....: Makefile * @@ -8,7 +7,7 @@ #* * #* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * #* -#* Copyright (C) 2005-2010 by Thorsten Koch +#* Copyright (C) 2005-2017 by Thorsten Koch #* #* This program is free software; you can redistribute it and/or #* modify it under the terms of the GNU General Public License @@ -48,20 +47,26 @@ HOSTNAME := $(shell uname -n | tr '[:upper:]' '[:lower:]') -VERSION = 3.3.2 +VERSION = 3.3.4 VERBOSE = false SHARED = false STATIC = false ZLIB = true -LINK = normal +LINK = static OPT = opt COMP = gnu -CC = gcc +CC = gcc +CC_o = -o +LINKCC = gcc +LINKCC_o = -o #the white space is important +LIBEXT = .a YACC = bison LEX = flex DCC = gcc LINT = flexelint -AR = ar cr +CPPCHECK = cppcheck +AR = ar cr +AR_o = RANLIB = ranlib DOXY = doxygen VALGRIND = valgrind --tool=memcheck --leak-check=full \ @@ -102,12 +107,14 @@ NAME = zimpl BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) LIBNAME = $(NAME)-$(VERSION).$(BASE) -LIBRARY = $(LIBDIR)/lib$(LIBNAME).a -LIBRARYDBL = $(LIBDIR)/lib$(LIBNAME).dbl.a + +LIBRARY = $(LIBDIR)/lib$(LIBNAME)$(LIBEXT) +LIBRARYDBL = $(LIBDIR)/lib$(LIBNAME).dbl$(LIBEXT) +LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE)$(LIBEXT) +LIBDBLLINK = $(LIBDIR)/lib$(NAME).$(BASE).dbl$(LIBEXT) + BINARY = $(BINDIR)/$(BINNAME) BINARYDBL = $(BINDIR)/$(BINNAME).dbl -LIBLINK = $(LIBDIR)/lib$(NAME).$(BASE).a -LIBDBLLINK = $(LIBDIR)/lib$(NAME).$(BASE).dbl.a BINLINK = $(BINDIR)/$(NAME).$(BASE) BINSHORTLINK = $(BINDIR)/$(NAME) DEPEND = $(SRCDIR)/depend @@ -168,17 +175,23 @@ $(BINARY): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARY) @echo "-> linking $@" - $(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) -o $@ +ifeq ($(COMP), msvc) + $(LINKCC) $(CFLAGS) $(OBJXXX) $(LIBRARY) $(LDFLAGS) $(LINKCC_o)$@ +else + $(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME) $(LDFLAGS) $(LINKCC_o)$@ +endif $(BINARYDBL): $(OBJDIR) $(BINDIR) $(OBJXXX) $(LIBRARYDBL) @echo "-> linking $@" - $(CC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) -o $@ + $(LINKCC) $(CFLAGS) $(OBJXXX) -L$(LIBDIR) -l$(LIBNAME).dbl $(LDFLAGS) $(CC_o)$@ $(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBXXX) @echo "-> generating library $@" -rm -f $(LIBRARY) - $(AR) $@ $(LIBXXX) $(ARFLAGS) + $(AR) $(AR_o)$@ $(LIBXXX) $(ARFLAGS) +ifneq ($(RANLIB),) $(RANLIB) $@ +endif libdbl: $(LIBRARYDBL) $(LIBDBLLINK) @@ -200,6 +213,9 @@ $(LINT) $(SRCDIR)/project.lnt \ $(CPPFLAGS) -UNDEBUG -Dinline= -DNO_MSHELL $^ +cppcheck: $(OBJSRC) $(LIBSRC) + $(CPPCHECK) $(CPPFLAGS) --inline-suppr --enable=warning,style,performance,portability,information $^ + doc: cd doc; make -f Makefile @@ -248,6 +264,6 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c @echo "-> compiling $@" - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ + $(CC) $(CPPFLAGS) $(CFLAGS) -c $< $(CC_o)$@ # --- EOF --------------------------------------------------------------------- diff -Nru zimpl-3.3.2/Makefile.nmake zimpl-3.3.4/Makefile.nmake --- zimpl-3.3.2/Makefile.nmake 1970-01-01 00:00:00.000000000 +0000 +++ zimpl-3.3.4/Makefile.nmake 2017-03-07 17:20:10.000000000 +0000 @@ -0,0 +1,128 @@ +# $Id: Makefile,v 1.82 2011/10/31 08:48:56 bzfkocht Exp $ +#* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +#* * +#* File....: Makefile * +#* Name....: Zimpl Makefile * +#* Author..: Thorsten Koch * +#* Copyright by Author, All rights reserved * +#* * +#* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * +#* +#* Copyright (C) 2005-2017 by Thorsten Koch +#* +#* 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 +#* of the License, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#* +# +#.PHONY: all clean + +ARCH = x86 +OSTYPE = win +VERSION = 3.3.3 +VERBOSE = 0 +LINK = normal +OPT = opt +COMP = msvc +CC = cl +AR = lib +LD = link + +SRCDIR = src +BINDIR = bin +LIBDIR = lib + +CPPFLAGS = /DVERSION=\"$(VERSION)\" \ + /I$(SRCDIR) /I$(SRCDIR)\WIN \ + /Dpopen=_popen /Dpclose=_pclose /DWITH_PCRE=1 \ + /Ilib\zlib \ + /Ilib\pcre \ + /Ilib\mpir.$(ARCH) \ + /D_CRT_SECURE_NO_WARNINGS + +CFLAGS = +ARFLAGS = /nologo +LIBS = lib\libz.$(ARCH).lib \ + lib\libpcre.$(ARCH).lib \ + lib\libmpir.$(ARCH).lib + +LDFLAGS = /NODEFAULTLIB:LIBCMT /NODEFAULTLIB:LIBCMTD /STACK:67108864 /OPT:REF /OPT:ICF /NOLOGO + +BASE = $(OSTYPE).$(ARCH).$(COMP).$(OPT) +OBJDIR = obj\O.$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) +NAME = zimpl +BINNAME = $(NAME)-$(VERSION).$(OSTYPE).$(ARCH).$(COMP).$(LINK).$(OPT) +LIBNAME = $(NAME)-$(VERSION).$(BASE) +LIBRARY = $(LIBDIR)\lib$(LIBNAME).lib +BINARY = $(BINDIR)\$(BINNAME).exe +DEPEND = $(SRCDIR)\depend + +#----------------------------------------------------------------------------- + +OBJECT = $(OBJDIR)\zimpl.obj $(OBJDIR)\xlpglue.obj $(OBJDIR)\zlpglue.obj \ + $(OBJDIR)\ratlpstore.obj $(OBJDIR)\ratlpfwrite.obj $(OBJDIR)\ratmpswrite.obj $(OBJDIR)\ratmstwrite.obj \ + $(OBJDIR)\ratordwrite.obj $(OBJDIR)\ratpresolve.obj +LIBBASE = $(OBJDIR)\getopt.obj $(OBJDIR)\blkmem.obj $(OBJDIR)\bound.obj $(OBJDIR)\code.obj $(OBJDIR)\conname.obj \ + $(OBJDIR)\define.obj $(OBJDIR)\elem.obj $(OBJDIR)\entry.obj \ + $(OBJDIR)\hash.obj $(OBJDIR)\heap.obj $(OBJDIR)\idxset.obj $(OBJDIR)\inst.obj $(OBJDIR)\iread.obj $(OBJDIR)\list.obj \ + $(OBJDIR)\load.obj $(OBJDIR)\local.obj $(OBJDIR)\metaio.obj $(OBJDIR)\mmlparse2.obj $(OBJDIR)\mmlscan.obj $(OBJDIR)\mono.obj \ + $(OBJDIR)\mshell.obj $(OBJDIR)\prog.obj $(OBJDIR)\random.obj $(OBJDIR)\rdefpar.obj $(OBJDIR)\source.obj \ + $(OBJDIR)\setempty.obj $(OBJDIR)\setpseudo.obj $(OBJDIR)\setlist.obj $(OBJDIR)\setrange.obj $(OBJDIR)\setprod.obj \ + $(OBJDIR)\setmulti.obj $(OBJDIR)\set4.obj $(OBJDIR)\stmt.obj $(OBJDIR)\stkchk.obj $(OBJDIR)\strstore2.obj $(OBJDIR)/symbol.obj \ + $(OBJDIR)\term2.obj $(OBJDIR)\tuple.obj $(OBJDIR)\vinst.obj $(OBJDIR)\zimpllib.obj +LIBOBJ = $(LIBBASE) $(OBJDIR)\gmpmisc.obj $(OBJDIR)\numbgmp.obj + +#----------------------------------------------------------------------------- +!include make/nmake.$(OSTYPE).$(ARCH).$(COMP).$(OPT) +#----------------------------------------------------------------------------- + +!if $(VERBOSE) == 0 +!CMDSWITCHES +S +!endif + +all: $(LIBRARY) $(BINARY) + +$(BINARY): $(OBJDIR) $(BINDIR) $(OBJECT) $(LIBRARY) + @echo "-> linking $@" + $(LD) $(LDFLAGS) /OUT:$@ $(OBJECT) $(LIBRARY) $(LIBS) + +$(LIBRARY): $(OBJDIR) $(LIBDIR) $(LIBOBJ) + @echo "-> generating library $@" + @del $(LIBRARY) + $(AR) $(ARFLAGS) /OUT:$@ $(LIBOBJ) + +$(OBJDIR): + @echo "** creating directory \"$@\"" + @mkdir $(OBJDIR) + +$(LIBDIR): + @echo "** creating directory \"$@\"" + @mkdir $(LIBDIR) + +$(BINDIR): + @echo "** creating directory \"$@\"" + @mkdir $(BINDIR) + +clean: + del /Q $(OBJDIR)\*.* $(BINARY) $(LIBRARY) + +!include $(DEPEND) + +{$(SRCDIR)}.c{$(OBJDIR)}.obj: + @echo "-> compiling $@" + $(CC) $(CPPFLAGS) $(CFLAGS) /c $< /Fo$@ + +$(OBJDIR)\getopt.obj: $(SRCDIR)\WIN\getopt.c $(SRCDIR)\WIN\getopt.h + $(CC) $(CPPFLAGS) $(CFLAGS) /c $(SRCDIR)\WIN\getopt.c /Fo$@ + +# --- EOF --------------------------------------------------------------------- diff -Nru zimpl-3.3.2/src/blkmem.c zimpl-3.3.4/src/blkmem.c --- zimpl-3.3.2/src/blkmem.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/blkmem.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: blkmem.c,v 1.10 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: blkmem.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/blkmem.h zimpl-3.3.4/src/blkmem.h --- zimpl-3.3.2/src/blkmem.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/blkmem.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: blkmem.h,v 1.9 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: blkmem.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/bool.h zimpl-3.3.4/src/bool.h --- zimpl-3.3.2/src/bool.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/bool.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: bool.h,v 1.10 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: bool.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/bound.c zimpl-3.3.4/src/bound.c --- zimpl-3.3.2/src/bound.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/bound.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: bound.c,v 1.13 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: bound.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/bound.h zimpl-3.3.4/src/bound.h --- zimpl-3.3.2/src/bound.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/bound.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: bound.h,v 1.6 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: bound.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/code.c zimpl-3.3.4/src/code.c --- zimpl-3.3.2/src/code.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/code.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: code.c,v 1.40 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: code.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/code.h zimpl-3.3.4/src/code.h --- zimpl-3.3.2/src/code.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/code.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: code.h,v 1.29 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: code.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/conname.c zimpl-3.3.4/src/conname.c --- zimpl-3.3.2/src/conname.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/conname.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: conname.c,v 1.21 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: conname.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/conname.h zimpl-3.3.4/src/conname.h --- zimpl-3.3.2/src/conname.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/conname.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: conname.h,v 1.6 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: conname.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/define.c zimpl-3.3.4/src/define.c --- zimpl-3.3.2/src/define.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/define.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: define.c,v 1.12 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: define.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/define.h zimpl-3.3.4/src/define.h --- zimpl-3.3.2/src/define.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/define.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: define.h,v 1.6 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: define.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/depend zimpl-3.3.4/src/depend --- zimpl-3.3.2/src/depend 2011-10-25 08:18:01.000000000 +0000 +++ zimpl-3.3.4/src/depend 2017-03-07 17:20:11.000000000 +0000 @@ -1,145 +1,144 @@ $(OBJDIR)/zimpl.o: src/zimpl.c src/lint.h src/bool.h src/mshell.h src/stkchk.h \ - src/random.h src/blkmem.h src/ratlptypes.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h src/bound.h \ - src/mono.h src/term.h src/stmt.h src/local.h src/list.h src/entry.h \ - src/conname.h src/xlpglue.h src/zlpglue.h src/prog.h src/metaio.h \ - src/strstore.h src/zimpllib.h -$(OBJDIR)/xlpglue.o: src/xlpglue.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/bound.h src/mono.h \ - src/term.h src/ratlp.h src/gmpmisc.h src/conname.h src/stmt.h \ - src/hash.h src/xlpglue.h + src/random.h src/blkmem.h src/ratlptypes.h src/numb.h src/elem.h \ + src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h src/bound.h \ + src/mono.h src/term.h src/stmt.h src/local.h src/list.h src/entry.h \ + src/conname.h src/xlpglue.h src/zlpglue.h src/prog.h src/metaio.h \ + src/strstore.h src/zimpllib.h +$(OBJDIR)/xlpglue.o: src/xlpglue.c src/lint.h src/bool.h src/mshell.h \ + src/ratlptypes.h src/numb.h src/elem.h src/tuple.h src/mme.h src/bound.h \ + src/mono.h src/term.h src/ratlp.h src/gmpmisc.h src/conname.h src/stmt.h \ + src/hash.h src/xlpglue.h $(OBJDIR)/zlpglue.o: src/zlpglue.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/bound.h src/mono.h \ - src/term.h src/ratlp.h src/zlpglue.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/bound.h src/mono.h \ + src/term.h src/ratlp.h src/zlpglue.h $(OBJDIR)/ratlpstore.o: src/ratlpstore.c src/lint.h src/bool.h src/mshell.h \ - src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ - src/mono.h src/term.h src/ratlp.h src/ratlpstore.h + src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ + src/mono.h src/term.h src/ratlp.h src/ratlpstore.h $(OBJDIR)/ratlpfwrite.o: src/ratlpfwrite.c src/lint.h src/mshell.h src/bool.h \ - src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ - src/mono.h src/term.h src/ratlp.h src/ratlpstore.h src/random.h + src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ + src/mono.h src/term.h src/ratlp.h src/ratlpstore.h src/random.h $(OBJDIR)/ratmpswrite.o: src/ratmpswrite.c src/lint.h src/mshell.h src/bool.h \ - src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ - src/mono.h src/term.h src/ratlp.h src/ratlpstore.h + src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ + src/mono.h src/term.h src/ratlp.h src/ratlpstore.h $(OBJDIR)/ratmstwrite.o: src/ratmstwrite.c src/lint.h src/mshell.h src/bool.h \ - src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ - src/mono.h src/term.h src/ratlp.h src/ratlpstore.h + src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ + src/mono.h src/term.h src/ratlp.h src/ratlpstore.h $(OBJDIR)/ratordwrite.o: src/ratordwrite.c src/lint.h src/mshell.h src/bool.h \ - src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ - src/mono.h src/term.h src/ratlp.h src/ratlpstore.h + src/gmpmisc.h src/ratlptypes.h src/numb.h src/bound.h src/mme.h \ + src/mono.h src/term.h src/ratlp.h src/ratlpstore.h $(OBJDIR)/ratpresolve.o: src/ratpresolve.c $(OBJDIR)/blkmem.o: src/blkmem.c src/mshell.h src/blkmem.h $(OBJDIR)/bound.o: src/bound.c src/bool.h src/mshell.h src/mme.h src/numb.h \ - src/bound.h + src/bound.h $(OBJDIR)/code.o: src/code.c src/bool.h src/mshell.h src/stkchk.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ - src/mono.h src/term.h src/list.h src/stmt.h src/local.h src/code.h \ - src/inst.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ + src/mono.h src/term.h src/list.h src/stmt.h src/local.h src/code.h \ + src/inst.h $(OBJDIR)/conname.o: src/conname.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/mme.h src/bound.h src/mono.h src/term.h src/elem.h \ - src/tuple.h src/local.h src/stmt.h src/prog.h src/xlpglue.h \ - src/conname.h + src/numb.h src/mme.h src/bound.h src/mono.h src/term.h src/elem.h \ + src/tuple.h src/local.h src/stmt.h src/prog.h src/xlpglue.h \ + src/conname.h $(OBJDIR)/define.o: src/define.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/define.h + src/tuple.h src/mme.h src/define.h $(OBJDIR)/elem.o: src/elem.c src/lint.h src/bool.h src/mshell.h src/numb.h \ - src/elem.h src/mme.h src/strstore.h + src/elem.h src/mme.h src/strstore.h $(OBJDIR)/entry.o: src/entry.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/entry.h \ - src/zimpllib.h -$(OBJDIR)/gmpmisc.o: src/gmpmisc.c src/bool.h src/mshell.h src/gmpmisc.h + src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/entry.h \ + src/zimpllib.h $(OBJDIR)/hash.o: src/hash.c src/bool.h src/mshell.h src/blkmem.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/entry.h src/hash.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/entry.h src/mono.h src/hash.h $(OBJDIR)/heap.o: src/heap.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/entry.h \ - src/heap.h + src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/entry.h \ + src/heap.h $(OBJDIR)/idxset.o: src/idxset.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/set.h src/idxset.h + src/tuple.h src/mme.h src/set.h src/idxset.h $(OBJDIR)/inst.o: src/inst.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ - src/bound.h src/idxset.h src/mono.h src/term.h src/rdefpar.h \ - src/conname.h src/stmt.h src/local.h src/list.h src/entry.h src/heap.h \ - src/code.h src/inst.h src/prog.h src/xlpglue.h src/strstore.h + src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ + src/bound.h src/idxset.h src/mono.h src/term.h src/rdefpar.h \ + src/conname.h src/stmt.h src/local.h src/list.h src/entry.h src/heap.h \ + src/code.h src/inst.h src/prog.h src/xlpglue.h src/strstore.h $(OBJDIR)/iread.o: src/iread.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ - src/bound.h src/idxset.h src/mono.h src/term.h src/rdefpar.h \ - src/conname.h src/stmt.h src/local.h src/list.h src/entry.h src/heap.h \ - src/code.h src/inst.h src/xlpglue.h src/metaio.h src/strstore.h + src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ + src/bound.h src/idxset.h src/mono.h src/term.h src/rdefpar.h \ + src/conname.h src/stmt.h src/local.h src/list.h src/entry.h src/heap.h \ + src/code.h src/inst.h src/xlpglue.h src/metaio.h src/strstore.h $(OBJDIR)/list.o: src/list.c src/bool.h src/mshell.h src/blkmem.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/list.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/list.h $(OBJDIR)/load.o: src/load.c src/lint.h src/bool.h src/mshell.h src/mme.h \ - src/stmt.h src/prog.h src/metaio.h + src/stmt.h src/prog.h src/metaio.h $(OBJDIR)/local.o: src/local.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/local.h + src/tuple.h src/mme.h src/local.h $(OBJDIR)/metaio.o: src/metaio.c src/bool.h src/mshell.h src/mme.h src/metaio.h $(OBJDIR)/mmlparse2.o: src/mmlparse2.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ - src/mono.h src/term.h src/list.h src/stmt.h src/local.h src/code.h \ - src/inst.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ + src/mono.h src/term.h src/list.h src/stmt.h src/local.h src/code.h \ + src/inst.h $(OBJDIR)/mmlscan.o: src/mmlscan.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/define.h src/stmt.h src/strstore.h src/mmlparse2.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/define.h src/stmt.h src/strstore.h src/mmlparse2.h $(OBJDIR)/mono.o: src/mono.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/entry.h src/mono.h + src/elem.h src/tuple.h src/mme.h src/entry.h src/mono.h $(OBJDIR)/mshell.o: src/mshell.c src/lint.h src/mshell.h -$(OBJDIR)/numbgmp.o: src/numbgmp.c src/bool.h src/lint.h src/mshell.h src/random.h \ - src/gmpmisc.h src/mme.h src/numb.h $(OBJDIR)/prog.o: src/prog.c src/lint.h src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ - src/mono.h src/term.h src/list.h src/local.h src/code.h src/stmt.h \ - src/prog.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/entry.h src/idxset.h src/rdefpar.h src/bound.h src/define.h \ + src/mono.h src/term.h src/list.h src/local.h src/code.h src/stmt.h \ + src/prog.h $(OBJDIR)/random.o: src/random.c src/lint.h src/mshell.h src/random.h $(OBJDIR)/rdefpar.o: src/rdefpar.c src/bool.h src/mshell.h src/mme.h src/strstore.h \ - src/rdefpar.h + src/rdefpar.h $(OBJDIR)/source.o: src/source.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h -$(OBJDIR)/setempty.o: src/setempty.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/hash.h src/set.h src/set4.h -$(OBJDIR)/setpseudo.o: src/setpseudo.c src/bool.h src/mshell.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/hash.h src/set.h src/set4.h -$(OBJDIR)/setlist.o: src/setlist.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/hash.h \ - src/list.h src/stmt.h src/set.h src/set4.h -$(OBJDIR)/setrange.o: src/setrange.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/hash.h src/stmt.h src/set.h src/set4.h + src/numb.h src/elem.h src/tuple.h src/mme.h +$(OBJDIR)/setempty.o: src/setempty.c src/bool.h src/lint.h src/mshell.h src/numb.h \ + src/elem.h src/tuple.h src/mme.h src/hash.h src/set.h src/set4.h +$(OBJDIR)/setpseudo.o: src/setpseudo.c src/bool.h src/lint.h src/mshell.h \ + src/numb.h src/elem.h src/tuple.h src/mme.h src/hash.h src/set.h \ + src/set4.h +$(OBJDIR)/setlist.o: src/setlist.c src/bool.h src/lint.h src/mshell.h \ + src/ratlptypes.h src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h \ + src/hash.h src/list.h src/stmt.h src/set.h src/set4.h +$(OBJDIR)/setrange.o: src/setrange.c src/bool.h src/lint.h src/mshell.h src/numb.h \ + src/elem.h src/tuple.h src/mme.h src/hash.h src/stmt.h src/set.h \ + src/set4.h $(OBJDIR)/setprod.o: src/setprod.c src/bool.h src/mshell.h src/numb.h src/elem.h \ - src/tuple.h src/mme.h src/hash.h src/set.h src/set4.h -$(OBJDIR)/setmulti.o: src/setmulti.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/list.h \ - src/hash.h src/stmt.h src/set.h src/set4.h + src/tuple.h src/mme.h src/hash.h src/set.h src/set4.h +$(OBJDIR)/setmulti.o: src/setmulti.c src/lint.h src/bool.h src/mshell.h \ + src/ratlptypes.h src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h \ + src/list.h src/hash.h src/stmt.h src/set.h src/set4.h $(OBJDIR)/set4.o: src/set4.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/entry.h src/list.h src/hash.h \ - src/stmt.h src/set.h src/set4.h + src/elem.h src/tuple.h src/mme.h src/entry.h src/list.h src/hash.h \ + src/stmt.h src/set.h src/set4.h $(OBJDIR)/stmt.o: src/stmt.c src/lint.h src/bool.h src/mshell.h src/stkchk.h \ - src/ratlptypes.h src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h \ - src/symbol.h src/entry.h src/idxset.h src/rdefpar.h src/bound.h \ - src/define.h src/mono.h src/term.h src/list.h src/local.h src/code.h \ - src/inst.h src/stmt.h -$(OBJDIR)/stkchk.o: src/stkchk.c src/stkchk.h + src/ratlptypes.h src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h \ + src/symbol.h src/entry.h src/idxset.h src/rdefpar.h src/bound.h \ + src/define.h src/mono.h src/term.h src/list.h src/local.h src/code.h \ + src/inst.h src/stmt.h +$(OBJDIR)/stkchk.o: src/stkchk.c $(OBJDIR)/strstore2.o: src/strstore2.c src/lint.h src/mshell.h src/strstore.h \ - src/mme.h + src/mme.h $(OBJDIR)/symbol.o: src/symbol.c src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/set.h \ - src/hash.h src/stmt.h src/symbol.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/entry.h src/set.h \ + src/hash.h src/stmt.h src/symbol.h $(OBJDIR)/term2.o: src/term2.c src/bool.h src/mshell.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/bound.h src/entry.h src/mono.h \ - src/term.h src/stmt.h src/prog.h src/xlpglue.h + src/elem.h src/tuple.h src/mme.h src/bound.h src/entry.h src/mono.h \ + src/hash.h src/term.h src/stmt.h src/prog.h src/xlpglue.h $(OBJDIR)/tuple.o: src/tuple.c src/bool.h src/mshell.h src/blkmem.h src/numb.h \ - src/elem.h src/mme.h src/stmt.h src/tuple.h + src/elem.h src/mme.h src/stmt.h src/tuple.h $(OBJDIR)/vinst.o: src/vinst.c src/lint.h src/bool.h src/mshell.h src/ratlptypes.h \ - src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ - src/define.h src/bound.h src/idxset.h src/mono.h src/term.h \ - src/rdefpar.h src/conname.h src/stmt.h src/prog.h src/local.h \ - src/list.h src/entry.h src/heap.h src/code.h src/inst.h src/xlpglue.h \ - src/strstore.h + src/numb.h src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h \ + src/define.h src/bound.h src/idxset.h src/mono.h src/term.h \ + src/rdefpar.h src/conname.h src/stmt.h src/prog.h src/local.h src/list.h \ + src/entry.h src/heap.h src/code.h src/inst.h src/xlpglue.h \ + src/strstore.h $(OBJDIR)/zimpllib.o: src/zimpllib.c src/lint.h src/bool.h src/mshell.h \ - src/stkchk.h src/blkmem.h src/random.h src/ratlptypes.h src/numb.h \ - src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ - src/bound.h src/mono.h src/term.h src/stmt.h src/local.h src/list.h \ - src/entry.h src/xlpglue.h src/prog.h src/metaio.h src/strstore.h \ - src/zimpllib.h + src/stkchk.h src/blkmem.h src/random.h src/ratlptypes.h src/numb.h \ + src/elem.h src/tuple.h src/mme.h src/set.h src/symbol.h src/define.h \ + src/bound.h src/mono.h src/term.h src/stmt.h src/local.h src/list.h \ + src/entry.h src/xlpglue.h src/prog.h src/metaio.h src/strstore.h \ + src/zimpllib.h $(OBJDIR)/gmpmisc.o: src/gmpmisc.c src/bool.h src/mshell.h src/gmpmisc.h $(OBJDIR)/numbgmp.o: src/numbgmp.c src/bool.h src/lint.h src/mshell.h src/random.h \ - src/gmpmisc.h src/mme.h src/numb.h + src/gmpmisc.h src/mme.h src/numb.h diff -Nru zimpl-3.3.2/src/elem.c zimpl-3.3.4/src/elem.c --- zimpl-3.3.2/src/elem.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/elem.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: elem.c,v 1.33 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: elem.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/elem.h zimpl-3.3.4/src/elem.h --- zimpl-3.3.2/src/elem.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/elem.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: elem.h,v 1.7 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: elem.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/entry.c zimpl-3.3.4/src/entry.c --- zimpl-3.3.2/src/entry.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/entry.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: entry.c,v 1.23 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: entry.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/entry.h zimpl-3.3.4/src/entry.h --- zimpl-3.3.2/src/entry.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/entry.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: entry.h,v 1.7 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: entry.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/gmpmisc.c zimpl-3.3.4/src/gmpmisc.c --- zimpl-3.3.2/src/gmpmisc.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/gmpmisc.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: gmpmisc.c,v 1.13 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratmisc.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/gmpmisc.h zimpl-3.3.4/src/gmpmisc.h --- zimpl-3.3.2/src/gmpmisc.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/gmpmisc.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: gmpmisc.h,v 1.10 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: gmpmisc.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/hash.c zimpl-3.3.4/src/hash.c --- zimpl-3.3.2/src/hash.c 2014-01-12 09:49:54.000000000 +0000 +++ zimpl-3.3.4/src/hash.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: hash.c,v 1.37 2014/01/12 09:49:54 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: hash.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -360,7 +359,6 @@ int sum = 0; int zeros = 0; int filled = 0; - int count; double avg = 0.0; unsigned int i; @@ -369,7 +367,7 @@ for(i = 0; i < hash->size; i++) { - count = 0; + int count = 0; for(he = hash->bucket[i]; he != NULL; he = he->next) count++; diff -Nru zimpl-3.3.2/src/hash.h zimpl-3.3.4/src/hash.h --- zimpl-3.3.2/src/hash.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/hash.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: hash.h,v 1.6 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: hash.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/heap.c zimpl-3.3.4/src/heap.c --- zimpl-3.3.2/src/heap.c 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/heap.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: heap.c,v 1.13 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: heap.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2006-2012 by Thorsten Koch + * Copyright (C) 2006-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/heap.h zimpl-3.3.4/src/heap.h --- zimpl-3.3.2/src/heap.h 2012-07-29 15:09:26.000000000 +0000 +++ zimpl-3.3.4/src/heap.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: heap.h,v 1.6 2012/07/29 15:09:26 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: heap.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2006-2012 by Thorsten Koch + * Copyright (C) 2006-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/idxset.c zimpl-3.3.4/src/idxset.c --- zimpl-3.3.2/src/idxset.c 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/idxset.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: idxset.c,v 1.21 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: idxset.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -134,7 +133,7 @@ tuple_print(fp, idxset->tuple); fputc('\n', fp); set_print(fp, idxset->set); - fprintf(fp, "\nAddr-Lexpr: %ld\n", (long)idxset->lexpr); + fprintf(fp, "\nAddr-Lexpr: %p\n", (void*)idxset->lexpr); } diff -Nru zimpl-3.3.2/src/idxset.h zimpl-3.3.4/src/idxset.h --- zimpl-3.3.2/src/idxset.h 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/idxset.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: idxset.h,v 1.6 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: idxset.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/inst.c zimpl-3.3.4/src/inst.c --- zimpl-3.3.2/src/inst.c 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/inst.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: inst.c,v 1.139 2014/01/12 09:47:38 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: inst.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -141,7 +140,6 @@ ConType type; Numb* rhs; unsigned int flags; - int res; Trace("i_constraint"); @@ -161,7 +159,7 @@ { /* If zero, trival ok, otherwise ... */ - res = numb_cmp(rhs, numb_zero()); + int res = numb_cmp(rhs, numb_zero()); assert(type != CON_RANGE); assert(type != CON_FREE); @@ -982,10 +980,8 @@ const IdxSet* idxset; const Set* set; const Tuple* pattern; - Tuple* tuple; CodeNode* lexpr; SetIter* iter; - const Numb* value; Numb* min = numb_new(); Bool first = TRUE; @@ -1008,7 +1004,7 @@ if (set_get_members(set) > 0) { - tuple = set_get_tuple(set, 0); + Tuple* tuple = set_get_tuple(set, 0); if (elem_get_type(tuple_get_elem(tuple, 0)) != ELEM_NUMB) { @@ -1024,7 +1020,7 @@ if (code_get_bool(code_eval(lexpr))) { - value = elem_get_numb(tuple_get_elem(tuple, 0)); + const Numb* value = elem_get_numb(tuple_get_elem(tuple, 0)); if (first || numb_cmp(value, min) < 0) { @@ -1114,10 +1110,8 @@ const IdxSet* idxset; const Set* set; const Tuple* pattern; - Tuple* tuple; CodeNode* lexpr; SetIter* iter; - const Numb* value; Numb* max = numb_new(); Bool first = TRUE; @@ -1139,7 +1133,7 @@ } if (set_get_members(set) > 0) { - tuple = set_get_tuple(set, 0); + Tuple* tuple = set_get_tuple(set, 0); if (elem_get_type(tuple_get_elem(tuple, 0)) != ELEM_NUMB) { @@ -1155,7 +1149,7 @@ if (code_get_bool(code_eval(lexpr))) { - value = elem_get_numb(tuple_get_elem(tuple, 0)); + const Numb* value = elem_get_numb(tuple_get_elem(tuple, 0)); if (first || numb_cmp(value, max) > 0) { @@ -1265,8 +1259,6 @@ CodeNode* i_expr_min2(CodeNode* self) { const List* list; - const Numb* numb; - const Elem* elem; Numb* min; ListElem* le = NULL; int n; @@ -1284,7 +1276,8 @@ while(n-- > 0) { - elem = list_get_elem(list, &le); + const Elem* elem = list_get_elem(list, &le); + const Numb* numb; /* Are there only number in the selection tuple ? */ @@ -1312,8 +1305,6 @@ CodeNode* i_expr_max2(CodeNode* self) { const List* list; - const Numb* numb; - const Elem* elem; Numb* max; ListElem* le = NULL; int n; @@ -1331,7 +1322,8 @@ while(n-- > 0) { - elem = list_get_elem(list, &le); + const Numb* numb; + const Elem* elem = list_get_elem(list, &le); /* Are there only number in the selection tuple ? */ @@ -1792,8 +1784,6 @@ const Set* set_b) { Tuple* tuple_b; - ElemType elem_type_a; - ElemType elem_type_b; int i; int dim; @@ -1821,8 +1811,8 @@ for(i = 0; i < tuple_get_dim(tuple_a); i++) { - elem_type_a = elem_get_type(tuple_get_elem(tuple_a, i)); - elem_type_b = elem_get_type(tuple_get_elem(tuple_b, i)); + ElemType elem_type_a = elem_get_type(tuple_get_elem(tuple_a, i)); + ElemType elem_type_b = elem_get_type(tuple_get_elem(tuple_b, i)); assert(elem_type_b == ELEM_NUMB || elem_type_b == ELEM_STRG); @@ -2529,10 +2519,7 @@ { const Set* set_a; const Tuple* tuple; - const Elem* elem; - const Numb* numb; int dim; - int idx; int i; Trace("i_set_proj"); @@ -2545,7 +2532,9 @@ for(i = 0; i < tuple_get_dim(tuple); i++) { - elem = tuple_get_elem(tuple, i); + const Elem* elem = tuple_get_elem(tuple, i); + const Numb* numb; + int idx; /* Are there only number in the selection tuple ? */ @@ -2899,8 +2888,6 @@ Symbol* sym; const List* list; ListElem* lelem; - const Entry* entry; - const Tuple* tuple; int count; int i; @@ -2939,8 +2926,8 @@ for(i = 0; i < count; i++) { - entry = list_get_entry(list, &lelem); - tuple = entry_get_tuple(entry); + const Entry* entry = list_get_entry(list, &lelem); + const Tuple* tuple = entry_get_tuple(entry); #if 0 if (set_get_dim(iset) != tuple_get_dim(tuple)) { @@ -2985,7 +2972,6 @@ int count = 0; Tuple* tuple; int list_entries; - const Entry* entry; Entry* new_entry; list_entries = list_get_elems(list); @@ -2995,7 +2981,7 @@ { /* bool is not needed, because iset has only true elems */ - entry = list_get_entry(list, &le_idx); + const Entry* entry = list_get_entry(list, &le_idx); switch(entry_get_type(entry)) { @@ -3047,8 +3033,6 @@ const List* list) { ListElem* le_idx = NULL; - const Entry* entry; - const Tuple* tuple; int list_entries; int i; @@ -3056,8 +3040,8 @@ for(i = 0; i < list_entries; i++) { - entry = list_get_entry(list, &le_idx); - tuple = entry_get_tuple(entry); + const Entry* entry = list_get_entry(list, &le_idx); + const Tuple* tuple = entry_get_tuple(entry); #if 0 if (set_get_dim(iset) != tuple_get_dim(tuple)) { @@ -3102,7 +3086,6 @@ const List* list; CodeNode* child3; const Entry* deflt = ENTRY_NULL; - Symbol* sym; int list_entries; ListElem* le_idx; @@ -3173,6 +3156,8 @@ } else { + Symbol* sym; + if (set_get_members(iset) == 0) { fprintf(stderr, "*** Error 135: Empty index set for parameter\n"); @@ -3298,10 +3283,6 @@ VarClass varclass; Var* var; SetIter* iter; - Bound* lower; - Bound* upper; - const Numb* priority; - const Numb* startval; char* tuplestr; char* varname; Numb* temp; @@ -3321,14 +3302,19 @@ warn_if_pattern_has_no_name(code_get_child(self, 1), pattern); while((tuple = set_iter_next(iter, iset)) != NULL) - { - local_install_tuple(pattern, tuple); + { + Bound* lower; + Bound* upper; + const Numb* priority; + const Numb* startval; - lower = bound_copy(code_eval_child_bound(self, 3)); - upper = bound_copy(code_eval_child_bound(self, 4)); - priority = code_eval_child_numb(self, 5); - startval = code_eval_child_numb(self, 6); + local_install_tuple(pattern, tuple); + lower = bound_copy(code_eval_child_bound(self, 3)); + upper = bound_copy(code_eval_child_bound(self, 4)); + priority = code_eval_child_numb(self, 5); + startval = code_eval_child_numb(self, 6); + /* Parser makes sure, cannot happen */ assert(bound_get_type(lower) != BOUND_INFTY); @@ -3526,19 +3512,20 @@ term = code_eval_child_term(self, 0); power = checked_eval_numb_toint(self, 1, "112: Exponent value"); + + if (power < 0) + { + fprintf(stderr, "*** Error 121: Negative exponent on variable\n"); + code_errmsg(code_get_child(self, 0)); + zpl_exit(EXIT_FAILURE); + } if (power == 0) { term_result = term_new(1); term_add_constant(term_result, numb_one()); } - else if (power < 0) - { - fprintf(stderr, "*** Error 121: Negative exponent on variable\n"); - code_errmsg(code_get_child(self, 0)); - zpl_exit(EXIT_FAILURE); - } - else + else { term_result = term_copy(term); diff -Nru zimpl-3.3.2/src/inst.h zimpl-3.3.4/src/inst.h --- zimpl-3.3.2/src/inst.h 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/inst.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: inst.h,v 1.53 2014/01/12 09:47:38 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: inst.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/iread.c zimpl-3.3.4/src/iread.c --- zimpl-3.3.2/src/iread.c 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/iread.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: iread.c,v 1.40 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: iread.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -283,7 +282,6 @@ param_field[0] = 0; param_type [0] = t[0]; - params = 1; *hi_field_no = MAX_FIELDS - 1; free(temp); @@ -364,9 +362,7 @@ static int split_fields(char* s, int hi_field_no, char* field[]) { char* t = s; - char* u; int fields = 0; - Bool new_field; assert(s != NULL); assert(hi_field_no >= 0); @@ -375,7 +371,7 @@ for(;;) { - new_field = FALSE; + Bool new_field = FALSE; switch(*s) { @@ -404,7 +400,7 @@ assert(fields < MAX_FIELDS); /*xint --e{661} Possible access of out-of-bounds pointer */ - u = s; + char* u = s; field[fields] = t; fields++; @@ -497,7 +493,6 @@ char** field, int param_type) /* param_type[0] */ { - Tuple* tuple; Elem* elem; Numb* numb; int i; @@ -511,7 +506,7 @@ for(i = 0; i < fields; i++) { - tuple = tuple_new(1); + Tuple* tuple = tuple_new(1); if (param_type == 'n') { @@ -557,7 +552,6 @@ const int* param_type) { Tuple* tuple; - Entry* entry; Elem* elem; Numb* numb; char* t; @@ -616,6 +610,8 @@ } else { + Entry* entry; + if (param_field[i] >= fields) { fprintf(stderr, "*** Error 157: Not enough fields in data (value)\n"); @@ -664,7 +660,6 @@ CodeNode* i_read(CodeNode* self) { MFP* fp; - char* s; char* buf; char** field; int fields; @@ -681,7 +676,6 @@ const char* match; int skip; int use; - int line = 0; regex_t regex; Trace("i_read"); @@ -740,11 +734,15 @@ } else { + int line = 0; + if (verbose >= VERB_NORMAL) printf("Reading %s\n", filename); while(NULL != (buf = mio_get_line(fp))) { + char* s; + /* Count the line */ line++; diff -Nru zimpl-3.3.2/src/lint.h zimpl-3.3.4/src/lint.h --- zimpl-3.3.2/src/lint.h 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/lint.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: lint.h,v 1.18 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: lint.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -25,13 +24,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifndef _LINT_H_ +#define _LINT_H_ + /* Use this file only if we are linting */ #ifdef _lint -#ifndef _LINT_H_ -#define _LINT_H_ - #ifdef __cplusplus extern "C" { #endif @@ -93,8 +92,17 @@ #ifdef __cplusplus } #endif -#endif /* _LINT_H_ */ #endif /* _lint */ +#if defined(__GNUC__) || defined(__CLANG__) +#define UNUSED __attribute__ ((unused)) +#define NORETURN __attribute__ ((noreturn)) +#else +#define UNUSED +#define NORETURN +#endif /* __GNUC__ || __CLANG__ */ + +#endif /* _LINT_H_ */ + diff -Nru zimpl-3.3.2/src/list.c zimpl-3.3.4/src/list.c --- zimpl-3.3.2/src/list.c 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/list.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: list.c,v 1.31 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: list.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/list.h zimpl-3.3.4/src/list.h --- zimpl-3.3.2/src/list.h 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/list.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: list.h,v 1.6 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: list.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/load.c zimpl-3.3.4/src/load.c --- zimpl-3.3.2/src/load.c 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/load.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: load.c,v 1.42 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: load.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -86,10 +85,11 @@ { Bool in_string = FALSE; int cnt = 0; - int c; for(;;) { + int c; + assert(cnt <= *size); if (cnt == *size - 1) @@ -158,8 +158,6 @@ const char* pathname, const char* filename) { - char* s; - assert(target != NULL); assert(pathname != NULL); assert(filename != NULL); @@ -169,6 +167,8 @@ strcpy(target, filename); else { + char* s; + strcpy(target, pathname); if (NULL == (s = strrchr(target, DIRSEP))) diff -Nru zimpl-3.3.2/src/local.c zimpl-3.3.4/src/local.c --- zimpl-3.3.2/src/local.c 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/local.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: local.c,v 1.23 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: local.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -122,7 +121,6 @@ void local_install_tuple(const Tuple* pattern, const Tuple* values) { - const Elem* elem; const char* name; int i; @@ -135,7 +133,7 @@ for(i = 0; i < tuple_get_dim(pattern); i++) { - elem = tuple_get_elem(pattern, i); + const Elem* elem = tuple_get_elem(pattern, i); if (elem_get_type(elem) == ELEM_NAME) { diff -Nru zimpl-3.3.2/src/local.h zimpl-3.3.4/src/local.h --- zimpl-3.3.2/src/local.h 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/local.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: local.h,v 1.6 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: local.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/metaio.c zimpl-3.3.4/src/metaio.c --- zimpl-3.3.2/src/metaio.c 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/src/metaio.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: metaio.c,v 1.20 2014/01/12 11:07:04 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: metaio.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2006-2012 by Thorsten Koch + * Copyright (C) 2006-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -144,7 +143,6 @@ static char* strgfile_gets(StrgFile* sf, char* buf, int size) { char* s = NULL; - int i = 0; assert(strgfile_is_valid(sf)); assert(buf != NULL); @@ -152,6 +150,8 @@ if (sf->offset < sf->length) { + int i = 0; + while(sf->offset < sf->length && i < size - 1) { assert(sf->content[sf->offset] != '\0'); @@ -367,16 +367,16 @@ char* mio_get_line(const MFP* mfp) { int size = 1; - int pos; char* buf = NULL; char* s; - char* t; assert(mfp_is_valid(mfp)); do { - pos = size - 1; + char* t; + int pos = size - 1; + size += BUF_SIZE_INC - 1; buf = (buf == NULL) ? malloc((size_t)size) : realloc(buf, (size_t)size); t = &buf[pos]; @@ -400,7 +400,7 @@ /* Setup for internal test */ static const char* const progstrg = - "# $Id: metaio.c,v 1.20 2014/01/12 11:07:04 bzfkocht Exp $\n" + "# $Id: metaio.c,v 1.21 2014/03/03 16:44:14 bzfkocht Exp $\n" "#\n" "# Generic formulation of the Travelling Salesmen Problem\n" "#\n" diff -Nru zimpl-3.3.2/src/metaio.h zimpl-3.3.4/src/metaio.h --- zimpl-3.3.2/src/metaio.h 2012-07-29 15:09:27.000000000 +0000 +++ zimpl-3.3.4/src/metaio.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: metaio.h,v 1.6 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: metaio.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2006-2012 by Thorsten Koch + * Copyright (C) 2006-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/mme.h zimpl-3.3.4/src/mme.h --- zimpl-3.3.2/src/mme.h 2014-02-28 10:03:53.690952796 +0000 +++ zimpl-3.3.4/src/mme.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: mme.h,v 1.103 2013/01/04 16:23:12 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mme.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/mmlparse2.c zimpl-3.3.4/src/mmlparse2.c --- zimpl-3.3.2/src/mmlparse2.c 2014-01-29 12:04:35.081751782 +0000 +++ zimpl-3.3.4/src/mmlparse2.c 2017-03-08 13:12:45.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.6.5. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 3 of the License, 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, see . */ @@ -26,7 +26,7 @@ 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. */ @@ -44,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.6.5" +#define YYBISON_VERSION "3.0.4" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -62,10 +62,8 @@ /* Copy the first part of user declarations. */ -/* Line 360 of yacc.c */ -#line 1 "src/mmlparse2.y" +#line 1 "src/mmlparse2.y" /* yacc.c:339 */ -#pragma ident "@(#) $Id: mmlparse2.y,v 1.13 2014/01/12 09:47:38 bzfkocht Exp $" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mmlparse2.y */ @@ -75,7 +73,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -104,7 +102,14 @@ /*lint -esym(768,bits) -esym(553,YYSTACK_USE_ALLOCA) */ /*lint -esym(593,yymsg) Custodial pointer possibly not freed */ /*lint -esym(426,mem_malloc) call violates semantics */ - + +#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" +#pragma clang diagnostic ignored "-Wconversion" +#pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic ignored "-Wunused-macros" +#pragma clang diagnostic ignored "-Wimplicit-function-declaration" +#pragma clang diagnostic ignored "-Wunreachable-code" + #include #include #include @@ -134,18 +139,23 @@ #define YYERROR_VERBOSE 1 +/* the function is actually getting a YYSTYPE* as argument, but the + * type isn't available here, so it is decalred to accept any number of + * arguments, i.e. yylex() and not yylex(void). + */ +extern int yylex(); + /*lint -sem(yyerror, 1p && nulterm(1), r_no) */ extern void yyerror(const char* s); -/* Line 360 of yacc.c */ -#line 143 "src/mmlparse2.c" +#line 153 "src/mmlparse2.c" /* yacc.c:339 */ -# ifndef YY_NULL +# ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULL nullptr +# define YY_NULLPTR nullptr # else -# define YY_NULL 0 +# define YY_NULLPTR 0 # endif # endif @@ -161,7 +171,7 @@ by #include "mmlparse2.h". */ #ifndef YY_YY_SRC_MMLPARSE2_H_INCLUDED # define YY_YY_SRC_MMLPARSE2_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -169,132 +179,131 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - DECLSET = 258, - DECLPAR = 259, - DECLVAR = 260, - DECLMIN = 261, - DECLMAX = 262, - DECLSUB = 263, - DECLSOS = 264, - DEFNUMB = 265, - DEFSTRG = 266, - DEFBOOL = 267, - DEFSET = 268, - PRINT = 269, - CHECK = 270, - BINARY = 271, - INTEGER = 272, - REAL = 273, - IMPLICIT = 274, - ASGN = 275, - DO = 276, - WITH = 277, - IN = 278, - TO = 279, - UNTIL = 280, - BY = 281, - FORALL = 282, - EXISTS = 283, - PRIORITY = 284, - STARTVAL = 285, - DEFAULT = 286, - CMP_LE = 287, - CMP_GE = 288, - CMP_EQ = 289, - CMP_LT = 290, - CMP_GT = 291, - CMP_NE = 292, - INFTY = 293, - AND = 294, - OR = 295, - XOR = 296, - NOT = 297, - SUM = 298, - MIN = 299, - MAX = 300, - ARGMIN = 301, - ARGMAX = 302, - PROD = 303, - IF = 304, - THEN = 305, - ELSE = 306, - END = 307, - INTER = 308, - UNION = 309, - CROSS = 310, - SYMDIFF = 311, - WITHOUT = 312, - PROJ = 313, - MOD = 314, - DIV = 315, - POW = 316, - FAC = 317, - CARD = 318, - ROUND = 319, - FLOOR = 320, - CEIL = 321, - RANDOM = 322, - ORD = 323, - ABS = 324, - SGN = 325, - LOG = 326, - LN = 327, - EXP = 328, - SQRT = 329, - SIN = 330, - COS = 331, - TAN = 332, - ASIN = 333, - ACOS = 334, - ATAN = 335, - POWER = 336, - SGNPOW = 337, - READ = 338, - AS = 339, - SKIP = 340, - USE = 341, - COMMENT = 342, - MATCH = 343, - SUBSETS = 344, - INDEXSET = 345, - POWERSET = 346, - VIF = 347, - VABS = 348, - TYPE1 = 349, - TYPE2 = 350, - LENGTH = 351, - SUBSTR = 352, - NUMBSYM = 353, - STRGSYM = 354, - VARSYM = 355, - SETSYM = 356, - NUMBDEF = 357, - STRGDEF = 358, - BOOLDEF = 359, - SETDEF = 360, - DEFNAME = 361, - NAME = 362, - STRG = 363, - NUMB = 364, - SCALE = 365, - SEPARATE = 366, - CHECKONLY = 367, - INDICATOR = 368 - }; + enum yytokentype + { + DECLSET = 258, + DECLPAR = 259, + DECLVAR = 260, + DECLMIN = 261, + DECLMAX = 262, + DECLSUB = 263, + DECLSOS = 264, + DEFNUMB = 265, + DEFSTRG = 266, + DEFBOOL = 267, + DEFSET = 268, + PRINT = 269, + CHECK = 270, + BINARY = 271, + INTEGER = 272, + REAL = 273, + IMPLICIT = 274, + ASGN = 275, + DO = 276, + WITH = 277, + IN = 278, + TO = 279, + UNTIL = 280, + BY = 281, + FORALL = 282, + EXISTS = 283, + PRIORITY = 284, + STARTVAL = 285, + DEFAULT = 286, + CMP_LE = 287, + CMP_GE = 288, + CMP_EQ = 289, + CMP_LT = 290, + CMP_GT = 291, + CMP_NE = 292, + INFTY = 293, + AND = 294, + OR = 295, + XOR = 296, + NOT = 297, + SUM = 298, + MIN = 299, + MAX = 300, + ARGMIN = 301, + ARGMAX = 302, + PROD = 303, + IF = 304, + THEN = 305, + ELSE = 306, + END = 307, + INTER = 308, + UNION = 309, + CROSS = 310, + SYMDIFF = 311, + WITHOUT = 312, + PROJ = 313, + MOD = 314, + DIV = 315, + POW = 316, + FAC = 317, + CARD = 318, + ROUND = 319, + FLOOR = 320, + CEIL = 321, + RANDOM = 322, + ORD = 323, + ABS = 324, + SGN = 325, + LOG = 326, + LN = 327, + EXP = 328, + SQRT = 329, + SIN = 330, + COS = 331, + TAN = 332, + ASIN = 333, + ACOS = 334, + ATAN = 335, + POWER = 336, + SGNPOW = 337, + READ = 338, + AS = 339, + SKIP = 340, + USE = 341, + COMMENT = 342, + MATCH = 343, + SUBSETS = 344, + INDEXSET = 345, + POWERSET = 346, + VIF = 347, + VABS = 348, + TYPE1 = 349, + TYPE2 = 350, + LENGTH = 351, + SUBSTR = 352, + NUMBSYM = 353, + STRGSYM = 354, + VARSYM = 355, + SETSYM = 356, + NUMBDEF = 357, + STRGDEF = 358, + BOOLDEF = 359, + SETDEF = 360, + DEFNAME = 361, + NAME = 362, + STRG = 363, + NUMB = 364, + SCALE = 365, + SEPARATE = 366, + CHECKONLY = 367, + INDICATOR = 368 + }; #endif - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 376 of yacc.c */ -#line 79 "src/mmlparse2.y" +#line 91 "src/mmlparse2.y" /* yacc.c:355 */ unsigned int bits; Numb* numb; @@ -304,36 +313,23 @@ Define* def; CodeNode* code; +#line 317 "src/mmlparse2.c" /* yacc.c:355 */ +}; -/* Line 376 of yacc.c */ -#line 310 "src/mmlparse2.c" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus + int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_SRC_MMLPARSE2_H_INCLUDED */ /* Copy the second part of user declarations. */ -/* Line 379 of yacc.c */ -#line 337 "src/mmlparse2.c" +#line 333 "src/mmlparse2.c" /* yacc.c:358 */ #ifdef short # undef short @@ -347,11 +343,8 @@ #ifdef YYTYPE_INT8 typedef YYTYPE_INT8 yytype_int8; -#elif (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -typedef signed char yytype_int8; #else -typedef short int yytype_int8; +typedef signed char yytype_int8; #endif #ifdef YYTYPE_UINT16 @@ -371,8 +364,7 @@ # 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) +# elif ! defined YYSIZE_T # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else @@ -394,6 +386,33 @@ # endif #endif +#ifndef YY_ATTRIBUTE +# if (defined __GNUC__ \ + && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ + || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C +# define YY_ATTRIBUTE(Spec) __attribute__(Spec) +# else +# define YY_ATTRIBUTE(Spec) /* empty */ +# endif +#endif + +#ifndef YY_ATTRIBUTE_PURE +# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) +#endif + +#ifndef YY_ATTRIBUTE_UNUSED +# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) +#endif + +#if !defined _Noreturn \ + && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) +# if defined _MSC_VER && 1200 <= _MSC_VER +# define _Noreturn __declspec (noreturn) +# else +# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) +# endif +#endif + /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -401,23 +420,25 @@ # 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 yyi) +#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +/* Suppress an incorrect diagnostic about yylval being uninitialized. */ +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ + _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") +# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ + _Pragma ("GCC diagnostic pop") #else -static int -YYID (yyi) - int yyi; +# define YY_INITIAL_VALUE(Value) Value #endif -{ - return yyi; -} +#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN +# define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif +#ifndef YY_INITIAL_VALUE +# define YY_INITIAL_VALUE(Value) /* Nothing. */ +#endif + #if ! defined yyoverflow || YYERROR_VERBOSE @@ -436,8 +457,7 @@ # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS @@ -449,8 +469,8 @@ # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) + /* Pacify GCC's 'empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (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 @@ -466,7 +486,7 @@ # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) + && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 @@ -474,15 +494,13 @@ # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif @@ -492,7 +510,7 @@ #if (! defined yyoverflow \ && (! defined __cplusplus \ - || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc @@ -517,16 +535,16 @@ 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_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (YYID (0)) +# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ + do \ + { \ + YYSIZE_T yynewbytes; \ + YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ + Stack = &yyptr->Stack_alloc; \ + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ + yyptr += yynewbytes / sizeof (*yyptr); \ + } \ + while (0) #endif @@ -545,7 +563,7 @@ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ - while (YYID (0)) + while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ @@ -561,17 +579,19 @@ #define YYNNTS 59 /* YYNRULES -- Number of rules. */ #define YYNRULES 307 -/* YYNRULES -- Number of states. */ +/* YYNSTATES -- Number of states. */ #define YYNSTATES 920 -/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned + by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 368 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) -/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ +/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, without out-of-bounds checking. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -614,232 +634,40 @@ }; #if YYDEBUG -/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in - YYRHS. */ -static const yytype_uint16 yyprhs[] = -{ - 0, 0, 3, 5, 7, 9, 11, 13, 15, 17, - 19, 21, 23, 25, 31, 40, 49, 57, 59, 63, - 70, 79, 84, 87, 96, 105, 114, 123, 125, 129, - 139, 148, 154, 156, 158, 160, 161, 164, 174, 181, - 190, 196, 206, 213, 225, 234, 235, 237, 240, 241, - 244, 248, 258, 268, 269, 272, 275, 284, 293, 294, - 297, 298, 301, 303, 307, 309, 312, 315, 319, 323, - 328, 334, 340, 346, 348, 352, 357, 363, 371, 376, - 381, 386, 391, 398, 405, 412, 419, 432, 445, 458, - 471, 484, 497, 510, 523, 536, 549, 562, 575, 588, - 601, 614, 627, 636, 645, 654, 663, 667, 671, 675, - 679, 683, 687, 691, 695, 699, 703, 707, 711, 715, - 719, 723, 727, 731, 735, 739, 743, 747, 750, 754, - 755, 759, 761, 763, 765, 767, 769, 771, 773, 775, - 779, 783, 787, 791, 795, 799, 801, 805, 809, 813, - 817, 819, 822, 825, 827, 831, 836, 839, 844, 849, - 854, 859, 864, 869, 874, 879, 884, 889, 896, 903, - 911, 915, 921, 926, 931, 932, 934, 936, 940, 943, - 946, 949, 952, 955, 960, 962, 964, 970, 974, 976, - 980, 984, 988, 992, 996, 1000, 1002, 1007, 1009, 1013, - 1017, 1022, 1025, 1030, 1033, 1041, 1047, 1055, 1061, 1066, - 1074, 1079, 1087, 1091, 1095, 1099, 1103, 1109, 1115, 1122, - 1127, 1135, 1140, 1143, 1146, 1149, 1152, 1155, 1157, 1161, - 1163, 1167, 1171, 1175, 1179, 1183, 1187, 1191, 1195, 1199, - 1203, 1207, 1211, 1215, 1219, 1223, 1226, 1230, 1234, 1239, - 1244, 1252, 1255, 1259, 1260, 1264, 1266, 1270, 1272, 1276, - 1280, 1282, 1286, 1290, 1294, 1298, 1303, 1305, 1308, 1311, - 1313, 1317, 1322, 1327, 1332, 1337, 1342, 1344, 1346, 1348, - 1351, 1354, 1359, 1364, 1367, 1372, 1377, 1382, 1387, 1392, - 1397, 1402, 1407, 1412, 1417, 1422, 1427, 1432, 1437, 1442, - 1447, 1451, 1456, 1465, 1472, 1480, 1489, 1494 -}; - -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const yytype_int16 yyrhs[] = -{ - 127, 0, -1, 128, -1, 136, -1, 139, -1, 149, - -1, 150, -1, 162, -1, 131, -1, 132, -1, 133, - -1, 134, -1, 165, -1, 3, 107, 20, 169, 117, - -1, 3, 107, 118, 167, 119, 20, 169, 117, -1, - 3, 107, 118, 167, 119, 20, 129, 117, -1, 3, - 107, 118, 119, 20, 129, 117, -1, 130, -1, 129, - 120, 130, -1, 89, 121, 169, 120, 180, 122, -1, - 89, 121, 169, 120, 180, 120, 180, 122, -1, 91, - 121, 169, 122, -1, 177, 169, -1, 10, 106, 121, - 135, 122, 20, 180, 117, -1, 11, 106, 121, 135, - 122, 20, 180, 117, -1, 12, 106, 121, 135, 122, - 20, 176, 117, -1, 13, 106, 121, 135, 122, 20, - 169, 117, -1, 107, -1, 135, 120, 107, -1, 4, - 107, 118, 167, 119, 20, 145, 138, 117, -1, 4, - 107, 118, 167, 119, 20, 180, 117, -1, 4, 107, - 20, 137, 117, -1, 4, -1, 145, -1, 180, -1, - -1, 31, 180, -1, 5, 107, 118, 167, 119, 140, - 141, 142, 117, -1, 5, 107, 140, 141, 142, 117, - -1, 5, 107, 118, 167, 119, 19, 16, 117, -1, - 5, 107, 19, 16, 117, -1, 5, 107, 118, 167, - 119, 16, 143, 144, 117, -1, 5, 107, 16, 143, - 144, 117, -1, 5, 107, 118, 167, 119, 17, 141, - 142, 143, 144, 117, -1, 5, 107, 17, 141, 142, - 143, 144, 117, -1, -1, 18, -1, 19, 17, -1, - -1, 33, 180, -1, 33, 115, 38, -1, 33, 49, - 176, 50, 180, 51, 115, 38, 52, -1, 33, 49, - 176, 50, 115, 38, 51, 180, 52, -1, -1, 32, - 180, -1, 32, 38, -1, 32, 49, 176, 50, 180, - 51, 38, 52, -1, 32, 49, 176, 50, 38, 51, - 180, 52, -1, -1, 29, 180, -1, -1, 30, 180, - -1, 146, -1, 145, 120, 146, -1, 173, -1, 147, - 148, -1, 177, 180, -1, 22, 179, 22, -1, 147, - 179, 22, -1, 148, 147, 179, 22, -1, 6, 107, - 21, 157, 117, -1, 7, 107, 21, 157, 117, -1, - 8, 107, 21, 151, 117, -1, 152, -1, 151, 39, - 152, -1, 27, 167, 21, 151, -1, 49, 176, 50, - 151, 52, -1, 49, 176, 50, 151, 51, 151, 52, - -1, 157, 156, 157, 154, -1, 157, 156, 180, 154, - -1, 180, 156, 157, 154, -1, 180, 156, 180, 154, - -1, 180, 156, 157, 32, 180, 154, -1, 180, 156, - 180, 32, 180, 154, -1, 180, 156, 157, 33, 180, - 154, -1, 180, 156, 180, 33, 180, 154, -1, 92, - 153, 50, 157, 156, 157, 51, 157, 156, 157, 52, - 154, -1, 92, 153, 50, 180, 156, 157, 51, 157, - 156, 157, 52, 154, -1, 92, 153, 50, 157, 156, - 180, 51, 157, 156, 157, 52, 154, -1, 92, 153, - 50, 157, 156, 157, 51, 180, 156, 157, 52, 154, - -1, 92, 153, 50, 157, 156, 157, 51, 157, 156, - 180, 52, 154, -1, 92, 153, 50, 180, 156, 180, - 51, 157, 156, 157, 52, 154, -1, 92, 153, 50, - 180, 156, 157, 51, 180, 156, 157, 52, 154, -1, - 92, 153, 50, 180, 156, 157, 51, 157, 156, 180, - 52, 154, -1, 92, 153, 50, 157, 156, 180, 51, - 180, 156, 157, 52, 154, -1, 92, 153, 50, 157, - 156, 180, 51, 157, 156, 180, 52, 154, -1, 92, - 153, 50, 157, 156, 157, 51, 180, 156, 180, 52, - 154, -1, 92, 153, 50, 180, 156, 180, 51, 180, - 156, 157, 52, 154, -1, 92, 153, 50, 180, 156, - 180, 51, 157, 156, 180, 52, 154, -1, 92, 153, - 50, 180, 156, 157, 51, 180, 156, 180, 52, 154, - -1, 92, 153, 50, 157, 156, 180, 51, 180, 156, - 180, 52, 154, -1, 92, 153, 50, 180, 156, 180, - 51, 180, 156, 180, 52, 154, -1, 92, 153, 50, - 157, 156, 157, 52, 154, -1, 92, 153, 50, 180, - 156, 157, 52, 154, -1, 92, 153, 50, 157, 156, - 180, 52, 154, -1, 92, 153, 50, 180, 156, 180, - 52, 154, -1, 157, 37, 157, -1, 180, 37, 157, - -1, 157, 37, 180, -1, 157, 34, 157, -1, 180, - 34, 157, -1, 157, 34, 180, -1, 157, 32, 157, - -1, 180, 32, 157, -1, 157, 32, 180, -1, 157, - 33, 157, -1, 180, 33, 157, -1, 157, 33, 180, - -1, 157, 35, 157, -1, 180, 35, 157, -1, 157, - 35, 180, -1, 157, 36, 157, -1, 180, 36, 157, - -1, 157, 36, 180, -1, 153, 39, 153, -1, 153, - 40, 153, -1, 153, 41, 153, -1, 42, 153, -1, - 121, 153, 122, -1, -1, 154, 120, 155, -1, 110, - -1, 111, -1, 112, -1, 113, -1, 32, -1, 33, - -1, 34, -1, 158, -1, 157, 114, 158, -1, 157, - 115, 158, -1, 157, 114, 181, -1, 157, 115, 181, - -1, 180, 114, 158, -1, 180, 115, 158, -1, 159, - -1, 158, 116, 182, -1, 158, 123, 182, -1, 181, - 116, 159, -1, 158, 116, 159, -1, 160, -1, 114, - 159, -1, 115, 159, -1, 161, -1, 161, 61, 182, - -1, 43, 167, 21, 158, -1, 100, 178, -1, 93, - 121, 157, 122, -1, 74, 121, 157, 122, -1, 71, - 121, 157, 122, -1, 73, 121, 157, 122, -1, 72, - 121, 157, 122, -1, 75, 121, 157, 122, -1, 76, - 121, 157, 122, -1, 77, 121, 157, 122, -1, 69, - 121, 157, 122, -1, 70, 121, 157, 122, -1, 81, - 121, 157, 120, 180, 122, -1, 82, 121, 157, 120, - 180, 122, -1, 49, 176, 50, 157, 51, 157, 52, - -1, 121, 157, 122, -1, 9, 107, 21, 163, 117, - -1, 164, 143, 21, 157, -1, 27, 167, 21, 163, - -1, -1, 94, -1, 95, -1, 21, 166, 117, -1, - 14, 179, -1, 14, 177, -1, 14, 169, -1, 14, - 100, -1, 15, 176, -1, 27, 167, 21, 166, -1, - 168, -1, 169, -1, 177, 23, 169, 22, 176, -1, - 177, 23, 169, -1, 170, -1, 169, 54, 170, -1, - 169, 114, 170, -1, 169, 56, 170, -1, 169, 115, - 170, -1, 169, 57, 170, -1, 169, 53, 170, -1, - 171, -1, 54, 167, 21, 171, -1, 172, -1, 171, - 55, 172, -1, 171, 116, 172, -1, 53, 167, 21, - 172, -1, 101, 178, -1, 105, 121, 179, 122, -1, - 124, 125, -1, 124, 180, 24, 180, 26, 180, 125, - -1, 124, 180, 24, 180, 125, -1, 124, 180, 25, - 180, 26, 180, 125, -1, 124, 180, 25, 180, 125, - -1, 46, 167, 21, 180, -1, 46, 121, 180, 122, - 167, 21, 180, -1, 47, 167, 21, 180, -1, 47, - 121, 180, 122, 167, 21, 180, -1, 121, 169, 122, - -1, 124, 175, 125, -1, 124, 179, 125, -1, 124, - 167, 125, -1, 124, 167, 21, 180, 125, -1, 124, - 167, 21, 177, 125, -1, 58, 121, 169, 120, 177, - 122, -1, 90, 121, 101, 122, -1, 49, 176, 50, - 169, 51, 169, 52, -1, 83, 180, 84, 180, -1, - 173, 174, -1, 85, 180, -1, 86, 180, -1, 87, - 180, -1, 88, 180, -1, 177, -1, 175, 120, 177, - -1, 173, -1, 180, 34, 180, -1, 180, 37, 180, - -1, 180, 36, 180, -1, 180, 33, 180, -1, 180, - 35, 180, -1, 180, 32, 180, -1, 169, 34, 169, - -1, 169, 37, 169, -1, 169, 36, 169, -1, 169, - 33, 169, -1, 169, 35, 169, -1, 169, 32, 169, - -1, 176, 39, 176, -1, 176, 40, 176, -1, 176, - 41, 176, -1, 42, 176, -1, 121, 176, 122, -1, - 177, 23, 169, -1, 28, 121, 167, 122, -1, 104, - 121, 179, 122, -1, 49, 176, 50, 176, 51, 176, - 52, -1, 35, 36, -1, 35, 179, 36, -1, -1, - 118, 179, 119, -1, 180, -1, 179, 120, 180, -1, - 181, -1, 180, 114, 181, -1, 180, 115, 181, -1, - 182, -1, 181, 116, 182, -1, 181, 123, 182, -1, - 181, 59, 182, -1, 181, 60, 182, -1, 48, 167, - 21, 182, -1, 183, -1, 114, 183, -1, 115, 183, - -1, 184, -1, 184, 61, 182, -1, 43, 167, 21, - 181, -1, 44, 168, 21, 182, -1, 45, 168, 21, - 182, -1, 44, 121, 167, 122, -1, 45, 121, 167, - 122, -1, 109, -1, 108, -1, 107, -1, 98, 178, - -1, 99, 178, -1, 102, 121, 179, 122, -1, 103, - 121, 179, 122, -1, 184, 62, -1, 63, 121, 169, - 122, -1, 69, 121, 180, 122, -1, 70, 121, 180, - 122, -1, 64, 121, 180, 122, -1, 65, 121, 180, - 122, -1, 66, 121, 180, 122, -1, 71, 121, 180, - 122, -1, 72, 121, 180, 122, -1, 73, 121, 180, - 122, -1, 74, 121, 180, 122, -1, 75, 121, 180, - 122, -1, 76, 121, 180, 122, -1, 77, 121, 180, - 122, -1, 78, 121, 180, 122, -1, 79, 121, 180, - 122, -1, 80, 121, 180, 122, -1, 121, 180, 122, - -1, 96, 121, 180, 122, -1, 97, 121, 180, 120, - 180, 120, 180, 122, -1, 67, 121, 180, 120, 180, - 122, -1, 49, 176, 50, 180, 51, 180, 52, -1, - 68, 121, 169, 120, 180, 120, 180, 122, -1, 44, - 121, 179, 122, -1, 45, 121, 179, 122, -1 -}; - -/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ + /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 148, 148, 149, 150, 151, 152, 153, 154, 155, - 156, 157, 158, 166, 173, 179, 185, 195, 196, 199, - 202, 205, 211, 220, 229, 238, 247, 256, 259, 269, - 272, 275, 282, 285, 286, 293, 294, 302, 309, 318, - 328, 339, 348, 358, 362, 372, 373, 374, 378, 381, - 382, 383, 388, 396, 397, 398, 399, 404, 412, 413, - 417, 418, 426, 427, 430, 431, 435, 439, 443, 446, - 458, 461, 471, 477, 480, 483, 488, 493, 501, 504, - 509, 514, 521, 525, 530, 534, 540, 543, 548, 553, - 558, 562, 569, 576, 582, 588, 594, 599, 607, 616, - 625, 633, 644, 647, 651, 656, 664, 665, 668, 671, - 672, 675, 678, 679, 682, 685, 686, 689, 692, 693, - 696, 699, 700, 703, 706, 707, 708, 709, 710, 714, - 715, 719, 720, 721, 722, 726, 727, 728, 732, 733, - 734, 735, 736, 739, 740, 748, 749, 750, 754, 755, - 759, 760, 761, 767, 768, 771, 777, 780, 781, 782, - 783, 784, 785, 786, 787, 788, 789, 790, 793, 796, - 799, 807, 813, 816, 822, 823, 824, 832, 836, 837, - 838, 839, 840, 841, 851, 852, 859, 862, 868, 869, - 870, 873, 874, 877, 878, 881, 882, 886, 887, 888, - 891, 895, 898, 903, 904, 907, 910, 913, 916, 919, - 922, 925, 928, 929, 930, 931, 932, 933, 934, 937, - 940, 946, 947, 951, 952, 953, 954, 958, 961, 964, - 968, 969, 970, 971, 972, 973, 974, 975, 976, 977, - 978, 979, 980, 981, 982, 983, 984, 985, 986, 987, - 992, 998, 999, 1003, 1006, 1012, 1015, 1021, 1022, 1023, - 1027, 1028, 1029, 1030, 1031, 1032, 1038, 1039, 1040, 1044, - 1045, 1046, 1049, 1052, 1055, 1058, 1064, 1065, 1066, 1069, - 1072, 1075, 1080, 1085, 1086, 1087, 1088, 1089, 1090, 1091, - 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100, 1101, - 1103, 1104, 1105, 1108, 1111, 1114, 1117, 1120 + 0, 160, 160, 161, 162, 163, 164, 165, 166, 167, + 168, 169, 170, 178, 185, 191, 197, 207, 208, 211, + 214, 217, 223, 232, 241, 250, 259, 268, 271, 281, + 284, 287, 294, 297, 298, 305, 306, 314, 321, 330, + 340, 351, 360, 370, 374, 384, 385, 386, 390, 393, + 394, 395, 400, 408, 409, 410, 411, 416, 424, 425, + 429, 430, 438, 439, 442, 443, 447, 451, 455, 458, + 470, 473, 483, 489, 492, 495, 500, 505, 513, 516, + 521, 526, 533, 537, 542, 546, 552, 555, 560, 565, + 570, 574, 581, 588, 594, 600, 606, 611, 619, 628, + 637, 645, 656, 659, 663, 668, 676, 677, 680, 683, + 684, 687, 690, 691, 694, 697, 698, 701, 704, 705, + 708, 711, 712, 715, 718, 719, 720, 721, 722, 726, + 727, 731, 732, 733, 734, 738, 739, 740, 744, 745, + 746, 747, 748, 751, 752, 760, 761, 762, 766, 767, + 771, 772, 773, 779, 780, 783, 789, 792, 793, 794, + 795, 796, 797, 798, 799, 800, 801, 802, 805, 808, + 811, 819, 825, 828, 834, 835, 836, 844, 848, 849, + 850, 851, 852, 853, 863, 864, 871, 874, 880, 881, + 882, 885, 886, 889, 890, 893, 894, 898, 899, 900, + 903, 907, 910, 915, 916, 919, 922, 925, 928, 931, + 934, 937, 940, 941, 942, 943, 944, 945, 946, 949, + 952, 958, 959, 963, 964, 965, 966, 970, 973, 976, + 980, 981, 982, 983, 984, 985, 986, 987, 988, 989, + 990, 991, 992, 993, 994, 995, 996, 997, 998, 999, + 1004, 1010, 1011, 1015, 1018, 1024, 1027, 1033, 1034, 1035, + 1039, 1040, 1041, 1042, 1043, 1044, 1050, 1051, 1052, 1056, + 1057, 1058, 1061, 1064, 1067, 1070, 1076, 1077, 1078, 1081, + 1084, 1087, 1092, 1097, 1098, 1099, 1100, 1101, 1102, 1103, + 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, + 1115, 1116, 1117, 1120, 1123, 1126, 1129, 1132 }; #endif @@ -873,13 +701,13 @@ "vfactor", "vexpo", "vval", "decl_sos", "soset", "sos_type", "exec_do", "command", "idxset", "pure_idxset", "sexpr", "sunion", "sproduct", "sval", "read", "read_par", "tuple_list", "lexpr", "tuple", "symidx", - "cexpr_list", "cexpr", "cproduct", "cfactor", "cexpo", "cval", YY_NULL + "cexpr_list", "cexpr", "cproduct", "cfactor", "cexpo", "cval", YY_NULLPTR }; #endif # ifdef YYPRINT -/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to - token YYLEX-NUM. */ +/* YYTOKNUM[NUM] -- (External) token number corresponding to the + (internal) symbol number NUM (which must be that of a token). */ static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, @@ -898,191 +726,18 @@ }; # endif -/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 126, 127, 127, 127, 127, 127, 127, 127, 127, - 127, 127, 127, 128, 128, 128, 128, 129, 129, 129, - 129, 129, 130, 131, 132, 133, 134, 135, 135, 136, - 136, 136, 136, 137, 137, 138, 138, 139, 139, 139, - 139, 139, 139, 139, 139, 140, 140, 140, 141, 141, - 141, 141, 141, 142, 142, 142, 142, 142, 143, 143, - 144, 144, 145, 145, 145, 145, 146, 147, 148, 148, - 149, 149, 150, 151, 151, 151, 151, 151, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 154, - 154, 155, 155, 155, 155, 156, 156, 156, 157, 157, - 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, - 159, 159, 159, 160, 160, 160, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 162, 163, 163, 164, 164, 164, 165, 166, 166, - 166, 166, 166, 166, 167, 167, 168, 168, 169, 169, - 169, 169, 169, 169, 169, 170, 170, 171, 171, 171, - 171, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, - 172, 173, 173, 174, 174, 174, 174, 175, 175, 175, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 177, 177, 178, 178, 179, 179, 180, 180, 180, - 181, 181, 181, 181, 181, 181, 182, 182, 182, 183, - 183, 183, 183, 183, 183, 183, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, - 184, 184, 184, 184, 184, 184, 184, 184 -}; +#define YYPACT_NINF -522 -/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 5, 8, 8, 7, 1, 3, 6, - 8, 4, 2, 8, 8, 8, 8, 1, 3, 9, - 8, 5, 1, 1, 1, 0, 2, 9, 6, 8, - 5, 9, 6, 11, 8, 0, 1, 2, 0, 2, - 3, 9, 9, 0, 2, 2, 8, 8, 0, 2, - 0, 2, 1, 3, 1, 2, 2, 3, 3, 4, - 5, 5, 5, 1, 3, 4, 5, 7, 4, 4, - 4, 4, 6, 6, 6, 6, 12, 12, 12, 12, - 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 8, 8, 8, 8, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 2, 3, 0, - 3, 1, 1, 1, 1, 1, 1, 1, 1, 3, - 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, - 1, 2, 2, 1, 3, 4, 2, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 6, 6, 7, - 3, 5, 4, 4, 0, 1, 1, 3, 2, 2, - 2, 2, 2, 4, 1, 1, 5, 3, 1, 3, - 3, 3, 3, 3, 3, 1, 4, 1, 3, 3, - 4, 2, 4, 2, 7, 5, 7, 5, 4, 7, - 4, 7, 3, 3, 3, 3, 5, 5, 6, 4, - 7, 4, 2, 2, 2, 2, 2, 1, 3, 1, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 2, 3, 3, 4, 4, - 7, 2, 3, 0, 3, 1, 3, 1, 3, 3, - 1, 3, 3, 3, 3, 4, 1, 2, 2, 1, - 3, 4, 4, 4, 4, 4, 1, 1, 1, 2, - 2, 4, 4, 2, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 3, 4, 8, 6, 7, 8, 4, 4 -}; +#define yypact_value_is_default(Yystate) \ + (!!((Yystate) == (-522))) -/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE doesn't specify something else to do. Zero - means the default is an error. */ -static const yytype_uint16 yydefact[] = -{ - 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 2, 8, 9, 10, 11, 3, - 4, 5, 6, 7, 12, 0, 0, 45, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 58, 48, 46, 0, 0, - 48, 0, 0, 0, 174, 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, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 253, 253, 181, 253, 0, 0, 0, 278, 277, - 276, 0, 0, 0, 0, 180, 188, 195, 197, 179, - 178, 255, 257, 260, 266, 269, 0, 0, 0, 0, - 0, 0, 182, 0, 0, 0, 0, 0, 184, 185, - 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, - 33, 62, 0, 64, 0, 34, 0, 0, 60, 0, - 53, 0, 47, 0, 53, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 253, - 0, 0, 0, 0, 138, 145, 150, 153, 0, 257, - 0, 0, 0, 0, 0, 73, 0, 0, 0, 175, - 176, 0, 58, 27, 0, 0, 0, 0, 251, 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, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 279, 280, 201, 0, - 0, 0, 267, 268, 0, 0, 203, 0, 229, 0, - 227, 0, 255, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 283, - 0, 245, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, - 0, 0, 31, 0, 0, 65, 0, 0, 0, 0, - 222, 66, 0, 59, 0, 0, 0, 0, 49, 0, - 58, 40, 45, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, - 0, 151, 152, 0, 0, 0, 0, 70, 0, 0, - 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, - 0, 0, 0, 72, 135, 136, 137, 0, 0, 0, - 171, 0, 0, 0, 0, 0, 0, 252, 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, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 212, - 300, 0, 215, 0, 213, 214, 0, 0, 194, 189, - 191, 193, 190, 192, 198, 199, 256, 258, 259, 263, - 264, 261, 262, 270, 0, 0, 0, 246, 241, 239, - 236, 240, 238, 237, 242, 243, 244, 247, 235, 233, - 230, 234, 232, 231, 0, 183, 187, 0, 0, 0, - 17, 0, 0, 67, 0, 0, 63, 0, 0, 223, - 224, 225, 226, 0, 61, 42, 0, 50, 55, 0, - 54, 60, 58, 48, 0, 48, 38, 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, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 170, 139, 141, 140, 142, 149, 146, 147, - 154, 143, 258, 144, 259, 148, 0, 0, 127, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 74, 129, - 129, 129, 129, 174, 0, 28, 0, 0, 0, 0, - 271, 274, 306, 272, 275, 307, 273, 0, 208, 0, - 210, 265, 0, 0, 200, 196, 0, 284, 287, 288, - 289, 0, 0, 285, 286, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 219, 301, 0, 254, 281, - 282, 202, 0, 0, 228, 0, 0, 248, 0, 0, - 0, 249, 0, 0, 0, 16, 0, 22, 0, 0, - 221, 68, 0, 35, 0, 0, 0, 0, 60, 53, - 0, 53, 155, 271, 0, 0, 165, 166, 159, 161, - 160, 158, 162, 163, 164, 0, 0, 157, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, - 0, 0, 0, 128, 124, 125, 126, 0, 0, 112, - 114, 115, 117, 109, 111, 118, 120, 121, 123, 106, - 108, 113, 116, 110, 119, 122, 107, 78, 79, 0, - 0, 80, 0, 0, 81, 173, 172, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 217, - 216, 0, 205, 0, 207, 0, 186, 0, 0, 18, - 15, 14, 69, 0, 0, 30, 0, 0, 0, 44, - 0, 58, 39, 0, 0, 0, 0, 0, 0, 0, - 76, 0, 0, 0, 129, 129, 129, 129, 23, 24, - 25, 26, 0, 0, 0, 0, 218, 303, 0, 0, - 0, 0, 0, 0, 21, 36, 29, 0, 0, 0, - 0, 41, 60, 37, 0, 167, 168, 0, 0, 0, - 0, 0, 0, 131, 132, 133, 134, 130, 82, 84, - 83, 85, 209, 211, 220, 304, 0, 0, 204, 206, - 250, 0, 0, 0, 0, 0, 0, 169, 77, 0, - 129, 0, 129, 0, 129, 0, 129, 305, 302, 0, - 19, 0, 0, 0, 0, 43, 0, 0, 102, 0, - 0, 104, 0, 0, 103, 0, 0, 105, 0, 52, - 51, 57, 56, 0, 0, 0, 0, 0, 0, 0, - 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 129, 129, - 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, - 129, 129, 129, 129, 86, 90, 89, 96, 88, 95, - 94, 100, 87, 93, 92, 99, 91, 98, 97, 101 -}; +#define YYTABLE_NINF -1 -/* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 13, 14, 469, 470, 15, 16, 17, 18, 194, - 19, 139, 744, 20, 50, 150, 320, 148, 315, 140, - 141, 142, 305, 21, 22, 184, 185, 359, 707, 807, - 367, 360, 174, 175, 176, 177, 23, 191, 192, 24, - 39, 127, 128, 129, 106, 107, 108, 143, 310, 249, - 122, 130, 236, 110, 178, 112, 113, 114, 115 -}; +#define yytable_value_is_error(Yytable_value) \ + 0 -/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -#define YYPACT_NINF -522 + /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing + STATE-NUM. */ static const yytype_int16 yypact[] = { 1403, -85, -38, -32, -24, -9, -1, 37, -16, 56, @@ -1179,7 +834,106 @@ 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153, 1153 }; -/* YYPGOTO[NTERM-NUM]. */ + /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE does not specify something else to do. Zero + means the default is an error. */ +static const yytype_uint16 yydefact[] = +{ + 0, 0, 32, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2, 8, 9, 10, 11, 3, + 4, 5, 6, 7, 12, 0, 0, 45, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 58, 48, 46, 0, 0, + 48, 0, 0, 0, 174, 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, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 253, 253, 181, 253, 0, 0, 0, 278, 277, + 276, 0, 0, 0, 0, 180, 188, 195, 197, 179, + 178, 255, 257, 260, 266, 269, 0, 0, 0, 0, + 0, 0, 182, 0, 0, 0, 0, 0, 184, 185, + 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, + 33, 62, 0, 64, 0, 34, 0, 0, 60, 0, + 53, 0, 47, 0, 53, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 253, + 0, 0, 0, 0, 138, 145, 150, 153, 0, 257, + 0, 0, 0, 0, 0, 73, 0, 0, 0, 175, + 176, 0, 58, 27, 0, 0, 0, 0, 251, 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, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 279, 280, 201, 0, + 0, 0, 267, 268, 0, 0, 203, 0, 229, 0, + 227, 0, 255, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 283, + 0, 245, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, + 0, 0, 31, 0, 0, 65, 0, 0, 0, 0, + 222, 66, 0, 59, 0, 0, 0, 0, 49, 0, + 58, 40, 45, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 156, 0, + 0, 151, 152, 0, 0, 0, 0, 70, 0, 0, + 0, 0, 0, 0, 71, 0, 0, 0, 0, 0, + 0, 0, 0, 72, 135, 136, 137, 0, 0, 0, + 171, 0, 0, 0, 0, 0, 0, 252, 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, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 212, + 300, 0, 215, 0, 213, 214, 0, 0, 194, 189, + 191, 193, 190, 192, 198, 199, 256, 258, 259, 263, + 264, 261, 262, 270, 0, 0, 0, 246, 241, 239, + 236, 240, 238, 237, 242, 243, 244, 247, 235, 233, + 230, 234, 232, 231, 0, 183, 187, 0, 0, 0, + 17, 0, 0, 67, 0, 0, 63, 0, 0, 223, + 224, 225, 226, 0, 61, 42, 0, 50, 55, 0, + 54, 60, 58, 48, 0, 48, 38, 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, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 170, 139, 141, 140, 142, 149, 146, 147, + 154, 143, 258, 144, 259, 148, 0, 0, 127, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 74, 129, + 129, 129, 129, 174, 0, 28, 0, 0, 0, 0, + 271, 274, 306, 272, 275, 307, 273, 0, 208, 0, + 210, 265, 0, 0, 200, 196, 0, 284, 287, 288, + 289, 0, 0, 285, 286, 290, 291, 292, 293, 294, + 295, 296, 297, 298, 299, 219, 301, 0, 254, 281, + 282, 202, 0, 0, 228, 0, 0, 248, 0, 0, + 0, 249, 0, 0, 0, 16, 0, 22, 0, 0, + 221, 68, 0, 35, 0, 0, 0, 0, 60, 53, + 0, 53, 155, 271, 0, 0, 165, 166, 159, 161, + 160, 158, 162, 163, 164, 0, 0, 157, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 75, + 0, 0, 0, 128, 124, 125, 126, 0, 0, 112, + 114, 115, 117, 109, 111, 118, 120, 121, 123, 106, + 108, 113, 116, 110, 119, 122, 107, 78, 79, 0, + 0, 80, 0, 0, 81, 173, 172, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 217, + 216, 0, 205, 0, 207, 0, 186, 0, 0, 18, + 15, 14, 69, 0, 0, 30, 0, 0, 0, 44, + 0, 58, 39, 0, 0, 0, 0, 0, 0, 0, + 76, 0, 0, 0, 129, 129, 129, 129, 23, 24, + 25, 26, 0, 0, 0, 0, 218, 303, 0, 0, + 0, 0, 0, 0, 21, 36, 29, 0, 0, 0, + 0, 41, 60, 37, 0, 167, 168, 0, 0, 0, + 0, 0, 0, 131, 132, 133, 134, 130, 82, 84, + 83, 85, 209, 211, 220, 304, 0, 0, 204, 206, + 250, 0, 0, 0, 0, 0, 0, 169, 77, 0, + 129, 0, 129, 0, 129, 0, 129, 305, 302, 0, + 19, 0, 0, 0, 0, 43, 0, 0, 102, 0, + 0, 104, 0, 0, 103, 0, 0, 105, 0, 52, + 51, 57, 56, 0, 0, 0, 0, 0, 0, 0, + 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 129, 129, + 129, 129, 129, 129, 129, 129, 129, 129, 129, 129, + 129, 129, 129, 129, 86, 90, 89, 96, 88, 95, + 94, 100, 87, 93, 92, 99, 91, 98, 97, 101 +}; + + /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { -522, -522, -522, 880, 718, -522, -522, -522, -522, 996, @@ -1190,10 +944,20 @@ -8, 977, -28, 26, -36, 509, -33, -99, -522 }; -/* 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 YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1 + /* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = +{ + -1, 13, 14, 469, 470, 15, 16, 17, 18, 194, + 19, 139, 744, 20, 50, 150, 320, 148, 315, 140, + 141, 142, 305, 21, 22, 184, 185, 359, 707, 807, + 367, 360, 174, 175, 176, 177, 23, 191, 192, 24, + 39, 127, 128, 129, 106, 107, 108, 143, 310, 249, + 122, 130, 236, 110, 178, 112, 113, 114, 115 +}; + + /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If + positive, shift that token. If negative, reduce the rule whose + number is the opposite. If YYTABLE_NINF, syntax error. */ static const yytype_uint16 yytable[] = { 111, 124, 242, 243, 371, 323, 647, 145, 731, 154, @@ -1523,12 +1287,6 @@ 0, 0, 0, 0, 0, 138 }; -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-522))) - -#define yytable_value_is_error(Yytable_value) \ - YYID (0) - static const yytype_int16 yycheck[] = { 36, 37, 101, 102, 192, 154, 491, 43, 26, 50, @@ -1858,8 +1616,8 @@ -1, -1, -1, -1, -1, 121 }; -/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing + symbol of state STATE-NUM. */ static const yytype_uint8 yystos[] = { 0, 3, 4, 5, 6, 7, 8, 9, 10, 11, @@ -1956,30 +1714,88 @@ 154, 154, 154, 154, 154, 154, 154, 154, 154, 154 }; -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -/* Like YYERROR except do call 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. However, - YYFAIL appears to be in use. Nevertheless, it is formally deprecated - in Bison 2.4.2's NEWS entry, where a plan to phase it out is - discussed. */ - -#define YYFAIL goto yyerrlab -#if defined YYFAIL - /* This is here to suppress warnings from the GCC cpp's - -Wunused-macros. Normally we don't worry about that warning, but - some users do, and we want to make it easy for users to remove - YYFAIL uses, which will produce warnings from Bison 2.5. */ -#endif + /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ +static const yytype_uint8 yyr1[] = +{ + 0, 126, 127, 127, 127, 127, 127, 127, 127, 127, + 127, 127, 127, 128, 128, 128, 128, 129, 129, 129, + 129, 129, 130, 131, 132, 133, 134, 135, 135, 136, + 136, 136, 136, 137, 137, 138, 138, 139, 139, 139, + 139, 139, 139, 139, 139, 140, 140, 140, 141, 141, + 141, 141, 141, 142, 142, 142, 142, 142, 143, 143, + 144, 144, 145, 145, 145, 145, 146, 147, 148, 148, + 149, 149, 150, 151, 151, 151, 151, 151, 152, 152, + 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, + 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, + 152, 152, 152, 152, 152, 152, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, + 153, 153, 153, 153, 153, 153, 153, 153, 153, 154, + 154, 155, 155, 155, 155, 156, 156, 156, 157, 157, + 157, 157, 157, 157, 157, 158, 158, 158, 158, 158, + 159, 159, 159, 160, 160, 160, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 161, 162, 163, 163, 164, 164, 164, 165, 166, 166, + 166, 166, 166, 166, 167, 167, 168, 168, 169, 169, + 169, 169, 169, 169, 169, 170, 170, 171, 171, 171, + 171, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 172, 172, 172, 172, + 172, 173, 173, 174, 174, 174, 174, 175, 175, 175, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, + 176, 177, 177, 178, 178, 179, 179, 180, 180, 180, + 181, 181, 181, 181, 181, 181, 182, 182, 182, 183, + 183, 183, 183, 183, 183, 183, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 184, 184, 184, 184, 184 +}; + + /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 5, 8, 8, 7, 1, 3, 6, + 8, 4, 2, 8, 8, 8, 8, 1, 3, 9, + 8, 5, 1, 1, 1, 0, 2, 9, 6, 8, + 5, 9, 6, 11, 8, 0, 1, 2, 0, 2, + 3, 9, 9, 0, 2, 2, 8, 8, 0, 2, + 0, 2, 1, 3, 1, 2, 2, 3, 3, 4, + 5, 5, 5, 1, 3, 4, 5, 7, 4, 4, + 4, 4, 6, 6, 6, 6, 12, 12, 12, 12, + 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, + 12, 12, 8, 8, 8, 8, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 2, 3, 0, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 3, + 3, 3, 3, 3, 3, 1, 3, 3, 3, 3, + 1, 2, 2, 1, 3, 4, 2, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 6, 6, 7, + 3, 5, 4, 4, 0, 1, 1, 3, 2, 2, + 2, 2, 2, 4, 1, 1, 5, 3, 1, 3, + 3, 3, 3, 3, 3, 1, 4, 1, 3, 3, + 4, 2, 4, 2, 7, 5, 7, 5, 4, 7, + 4, 7, 3, 3, 3, 3, 5, 5, 6, 4, + 7, 4, 2, 2, 2, 2, 2, 1, 3, 1, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 2, 3, 3, 4, 4, + 7, 2, 3, 0, 3, 1, 3, 1, 3, 3, + 1, 3, 3, 3, 3, 4, 1, 2, 2, 1, + 3, 4, 4, 4, 4, 4, 1, 1, 1, 2, + 2, 4, 4, 2, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 3, 4, 8, 6, 7, 8, 4, 4 +}; + + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY (-2) +#define YYEOF 0 + +#define YYACCEPT goto yyacceptlab +#define YYABORT goto yyabortlab +#define YYERROR goto yyerrorlab + #define YYRECOVERING() (!!yyerrstatus) @@ -1996,27 +1812,15 @@ else \ { \ yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (YYID (0)) + YYERROR; \ + } \ +while (0) /* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* This macro is provided for backward compatibility. */ -#ifndef YY_LOCATION_PRINT -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -#endif +#define YYTERROR 1 +#define YYERRCODE 256 -/* YYLEX -- calling `yylex' with the right arguments. */ -#ifdef YYLEX_PARAM -# define YYLEX yylex (&yylval, YYLEX_PARAM) -#else -# define YYLEX yylex (&yylval) -#endif /* Enable debugging if requested. */ #if YYDEBUG @@ -2026,40 +1830,36 @@ # define YYFPRINTF fprintf # endif -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (YYID (0)) - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (YYID (0)) +# define YYDPRINTF(Args) \ +do { \ + if (yydebug) \ + YYFPRINTF Args; \ +} while (0) +/* This macro is provided for backward compatibility. */ +#ifndef YY_LOCATION_PRINT +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +#endif -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ +do { \ + if (yydebug) \ + { \ + YYFPRINTF (stderr, "%s ", Title); \ + yy_symbol_print (stderr, \ + Type, Value); \ + YYFPRINTF (stderr, "\n"); \ + } \ +} while (0) + + +/*----------------------------------------. +| Print this symbol's value on YYOUTPUT. | +`----------------------------------------*/ + static void yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { FILE *yyo = yyoutput; YYUSE (yyo); @@ -2068,14 +1868,8 @@ # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# else - YYUSE (yyoutput); # endif - switch (yytype) - { - default: - break; - } + YYUSE (yytype); } @@ -2083,22 +1877,11 @@ | Print this symbol on YYOUTPUT. | `--------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) -#else -static void -yy_symbol_print (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE const * const yyvaluep; -#endif { - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); - else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + YYFPRINTF (yyoutput, "%s %s (", + yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); yy_symbol_value_print (yyoutput, yytype, yyvaluep); YYFPRINTF (yyoutput, ")"); @@ -2109,16 +1892,8 @@ | TOP (included). | `------------------------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -#else -static void -yy_stack_print (yybottom, yytop) - yytype_int16 *yybottom; - yytype_int16 *yytop; -#endif { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) @@ -2129,49 +1904,42 @@ YYFPRINTF (stderr, "\n"); } -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (YYID (0)) +# define YY_STACK_PRINT(Bottom, Top) \ +do { \ + if (yydebug) \ + yy_stack_print ((Bottom), (Top)); \ +} while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) -#else static void -yy_reduce_print (yyvsp, yyrule) - YYSTYPE *yyvsp; - int yyrule; -#endif +yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { + unsigned long int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; - unsigned long int yylno = yyrline[yyrule]; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); + yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], - &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + yy_symbol_print (stderr, + yystos[yyssp[yyi + 1 - yynrhs]], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); YYFPRINTF (stderr, "\n"); } } -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ -} while (YYID (0)) +# define YY_REDUCE_PRINT(Rule) \ +do { \ + if (yydebug) \ + yy_reduce_print (yyssp, yyvsp, Rule); \ +} while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -2185,7 +1953,7 @@ /* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH +#ifndef YYINITDEPTH # define YYINITDEPTH 200 #endif @@ -2208,15 +1976,8 @@ # define yystrlen strlen # else /* Return the length of YYSTR. */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static YYSIZE_T yystrlen (const char *yystr) -#else -static YYSIZE_T -yystrlen (yystr) - const char *yystr; -#endif { YYSIZE_T yylen; for (yylen = 0; yystr[yylen]; yylen++) @@ -2232,16 +1993,8 @@ # 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 * yystpcpy (char *yydest, const char *yysrc) -#else -static char * -yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -#endif { char *yyd = yydest; const char *yys = yysrc; @@ -2271,27 +2024,27 @@ char const *yyp = yystr; for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } + switch (*++yyp) + { + case '\'': + case ',': + goto do_not_strip_quotes; + + case '\\': + if (*++yyp != '\\') + goto do_not_strip_quotes; + /* Fall through. */ + default: + if (yyres) + yyres[yyn] = *yyp; + yyn++; + break; + + case '"': + if (yyres) + yyres[yyn] = '\0'; + return yyn; + } do_not_strip_quotes: ; } @@ -2314,12 +2067,11 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, yytype_int16 *yyssp, int yytoken) { - YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]); + YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; /* Internationalized format string. */ - const char *yyformat = YY_NULL; + const char *yyformat = YY_NULLPTR; /* Arguments of yyformat. */ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; /* Number of reported tokens (one for the "unexpected", one per @@ -2327,10 +2079,6 @@ int yycount = 0; /* There are many possibilities here to consider: - - Assume YYFAIL is not used. It's too flawed to consider. See - - for details. YYERROR is fine as it does not invoke this - function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected @@ -2379,11 +2127,13 @@ break; } yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } } } } @@ -2403,10 +2153,12 @@ # undef YYCASE_ } - yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; + { + YYSIZE_T yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } if (*yymsg_alloc < yysize) { @@ -2443,31 +2195,17 @@ | Release the memory associated to this symbol. | `-----------------------------------------------*/ -/*ARGSUSED*/ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) -#else -static void -yydestruct (yymsg, yytype, yyvaluep) - const char *yymsg; - int yytype; - YYSTYPE *yyvaluep; -#endif { YYUSE (yyvaluep); - if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - switch (yytype) - { - - default: - break; - } + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN + YYUSE (yytype); + YY_IGNORE_MAYBE_UNINITIALIZED_END } @@ -2477,56 +2215,18 @@ | yyparse. | `----------*/ -#ifdef YYPARSE_PARAM -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) -int -yyparse (void *YYPARSE_PARAM) -#else -int -yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -#endif -#else /* ! YYPARSE_PARAM */ -#if (defined __STDC__ || defined __C99__FUNC__ \ - || defined __cplusplus || defined _MSC_VER) int yyparse (void) -#else -int -yyparse () - -#endif -#endif { /* The lookahead symbol. */ int yychar; -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else +/* The semantic value of the lookahead symbol. */ /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ -static YYSTYPE yyval_default; -# define YY_INITIAL_VALUE(Value) = Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - -/* The semantic value of the lookahead symbol. */ -YYSTYPE yylval YY_INITIAL_VALUE(yyval_default); +YY_INITIAL_VALUE (static YYSTYPE yyval_default;) +YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); /* Number of syntax errors so far. */ int yynerrs; @@ -2536,8 +2236,8 @@ int yyerrstatus; /* The stacks and their tools: - `yyss': related to states. - `yyvs': related to semantic values. + 'yyss': related to states. + 'yyvs': related to semantic values. Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ @@ -2605,23 +2305,23 @@ #ifdef 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 *yyvs1 = yyvs; - yytype_int16 *yyss1 = 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 yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yystacksize); + /* 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 *yyvs1 = yyvs; + yytype_int16 *yyss1 = 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 yyoverflow is a macro. */ + yyoverflow (YY_("memory exhausted"), + &yyss1, yysize * sizeof (*yyssp), + &yyvs1, yysize * sizeof (*yyvsp), + &yystacksize); - yyss = yyss1; - yyvs = yyvs1; + yyss = yyss1; + yyvs = yyvs1; } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE @@ -2629,22 +2329,22 @@ # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; + yystacksize = YYMAXDEPTH; { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); + yytype_int16 *yyss1 = yyss; + union yyalloc *yyptr = + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); + if (! yyptr) + goto yyexhaustedlab; + YYSTACK_RELOCATE (yyss_alloc, yyss); + YYSTACK_RELOCATE (yyvs_alloc, yyvs); # undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); + if (yyss1 != yyssa) + YYSTACK_FREE (yyss1); } # endif #endif /* no yyoverflow */ @@ -2653,10 +2353,10 @@ yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long int) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) - YYABORT; + YYABORT; } YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -2685,7 +2385,7 @@ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); - yychar = YYLEX; + yychar = yylex (&yylval); } if (yychar <= YYEOF) @@ -2750,7 +2450,7 @@ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: - `$$ = $1'. + '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison @@ -2764,329 +2464,328 @@ switch (yyn) { case 2: -/* Line 1778 of yacc.c */ -#line 148 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 160 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2470 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 3: -/* Line 1778 of yacc.c */ -#line 149 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 161 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2476 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 4: -/* Line 1778 of yacc.c */ -#line 150 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 162 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2482 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 5: -/* Line 1778 of yacc.c */ -#line 151 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 163 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2488 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 6: -/* Line 1778 of yacc.c */ -#line 152 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 164 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2494 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 7: -/* Line 1778 of yacc.c */ -#line 153 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 165 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2500 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 8: -/* Line 1778 of yacc.c */ -#line 154 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 166 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2506 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 9: -/* Line 1778 of yacc.c */ -#line 155 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 167 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2512 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 10: -/* Line 1778 of yacc.c */ -#line 156 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 168 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2518 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 11: -/* Line 1778 of yacc.c */ -#line 157 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 169 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2524 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 12: -/* Line 1778 of yacc.c */ -#line 158 "src/mmlparse2.y" - { code_set_root((yyvsp[(1) - (1)].code)); } +#line 170 "src/mmlparse2.y" /* yacc.c:1646 */ + { code_set_root((yyvsp[0].code)); } +#line 2530 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 13: -/* Line 1778 of yacc.c */ -#line 166 "src/mmlparse2.y" +#line 178 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_set1, 3, - code_new_name((yyvsp[(2) - (5)].name)), /* Name */ + code_new_name((yyvsp[-3].name)), /* Name */ code_new_inst(i_idxset_pseudo_new, 1, /* index set */ code_new_inst(i_bool_true, 0)), - (yyvsp[(4) - (5)].code)); /* initial set */ + (yyvsp[-1].code)); /* initial set */ } +#line 2542 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 14: -/* Line 1778 of yacc.c */ -#line 173 "src/mmlparse2.y" +#line 185 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_set1, 3, - code_new_name((yyvsp[(2) - (8)].name)), /* Name */ - (yyvsp[(4) - (8)].code), /* index set */ - (yyvsp[(7) - (8)].code)); /* set */ + code_new_name((yyvsp[-6].name)), /* Name */ + (yyvsp[-4].code), /* index set */ + (yyvsp[-1].code)); /* set */ } +#line 2553 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 15: -/* Line 1778 of yacc.c */ -#line 179 "src/mmlparse2.y" +#line 191 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_set2, 3, - code_new_name((yyvsp[(2) - (8)].name)), /* Name */ - (yyvsp[(4) - (8)].code), /* index set */ - (yyvsp[(7) - (8)].code)); /* initial set_entry_list */ + code_new_name((yyvsp[-6].name)), /* Name */ + (yyvsp[-4].code), /* index set */ + (yyvsp[-1].code)); /* initial set_entry_list */ } +#line 2564 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 16: -/* Line 1778 of yacc.c */ -#line 185 "src/mmlparse2.y" +#line 197 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_set2, 3, - code_new_name((yyvsp[(2) - (7)].name)), /* Name */ + code_new_name((yyvsp[-5].name)), /* Name */ code_new_inst(i_idxset_pseudo_new, 1, /* index set */ code_new_inst(i_bool_true, 0)), - (yyvsp[(6) - (7)].code)); /* initial set_entry_list */ + (yyvsp[-1].code)); /* initial set_entry_list */ } +#line 2576 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 17: -/* Line 1778 of yacc.c */ -#line 195 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_entry_list_new, 1, (yyvsp[(1) - (1)].code)); } +#line 207 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_entry_list_new, 1, (yyvsp[0].code)); } +#line 2582 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 18: -/* Line 1778 of yacc.c */ -#line 196 "src/mmlparse2.y" +#line 208 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_entry_list_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_entry_list_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 2590 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 19: -/* Line 1778 of yacc.c */ -#line 199 "src/mmlparse2.y" +#line 211 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_entry_list_subsets, 3, (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code), code_new_numb(numb_new_integer(-1))); + (yyval.code) = code_new_inst(i_entry_list_subsets, 3, (yyvsp[-3].code), (yyvsp[-1].code), code_new_numb(numb_new_integer(-1))); } +#line 2598 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 20: -/* Line 1778 of yacc.c */ -#line 202 "src/mmlparse2.y" +#line 214 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_entry_list_subsets, 3, (yyvsp[(3) - (8)].code), (yyvsp[(5) - (8)].code), (yyvsp[(7) - (8)].code)); + (yyval.code) = code_new_inst(i_entry_list_subsets, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 2606 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 21: -/* Line 1778 of yacc.c */ -#line 205 "src/mmlparse2.y" +#line 217 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_entry_list_powerset, 1, (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_entry_list_powerset, 1, (yyvsp[-1].code)); } +#line 2614 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 22: -/* Line 1778 of yacc.c */ -#line 211 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_entry, 2, (yyvsp[(1) - (2)].code), (yyvsp[(2) - (2)].code)); } +#line 223 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_entry, 2, (yyvsp[-1].code), (yyvsp[0].code)); } +#line 2620 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 23: -/* Line 1778 of yacc.c */ -#line 220 "src/mmlparse2.y" +#line 232 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newdef, 3, - code_new_define((yyvsp[(2) - (8)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(4) - (8)].code)), - (yyvsp[(7) - (8)].code)); + code_new_define((yyvsp[-6].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-4].code)), + (yyvsp[-1].code)); } +#line 2631 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 24: -/* Line 1778 of yacc.c */ -#line 229 "src/mmlparse2.y" +#line 241 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newdef, 3, - code_new_define((yyvsp[(2) - (8)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(4) - (8)].code)), - (yyvsp[(7) - (8)].code)); + code_new_define((yyvsp[-6].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-4].code)), + (yyvsp[-1].code)); } +#line 2642 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 25: -/* Line 1778 of yacc.c */ -#line 238 "src/mmlparse2.y" +#line 250 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newdef, 3, - code_new_define((yyvsp[(2) - (8)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(4) - (8)].code)), - (yyvsp[(7) - (8)].code)); + code_new_define((yyvsp[-6].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-4].code)), + (yyvsp[-1].code)); } +#line 2653 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 26: -/* Line 1778 of yacc.c */ -#line 247 "src/mmlparse2.y" +#line 259 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newdef, 3, - code_new_define((yyvsp[(2) - (8)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(4) - (8)].code)), - (yyvsp[(7) - (8)].code)); + code_new_define((yyvsp[-6].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-4].code)), + (yyvsp[-1].code)); } +#line 2664 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 27: -/* Line 1778 of yacc.c */ -#line 256 "src/mmlparse2.y" +#line 268 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_elem_list_new, 1, code_new_name((yyvsp[(1) - (1)].name))); + (yyval.code) = code_new_inst(i_elem_list_new, 1, code_new_name((yyvsp[0].name))); } +#line 2672 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 28: -/* Line 1778 of yacc.c */ -#line 259 "src/mmlparse2.y" +#line 271 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_elem_list_add, 2, (yyvsp[(1) - (3)].code), code_new_name((yyvsp[(3) - (3)].name))); + (yyval.code) = code_new_inst(i_elem_list_add, 2, (yyvsp[-2].code), code_new_name((yyvsp[0].name))); } +#line 2680 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 29: -/* Line 1778 of yacc.c */ -#line 269 "src/mmlparse2.y" +#line 281 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_newsym_para1, 4, code_new_name((yyvsp[(2) - (9)].name)), (yyvsp[(4) - (9)].code), (yyvsp[(7) - (9)].code), (yyvsp[(8) - (9)].code)); + (yyval.code) = code_new_inst(i_newsym_para1, 4, code_new_name((yyvsp[-7].name)), (yyvsp[-5].code), (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 2688 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 30: -/* Line 1778 of yacc.c */ -#line 272 "src/mmlparse2.y" +#line 284 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_newsym_para2, 4, code_new_name((yyvsp[(2) - (8)].name)), (yyvsp[(4) - (8)].code), (yyvsp[(7) - (8)].code), code_new_inst(i_nop, 0)); + (yyval.code) = code_new_inst(i_newsym_para2, 4, code_new_name((yyvsp[-6].name)), (yyvsp[-4].code), (yyvsp[-1].code), code_new_inst(i_nop, 0)); } +#line 2696 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 31: -/* Line 1778 of yacc.c */ -#line 275 "src/mmlparse2.y" +#line 287 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_para1, 4, - code_new_name((yyvsp[(2) - (5)].name)), + code_new_name((yyvsp[-3].name)), code_new_inst(i_idxset_pseudo_new, 1, code_new_inst(i_bool_true, 0)), - (yyvsp[(4) - (5)].code), + (yyvsp[-1].code), code_new_inst(i_nop, 0)); } +#line 2708 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 32: -/* Line 1778 of yacc.c */ -#line 282 "src/mmlparse2.y" +#line 294 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_nop, 0); } +#line 2714 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 33: -/* Line 1778 of yacc.c */ -#line 285 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 297 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 2720 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 34: -/* Line 1778 of yacc.c */ -#line 286 "src/mmlparse2.y" +#line 298 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_entry_list_new, 1, - code_new_inst(i_entry, 2, code_new_inst(i_tuple_empty, 0), (yyvsp[(1) - (1)].code))); + code_new_inst(i_entry, 2, code_new_inst(i_tuple_empty, 0), (yyvsp[0].code))); } +#line 2729 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 35: -/* Line 1778 of yacc.c */ -#line 293 "src/mmlparse2.y" +#line 305 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_nop, 0); } +#line 2735 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 36: -/* Line 1778 of yacc.c */ -#line 294 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_entry, 2, code_new_inst(i_tuple_empty, 0), (yyvsp[(2) - (2)].code)); } +#line 306 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_entry, 2, code_new_inst(i_tuple_empty, 0), (yyvsp[0].code)); } +#line 2741 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 37: -/* Line 1778 of yacc.c */ -#line 302 "src/mmlparse2.y" +#line 314 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (9)].name)), - (yyvsp[(4) - (9)].code), (yyvsp[(6) - (9)].code), (yyvsp[(7) - (9)].code), (yyvsp[(8) - (9)].code), + code_new_name((yyvsp[-7].name)), + (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code), code_new_numb(numb_copy(numb_unknown())), code_new_numb(numb_copy(numb_unknown()))); } +#line 2753 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 38: -/* Line 1778 of yacc.c */ -#line 309 "src/mmlparse2.y" +#line 321 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (6)].name)), + code_new_name((yyvsp[-4].name)), code_new_inst(i_idxset_pseudo_new, 1, code_new_inst(i_bool_true, 0)), - (yyvsp[(3) - (6)].code), (yyvsp[(4) - (6)].code), (yyvsp[(5) - (6)].code), + (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code), code_new_numb(numb_copy(numb_unknown())), code_new_numb(numb_copy(numb_unknown()))); } +#line 2767 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 39: -/* Line 1778 of yacc.c */ -#line 318 "src/mmlparse2.y" +#line 330 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (8)].name)), - (yyvsp[(4) - (8)].code), + code_new_name((yyvsp[-6].name)), + (yyvsp[-4].code), code_new_varclass(VAR_IMP), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(0))), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(1))), code_new_numb(numb_copy(numb_unknown())), code_new_numb(numb_copy(numb_unknown()))); } +#line 2782 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 40: -/* Line 1778 of yacc.c */ -#line 328 "src/mmlparse2.y" +#line 340 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (5)].name)), + code_new_name((yyvsp[-3].name)), code_new_inst(i_idxset_pseudo_new, 1, code_new_inst(i_bool_true, 0)), code_new_varclass(VAR_IMP), @@ -3095,1932 +2794,1932 @@ code_new_numb(numb_copy(numb_unknown())), code_new_numb(numb_copy(numb_unknown()))); } +#line 2798 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 41: -/* Line 1778 of yacc.c */ -#line 339 "src/mmlparse2.y" +#line 351 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (9)].name)), - (yyvsp[(4) - (9)].code), + code_new_name((yyvsp[-7].name)), + (yyvsp[-5].code), code_new_varclass(VAR_INT), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(0))), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(1))), - (yyvsp[(7) - (9)].code), (yyvsp[(8) - (9)].code)); + (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 2812 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 42: -/* Line 1778 of yacc.c */ -#line 348 "src/mmlparse2.y" +#line 360 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (6)].name)), + code_new_name((yyvsp[-4].name)), code_new_inst(i_idxset_pseudo_new, 1, code_new_inst(i_bool_true, 0)), code_new_varclass(VAR_INT), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(0))), code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(1))), - (yyvsp[(4) - (6)].code), (yyvsp[(5) - (6)].code)); + (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 2827 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 43: -/* Line 1778 of yacc.c */ -#line 358 "src/mmlparse2.y" +#line 370 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (11)].name)), (yyvsp[(4) - (11)].code), code_new_varclass(VAR_INT), (yyvsp[(7) - (11)].code), (yyvsp[(8) - (11)].code), (yyvsp[(9) - (11)].code), (yyvsp[(10) - (11)].code)); + code_new_name((yyvsp[-9].name)), (yyvsp[-7].code), code_new_varclass(VAR_INT), (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 2836 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 44: -/* Line 1778 of yacc.c */ -#line 362 "src/mmlparse2.y" +#line 374 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_newsym_var, 7, - code_new_name((yyvsp[(2) - (8)].name)), + code_new_name((yyvsp[-6].name)), code_new_inst(i_idxset_pseudo_new, 1, code_new_inst(i_bool_true, 0)), - code_new_varclass(VAR_INT), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].code), (yyvsp[(6) - (8)].code), (yyvsp[(7) - (8)].code)); + code_new_varclass(VAR_INT), (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 2848 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 45: -/* Line 1778 of yacc.c */ -#line 372 "src/mmlparse2.y" +#line 384 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_varclass(VAR_CON); } +#line 2854 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 46: -/* Line 1778 of yacc.c */ -#line 373 "src/mmlparse2.y" +#line 385 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_varclass(VAR_CON); } +#line 2860 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 47: -/* Line 1778 of yacc.c */ -#line 374 "src/mmlparse2.y" +#line 386 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_varclass(VAR_IMP); } +#line 2866 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 48: -/* Line 1778 of yacc.c */ -#line 378 "src/mmlparse2.y" +#line 390 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_bound_new, 1, code_new_numb(numb_new_integer(0))); } +#line 2874 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 49: -/* Line 1778 of yacc.c */ -#line 381 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bound_new, 1, (yyvsp[(2) - (2)].code)); } +#line 393 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bound_new, 1, (yyvsp[0].code)); } +#line 2880 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 50: -/* Line 1778 of yacc.c */ -#line 382 "src/mmlparse2.y" +#line 394 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_bound(BOUND_MINUS_INFTY); } +#line 2886 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 51: -/* Line 1778 of yacc.c */ -#line 383 "src/mmlparse2.y" +#line 395 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(3) - (9)].code), - code_new_inst(i_bound_new, 1, (yyvsp[(5) - (9)].code)), + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-6].code), + code_new_inst(i_bound_new, 1, (yyvsp[-4].code)), code_new_bound(BOUND_MINUS_INFTY)); } +#line 2896 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 52: -/* Line 1778 of yacc.c */ -#line 388 "src/mmlparse2.y" +#line 400 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(3) - (9)].code), + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-6].code), code_new_bound(BOUND_MINUS_INFTY), - code_new_inst(i_bound_new, 1, (yyvsp[(8) - (9)].code))); + code_new_inst(i_bound_new, 1, (yyvsp[-1].code))); } +#line 2906 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 53: -/* Line 1778 of yacc.c */ -#line 396 "src/mmlparse2.y" +#line 408 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_bound(BOUND_INFTY); } +#line 2912 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 54: -/* Line 1778 of yacc.c */ -#line 397 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bound_new, 1, (yyvsp[(2) - (2)].code)); } +#line 409 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bound_new, 1, (yyvsp[0].code)); } +#line 2918 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 55: -/* Line 1778 of yacc.c */ -#line 398 "src/mmlparse2.y" +#line 410 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_bound(BOUND_INFTY); } +#line 2924 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 56: -/* Line 1778 of yacc.c */ -#line 399 "src/mmlparse2.y" +#line 411 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(3) - (8)].code), - code_new_inst(i_bound_new, 1, (yyvsp[(5) - (8)].code)), + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), + code_new_inst(i_bound_new, 1, (yyvsp[-3].code)), code_new_bound(BOUND_INFTY)); } +#line 2934 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 57: -/* Line 1778 of yacc.c */ -#line 404 "src/mmlparse2.y" +#line 416 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(3) - (8)].code), + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), code_new_bound(BOUND_INFTY), - code_new_inst(i_bound_new, 1, (yyvsp[(7) - (8)].code))); + code_new_inst(i_bound_new, 1, (yyvsp[-1].code))); } +#line 2944 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 58: -/* Line 1778 of yacc.c */ -#line 412 "src/mmlparse2.y" +#line 424 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_numb(numb_new_integer(0)); } +#line 2950 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 59: -/* Line 1778 of yacc.c */ -#line 413 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); } +#line 425 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 2956 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 60: -/* Line 1778 of yacc.c */ -#line 417 "src/mmlparse2.y" +#line 429 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_numb(numb_copy(numb_unknown())); } +#line 2962 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 61: -/* Line 1778 of yacc.c */ -#line 418 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); } +#line 430 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 2968 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 62: -/* Line 1778 of yacc.c */ -#line 426 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_entry_list_new, 1, (yyvsp[(1) - (1)].code)); } +#line 438 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_entry_list_new, 1, (yyvsp[0].code)); } +#line 2974 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 63: -/* Line 1778 of yacc.c */ -#line 427 "src/mmlparse2.y" +#line 439 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_entry_list_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_entry_list_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 2982 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 64: -/* Line 1778 of yacc.c */ -#line 430 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read, 1, (yyvsp[(1) - (1)].code)); } +#line 442 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read, 1, (yyvsp[0].code)); } +#line 2988 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 65: -/* Line 1778 of yacc.c */ -#line 431 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_list_matrix, 2, (yyvsp[(1) - (2)].code), (yyvsp[(2) - (2)].code)); } +#line 443 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_list_matrix, 2, (yyvsp[-1].code), (yyvsp[0].code)); } +#line 2994 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 66: -/* Line 1778 of yacc.c */ -#line 435 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_entry, 2, (yyvsp[(1) - (2)].code), (yyvsp[(2) - (2)].code)); } +#line 447 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_entry, 2, (yyvsp[-1].code), (yyvsp[0].code)); } +#line 3000 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 67: -/* Line 1778 of yacc.c */ -#line 439 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 451 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 3006 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 68: -/* Line 1778 of yacc.c */ -#line 443 "src/mmlparse2.y" +#line 455 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_matrix_list_new, 2, (yyvsp[(1) - (3)].code), (yyvsp[(2) - (3)].code)); + (yyval.code) = code_new_inst(i_matrix_list_new, 2, (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 3014 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 69: -/* Line 1778 of yacc.c */ -#line 446 "src/mmlparse2.y" +#line 458 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_matrix_list_add, 3, (yyvsp[(1) - (4)].code), (yyvsp[(2) - (4)].code), (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_matrix_list_add, 3, (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code)); } +#line 3022 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 70: -/* Line 1778 of yacc.c */ -#line 458 "src/mmlparse2.y" +#line 470 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_object_min, 2, code_new_name((yyvsp[(2) - (5)].name)), (yyvsp[(4) - (5)].code)); + (yyval.code) = code_new_inst(i_object_min, 2, code_new_name((yyvsp[-3].name)), (yyvsp[-1].code)); } +#line 3030 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 71: -/* Line 1778 of yacc.c */ -#line 461 "src/mmlparse2.y" +#line 473 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_object_max, 2, code_new_name((yyvsp[(2) - (5)].name)), (yyvsp[(4) - (5)].code)); + (yyval.code) = code_new_inst(i_object_max, 2, code_new_name((yyvsp[-3].name)), (yyvsp[-1].code)); } +#line 3038 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 72: -/* Line 1778 of yacc.c */ -#line 471 "src/mmlparse2.y" +#line 483 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_subto, 2, code_new_name((yyvsp[(2) - (5)].name)), (yyvsp[(4) - (5)].code)); + (yyval.code) = code_new_inst(i_subto, 2, code_new_name((yyvsp[-3].name)), (yyvsp[-1].code)); } +#line 3046 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 73: -/* Line 1778 of yacc.c */ -#line 477 "src/mmlparse2.y" +#line 489 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_constraint_list, 2, (yyvsp[(1) - (1)].code), code_new_inst(i_nop, 0)); + (yyval.code) = code_new_inst(i_constraint_list, 2, (yyvsp[0].code), code_new_inst(i_nop, 0)); } +#line 3054 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 74: -/* Line 1778 of yacc.c */ -#line 480 "src/mmlparse2.y" +#line 492 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_constraint_list, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_constraint_list, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3062 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 75: -/* Line 1778 of yacc.c */ -#line 483 "src/mmlparse2.y" +#line 495 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_constraint_list, 2, - code_new_inst(i_forall, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)), + code_new_inst(i_forall, 2, (yyvsp[-2].code), (yyvsp[0].code)), code_new_inst(i_nop, 0)); } +#line 3072 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 76: -/* Line 1778 of yacc.c */ -#line 488 "src/mmlparse2.y" +#line 500 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_constraint_list, 2, - code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (5)].code), (yyvsp[(4) - (5)].code), code_new_inst(i_nop, 0)), + code_new_inst(i_expr_if_else, 3, (yyvsp[-3].code), (yyvsp[-1].code), code_new_inst(i_nop, 0)), code_new_inst(i_nop, 0)); } +#line 3082 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 77: -/* Line 1778 of yacc.c */ -#line 493 "src/mmlparse2.y" +#line 505 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_constraint_list, 2, - code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)), + code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)), code_new_inst(i_nop, 0)); } +#line 3092 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 78: -/* Line 1778 of yacc.c */ -#line 501 "src/mmlparse2.y" +#line 513 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_constraint, 4, (yyvsp[(1) - (4)].code), (yyvsp[(2) - (4)].code), (yyvsp[(3) - (4)].code), code_new_bits((yyvsp[(4) - (4)].bits))); + (yyval.code) = code_new_inst(i_constraint, 4, (yyvsp[-3].code), (yyvsp[-2].code), (yyvsp[-1].code), code_new_bits((yyvsp[0].bits))); } +#line 3100 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 79: -/* Line 1778 of yacc.c */ -#line 504 "src/mmlparse2.y" +#line 516 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_constraint, 4, (yyvsp[(1) - (4)].code), (yyvsp[(2) - (4)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(3) - (4)].code)), - code_new_bits((yyvsp[(4) - (4)].bits))); + (yyval.code) = code_new_inst(i_constraint, 4, (yyvsp[-3].code), (yyvsp[-2].code), + code_new_inst(i_term_expr, 1, (yyvsp[-1].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3110 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 80: -/* Line 1778 of yacc.c */ -#line 509 "src/mmlparse2.y" +#line 521 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_constraint, 4, - code_new_inst(i_term_expr, 1, (yyvsp[(1) - (4)].code)), - (yyvsp[(2) - (4)].code), (yyvsp[(3) - (4)].code), code_new_bits((yyvsp[(4) - (4)].bits))); + code_new_inst(i_term_expr, 1, (yyvsp[-3].code)), + (yyvsp[-2].code), (yyvsp[-1].code), code_new_bits((yyvsp[0].bits))); } +#line 3120 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 81: -/* Line 1778 of yacc.c */ -#line 514 "src/mmlparse2.y" +#line 526 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_constraint, 4, - code_new_inst(i_term_expr, 1, (yyvsp[(1) - (4)].code)), - (yyvsp[(2) - (4)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(3) - (4)].code)), - code_new_bits((yyvsp[(4) - (4)].bits))); + code_new_inst(i_term_expr, 1, (yyvsp[-3].code)), + (yyvsp[-2].code), + code_new_inst(i_term_expr, 1, (yyvsp[-1].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3132 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 82: -/* Line 1778 of yacc.c */ -#line 521 "src/mmlparse2.y" +#line 533 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[(1) - (6)].code), (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code), (yyvsp[(2) - (6)].code), - code_new_contype(CON_RHS), code_new_bits((yyvsp[(6) - (6)].bits))); + (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code), (yyvsp[-4].code), + code_new_contype(CON_RHS), code_new_bits((yyvsp[0].bits))); } +#line 3141 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 83: -/* Line 1778 of yacc.c */ -#line 525 "src/mmlparse2.y" +#line 537 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[(1) - (6)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(3) - (6)].code)), (yyvsp[(5) - (6)].code), (yyvsp[(2) - (6)].code), - code_new_contype(CON_RHS), code_new_bits((yyvsp[(6) - (6)].bits))); + (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[-5].code), + code_new_inst(i_term_expr, 1, (yyvsp[-3].code)), (yyvsp[-1].code), (yyvsp[-4].code), + code_new_contype(CON_RHS), code_new_bits((yyvsp[0].bits))); } +#line 3151 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 84: -/* Line 1778 of yacc.c */ -#line 530 "src/mmlparse2.y" +#line 542 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[(5) - (6)].code), (yyvsp[(3) - (6)].code), (yyvsp[(1) - (6)].code), (yyvsp[(2) - (6)].code), - code_new_contype(CON_LHS), code_new_bits((yyvsp[(6) - (6)].bits))); + (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[-1].code), (yyvsp[-3].code), (yyvsp[-5].code), (yyvsp[-4].code), + code_new_contype(CON_LHS), code_new_bits((yyvsp[0].bits))); } +#line 3160 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 85: -/* Line 1778 of yacc.c */ -#line 534 "src/mmlparse2.y" +#line 546 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[(5) - (6)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(3) - (6)].code)), - (yyvsp[(1) - (6)].code), (yyvsp[(2) - (6)].code), - code_new_contype(CON_LHS), code_new_bits((yyvsp[(6) - (6)].bits))); + (yyval.code) = code_new_inst(i_rangeconst, 6, (yyvsp[-1].code), + code_new_inst(i_term_expr, 1, (yyvsp[-3].code)), + (yyvsp[-5].code), (yyvsp[-4].code), + code_new_contype(CON_LHS), code_new_bits((yyvsp[0].bits))); } +#line 3171 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 86: -/* Line 1778 of yacc.c */ -#line 540 "src/mmlparse2.y" +#line 552 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), (yyvsp[-6].code), (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3179 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 87: -/* Line 1778 of yacc.c */ -#line 543 "src/mmlparse2.y" +#line 555 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), (yyvsp[-6].code), (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3189 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 88: -/* Line 1778 of yacc.c */ -#line 548 "src/mmlparse2.y" +#line 560 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3199 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 89: -/* Line 1778 of yacc.c */ -#line 553 "src/mmlparse2.y" +#line 565 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3209 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 90: -/* Line 1778 of yacc.c */ -#line 558 "src/mmlparse2.y" +#line 570 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), (yyvsp[-6].code), (yyvsp[-4].code), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), code_new_bits((yyvsp[0].bits))); } +#line 3218 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 91: -/* Line 1778 of yacc.c */ -#line 562 "src/mmlparse2.y" +#line 574 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3230 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 92: -/* Line 1778 of yacc.c */ -#line 569 "src/mmlparse2.y" +#line 581 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3242 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 93: -/* Line 1778 of yacc.c */ -#line 576 "src/mmlparse2.y" +#line 588 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), (yyvsp[-6].code), (yyvsp[-4].code), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), code_new_bits((yyvsp[0].bits))); } +#line 3253 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 94: -/* Line 1778 of yacc.c */ -#line 582 "src/mmlparse2.y" +#line 594 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3264 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 95: -/* Line 1778 of yacc.c */ -#line 588 "src/mmlparse2.y" +#line 600 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + (yyvsp[-4].code), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), code_new_bits((yyvsp[0].bits))); } +#line 3275 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 96: -/* Line 1778 of yacc.c */ -#line 594 "src/mmlparse2.y" +#line 606 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), code_new_bits((yyvsp[0].bits))); } +#line 3285 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 97: -/* Line 1778 of yacc.c */ -#line 599 "src/mmlparse2.y" +#line 611 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), (yyvsp[(10) - (12)].code), code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3298 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 98: -/* Line 1778 of yacc.c */ -#line 607 "src/mmlparse2.y" +#line 619 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - (yyvsp[(8) - (12)].code), (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), - code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + (yyvsp[-4].code), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3312 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 99: -/* Line 1778 of yacc.c */ -#line 616 "src/mmlparse2.y" +#line 628 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), (yyvsp[(6) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), - code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3326 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 100: -/* Line 1778 of yacc.c */ -#line 625 "src/mmlparse2.y" +#line 637 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), (yyvsp[(4) - (12)].code), (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), - code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), (yyvsp[-8].code), (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3339 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 101: -/* Line 1778 of yacc.c */ -#line 633 "src/mmlparse2.y" +#line 645 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[(2) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (12)].code)), - (yyvsp[(5) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (12)].code)), - code_new_inst(i_term_expr, 1, (yyvsp[(8) - (12)].code)), - (yyvsp[(9) - (12)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(10) - (12)].code)), - code_new_bits((yyvsp[(12) - (12)].bits))); + (yyval.code) = code_new_inst(i_vif_else, 8, (yyvsp[-10].code), + code_new_inst(i_term_expr, 1, (yyvsp[-8].code)), + (yyvsp[-7].code), + code_new_inst(i_term_expr, 1, (yyvsp[-6].code)), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), + (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3354 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 102: -/* Line 1778 of yacc.c */ -#line 644 "src/mmlparse2.y" +#line 656 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[(2) - (8)].code), (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].code), (yyvsp[(6) - (8)].code), code_new_bits((yyvsp[(8) - (8)].bits))); + (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[-6].code), (yyvsp[-4].code), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3362 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 103: -/* Line 1778 of yacc.c */ -#line 647 "src/mmlparse2.y" +#line 659 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[(2) - (8)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (8)].code)), (yyvsp[(5) - (8)].code), (yyvsp[(6) - (8)].code), code_new_bits((yyvsp[(8) - (8)].bits))); + (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), (yyvsp[-3].code), (yyvsp[-2].code), code_new_bits((yyvsp[0].bits))); } +#line 3371 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 104: -/* Line 1778 of yacc.c */ -#line 651 "src/mmlparse2.y" +#line 663 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[(2) - (8)].code), - (yyvsp[(4) - (8)].code), (yyvsp[(5) - (8)].code), code_new_inst(i_term_expr, 1, (yyvsp[(6) - (8)].code)), - code_new_bits((yyvsp[(8) - (8)].bits))); + (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[-6].code), + (yyvsp[-4].code), (yyvsp[-3].code), code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + code_new_bits((yyvsp[0].bits))); } +#line 3381 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 105: -/* Line 1778 of yacc.c */ -#line 656 "src/mmlparse2.y" +#line 668 "src/mmlparse2.y" /* yacc.c:1646 */ { /* ??? This is an error */ - (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[(2) - (8)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(4) - (8)].code)), (yyvsp[(5) - (8)].code), - code_new_inst(i_term_expr, 1, (yyvsp[(6) - (8)].code)), code_new_bits((yyvsp[(8) - (8)].bits))); + (yyval.code) = code_new_inst(i_vif, 5, (yyvsp[-6].code), + code_new_inst(i_term_expr, 1, (yyvsp[-4].code)), (yyvsp[-3].code), + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), code_new_bits((yyvsp[0].bits))); } +#line 3391 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 106: -/* Line 1778 of yacc.c */ -#line 664 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_ne, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 676 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_ne, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3397 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 107: -/* Line 1778 of yacc.c */ -#line 665 "src/mmlparse2.y" +#line 677 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_ne, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_ne, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3405 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 108: -/* Line 1778 of yacc.c */ -#line 668 "src/mmlparse2.y" +#line 680 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_ne, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_ne, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3413 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 109: -/* Line 1778 of yacc.c */ -#line 671 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_eq, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 683 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_eq, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3419 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 110: -/* Line 1778 of yacc.c */ -#line 672 "src/mmlparse2.y" +#line 684 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_eq, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_eq, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3427 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 111: -/* Line 1778 of yacc.c */ -#line 675 "src/mmlparse2.y" +#line 687 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_eq, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_eq, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3435 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 112: -/* Line 1778 of yacc.c */ -#line 678 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_le, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 690 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_le, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3441 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 113: -/* Line 1778 of yacc.c */ -#line 679 "src/mmlparse2.y" +#line 691 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_le, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_le, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3449 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 114: -/* Line 1778 of yacc.c */ -#line 682 "src/mmlparse2.y" +#line 694 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_le, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_le, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3457 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 115: -/* Line 1778 of yacc.c */ -#line 685 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_ge, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 697 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_ge, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3463 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 116: -/* Line 1778 of yacc.c */ -#line 686 "src/mmlparse2.y" +#line 698 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_ge, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_ge, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3471 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 117: -/* Line 1778 of yacc.c */ -#line 689 "src/mmlparse2.y" +#line 701 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_ge, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_ge, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3479 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 118: -/* Line 1778 of yacc.c */ -#line 692 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_lt, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 704 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_lt, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3485 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 119: -/* Line 1778 of yacc.c */ -#line 693 "src/mmlparse2.y" +#line 705 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_lt, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_lt, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3493 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 120: -/* Line 1778 of yacc.c */ -#line 696 "src/mmlparse2.y" +#line 708 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_lt, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_lt, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3501 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 121: -/* Line 1778 of yacc.c */ -#line 699 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_gt, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 711 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_gt, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3507 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 122: -/* Line 1778 of yacc.c */ -#line 700 "src/mmlparse2.y" +#line 712 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_gt, 2, code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_vbool_gt, 2, code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), (yyvsp[0].code)); } +#line 3515 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 123: -/* Line 1778 of yacc.c */ -#line 703 "src/mmlparse2.y" +#line 715 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vbool_gt, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_vbool_gt, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3523 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 124: -/* Line 1778 of yacc.c */ -#line 706 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_and, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 718 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_and, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3529 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 125: -/* Line 1778 of yacc.c */ -#line 707 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_or, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 719 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_or, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3535 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 126: -/* Line 1778 of yacc.c */ -#line 708 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_xor, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 720 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_xor, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3541 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 127: -/* Line 1778 of yacc.c */ -#line 709 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vbool_not, 1, (yyvsp[(2) - (2)].code)); } +#line 721 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vbool_not, 1, (yyvsp[0].code)); } +#line 3547 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 128: -/* Line 1778 of yacc.c */ -#line 710 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 722 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 3553 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 129: -/* Line 1778 of yacc.c */ -#line 714 "src/mmlparse2.y" +#line 726 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.bits) = 0; } +#line 3559 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 130: -/* Line 1778 of yacc.c */ -#line 715 "src/mmlparse2.y" - { (yyval.bits) = (yyvsp[(1) - (3)].bits) | (yyvsp[(3) - (3)].bits); } +#line 727 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.bits) = (yyvsp[-2].bits) | (yyvsp[0].bits); } +#line 3565 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 131: -/* Line 1778 of yacc.c */ -#line 719 "src/mmlparse2.y" +#line 731 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.bits) = LP_FLAG_CON_SCALE; } +#line 3571 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 132: -/* Line 1778 of yacc.c */ -#line 720 "src/mmlparse2.y" +#line 732 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.bits) = LP_FLAG_CON_SEPAR; } +#line 3577 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 133: -/* Line 1778 of yacc.c */ -#line 721 "src/mmlparse2.y" +#line 733 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.bits) = LP_FLAG_CON_CHECK; } +#line 3583 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 134: -/* Line 1778 of yacc.c */ -#line 722 "src/mmlparse2.y" +#line 734 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.bits) = LP_FLAG_CON_INDIC; } +#line 3589 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 135: -/* Line 1778 of yacc.c */ -#line 726 "src/mmlparse2.y" +#line 738 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_contype(CON_RHS); } +#line 3595 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 136: -/* Line 1778 of yacc.c */ -#line 727 "src/mmlparse2.y" +#line 739 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_contype(CON_LHS); } +#line 3601 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 137: -/* Line 1778 of yacc.c */ -#line 728 "src/mmlparse2.y" +#line 740 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_contype(CON_EQUAL); } +#line 3607 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 138: -/* Line 1778 of yacc.c */ -#line 732 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 744 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 3613 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 139: -/* Line 1778 of yacc.c */ -#line 733 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 745 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3619 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 140: -/* Line 1778 of yacc.c */ -#line 734 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_sub, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 746 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_sub, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3625 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 141: -/* Line 1778 of yacc.c */ -#line 735 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_const, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 747 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_const, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3631 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 142: -/* Line 1778 of yacc.c */ -#line 736 "src/mmlparse2.y" +#line 748 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_term_sub, 2, (yyvsp[(1) - (3)].code), code_new_inst(i_term_expr, 1, (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_term_sub, 2, (yyvsp[-2].code), code_new_inst(i_term_expr, 1, (yyvsp[0].code))); } +#line 3639 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 143: -/* Line 1778 of yacc.c */ -#line 739 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_const, 2, (yyvsp[(3) - (3)].code), (yyvsp[(1) - (3)].code)); } +#line 751 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_const, 2, (yyvsp[0].code), (yyvsp[-2].code)); } +#line 3645 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 144: -/* Line 1778 of yacc.c */ -#line 740 "src/mmlparse2.y" +#line 752 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_term_sub, 2, - code_new_inst(i_term_expr, 1, (yyvsp[(1) - (3)].code)), - (yyvsp[(3) - (3)].code)); + code_new_inst(i_term_expr, 1, (yyvsp[-2].code)), + (yyvsp[0].code)); } +#line 3655 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 145: -/* Line 1778 of yacc.c */ -#line 748 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 760 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 3661 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 146: -/* Line 1778 of yacc.c */ -#line 749 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 761 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3667 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 147: -/* Line 1778 of yacc.c */ -#line 750 "src/mmlparse2.y" +#line 762 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[(1) - (3)].code), - code_new_inst(i_expr_div, 2, code_new_numb(numb_new_integer(1)), (yyvsp[(3) - (3)].code))); + (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[-2].code), + code_new_inst(i_expr_div, 2, code_new_numb(numb_new_integer(1)), (yyvsp[0].code))); } +#line 3676 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 148: -/* Line 1778 of yacc.c */ -#line 754 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[(3) - (3)].code), (yyvsp[(1) - (3)].code)); } +#line 766 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[0].code), (yyvsp[-2].code)); } +#line 3682 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 149: -/* Line 1778 of yacc.c */ -#line 755 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_term_mul, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 767 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_term_mul, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3688 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 151: -/* Line 1778 of yacc.c */ -#line 760 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); } +#line 772 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 3694 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 152: -/* Line 1778 of yacc.c */ -#line 761 "src/mmlparse2.y" +#line 773 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[(2) - (2)].code), code_new_numb(numb_new_integer(-1))); + (yyval.code) = code_new_inst(i_term_coeff, 2, (yyvsp[0].code), code_new_numb(numb_new_integer(-1))); } +#line 3702 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 153: -/* Line 1778 of yacc.c */ -#line 767 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 779 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 3708 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 154: -/* Line 1778 of yacc.c */ -#line 768 "src/mmlparse2.y" +#line 780 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_term_power, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_term_power, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3716 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 155: -/* Line 1778 of yacc.c */ -#line 771 "src/mmlparse2.y" +#line 783 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_term_sum, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_term_sum, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3724 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 156: -/* Line 1778 of yacc.c */ -#line 777 "src/mmlparse2.y" +#line 789 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[(1) - (2)].sym)), (yyvsp[(2) - (2)].code)); + (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[-1].sym)), (yyvsp[0].code)); } +#line 3732 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 157: -/* Line 1778 of yacc.c */ -#line 780 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vabs, 1, (yyvsp[(3) - (4)].code)); } +#line 792 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vabs, 1, (yyvsp[-1].code)); } +#line 3738 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 158: -/* Line 1778 of yacc.c */ -#line 781 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(-2)), (yyvsp[(3) - (4)].code)); } +#line 793 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(-2)), (yyvsp[-1].code)); } +#line 3744 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 159: -/* Line 1778 of yacc.c */ -#line 782 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(3)), (yyvsp[(3) - (4)].code)); } +#line 794 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(3)), (yyvsp[-1].code)); } +#line 3750 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 160: -/* Line 1778 of yacc.c */ -#line 783 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(4)), (yyvsp[(3) - (4)].code)); } +#line 795 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(4)), (yyvsp[-1].code)); } +#line 3756 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 161: -/* Line 1778 of yacc.c */ -#line 784 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(5)), (yyvsp[(3) - (4)].code)); } +#line 796 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(5)), (yyvsp[-1].code)); } +#line 3762 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 162: -/* Line 1778 of yacc.c */ -#line 785 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(6)), (yyvsp[(3) - (4)].code)); } +#line 797 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(6)), (yyvsp[-1].code)); } +#line 3768 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 163: -/* Line 1778 of yacc.c */ -#line 786 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(7)), (yyvsp[(3) - (4)].code)); } +#line 798 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(7)), (yyvsp[-1].code)); } +#line 3774 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 164: -/* Line 1778 of yacc.c */ -#line 787 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(8)), (yyvsp[(3) - (4)].code)); } +#line 799 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(8)), (yyvsp[-1].code)); } +#line 3780 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 165: -/* Line 1778 of yacc.c */ -#line 788 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(9)), (yyvsp[(3) - (4)].code)); } +#line 800 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(9)), (yyvsp[-1].code)); } +#line 3786 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 166: -/* Line 1778 of yacc.c */ -#line 789 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(10)), (yyvsp[(3) - (4)].code)); } +#line 801 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_vexpr_fun, 2, code_new_numb(numb_new_integer(10)), (yyvsp[-1].code)); } +#line 3792 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 167: -/* Line 1778 of yacc.c */ -#line 790 "src/mmlparse2.y" +#line 802 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vexpr_fun, 3, code_new_numb(numb_new_integer(11)), (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code)); + (yyval.code) = code_new_inst(i_vexpr_fun, 3, code_new_numb(numb_new_integer(11)), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 3800 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 168: -/* Line 1778 of yacc.c */ -#line 793 "src/mmlparse2.y" +#line 805 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_vexpr_fun, 3, code_new_numb(numb_new_integer(12)), (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code)); + (yyval.code) = code_new_inst(i_vexpr_fun, 3, code_new_numb(numb_new_integer(12)), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 3808 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 169: -/* Line 1778 of yacc.c */ -#line 796 "src/mmlparse2.y" +#line 808 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 3816 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 170: -/* Line 1778 of yacc.c */ -#line 799 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 811 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 3822 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 171: -/* Line 1778 of yacc.c */ -#line 807 "src/mmlparse2.y" +#line 819 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_sos, 2, code_new_name((yyvsp[(2) - (5)].name)), (yyvsp[(4) - (5)].code)); + (yyval.code) = code_new_inst(i_sos, 2, code_new_name((yyvsp[-3].name)), (yyvsp[-1].code)); } +#line 3830 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 172: -/* Line 1778 of yacc.c */ -#line 813 "src/mmlparse2.y" +#line 825 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_soset, 3, (yyvsp[(4) - (4)].code), (yyvsp[(1) - (4)].code), (yyvsp[(2) - (4)].code)); + (yyval.code) = code_new_inst(i_soset, 3, (yyvsp[0].code), (yyvsp[-3].code), (yyvsp[-2].code)); } +#line 3838 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 173: -/* Line 1778 of yacc.c */ -#line 816 "src/mmlparse2.y" +#line 828 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_forall, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_forall, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3846 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 174: -/* Line 1778 of yacc.c */ -#line 822 "src/mmlparse2.y" +#line 834 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_numb(numb_new_integer(1)); } +#line 3852 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 175: -/* Line 1778 of yacc.c */ -#line 823 "src/mmlparse2.y" +#line 835 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_numb(numb_new_integer(1)); } +#line 3858 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 176: -/* Line 1778 of yacc.c */ -#line 824 "src/mmlparse2.y" +#line 836 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_numb(numb_new_integer(2)); } +#line 3864 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 177: -/* Line 1778 of yacc.c */ -#line 832 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 844 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 3870 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 178: -/* Line 1778 of yacc.c */ -#line 836 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[(2) - (2)].code)); } +#line 848 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[0].code)); } +#line 3876 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 179: -/* Line 1778 of yacc.c */ -#line 837 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[(2) - (2)].code)); } +#line 849 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[0].code)); } +#line 3882 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 180: -/* Line 1778 of yacc.c */ -#line 838 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[(2) - (2)].code)); } +#line 850 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_print, 1, (yyvsp[0].code)); } +#line 3888 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 181: -/* Line 1778 of yacc.c */ -#line 839 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_print, 1, code_new_symbol((yyvsp[(2) - (2)].sym))); } +#line 851 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_print, 1, code_new_symbol((yyvsp[0].sym))); } +#line 3894 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 182: -/* Line 1778 of yacc.c */ -#line 840 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_check, 1, (yyvsp[(2) - (2)].code)); } +#line 852 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_check, 1, (yyvsp[0].code)); } +#line 3900 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 183: -/* Line 1778 of yacc.c */ -#line 841 "src/mmlparse2.y" +#line 853 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_forall, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_forall, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3908 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 184: -/* Line 1778 of yacc.c */ -#line 851 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 863 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 3914 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 185: -/* Line 1778 of yacc.c */ -#line 852 "src/mmlparse2.y" +#line 864 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_idxset_new, 3, - code_new_inst(i_tuple_empty, 0), (yyvsp[(1) - (1)].code), code_new_inst(i_bool_true, 0)); + code_new_inst(i_tuple_empty, 0), (yyvsp[0].code), code_new_inst(i_bool_true, 0)); } +#line 3923 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 186: -/* Line 1778 of yacc.c */ -#line 859 "src/mmlparse2.y" +#line 871 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_idxset_new, 3, (yyvsp[(1) - (5)].code), (yyvsp[(3) - (5)].code), (yyvsp[(5) - (5)].code)); + (yyval.code) = code_new_inst(i_idxset_new, 3, (yyvsp[-4].code), (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3931 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 187: -/* Line 1778 of yacc.c */ -#line 862 "src/mmlparse2.y" +#line 874 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_idxset_new, 3, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code), code_new_inst(i_bool_true, 0)); + (yyval.code) = code_new_inst(i_idxset_new, 3, (yyvsp[-2].code), (yyvsp[0].code), code_new_inst(i_bool_true, 0)); } +#line 3939 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 189: -/* Line 1778 of yacc.c */ -#line 869 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_union, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 881 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_union, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3945 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 190: -/* Line 1778 of yacc.c */ -#line 870 "src/mmlparse2.y" +#line 882 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_union, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_set_union, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3953 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 191: -/* Line 1778 of yacc.c */ -#line 873 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_sdiff, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 885 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_sdiff, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3959 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 192: -/* Line 1778 of yacc.c */ -#line 874 "src/mmlparse2.y" +#line 886 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_minus, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_set_minus, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3967 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 193: -/* Line 1778 of yacc.c */ -#line 877 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_minus, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 889 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_minus, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3973 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 194: -/* Line 1778 of yacc.c */ -#line 878 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_inter, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 890 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_inter, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3979 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 196: -/* Line 1778 of yacc.c */ -#line 882 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_union2, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); } +#line 894 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_union2, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3985 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 198: -/* Line 1778 of yacc.c */ -#line 887 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_cross, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 899 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_cross, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3991 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 199: -/* Line 1778 of yacc.c */ -#line 888 "src/mmlparse2.y" +#line 900 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_cross, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_set_cross, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 3999 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 200: -/* Line 1778 of yacc.c */ -#line 891 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_inter2, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); } +#line 903 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_inter2, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4005 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 201: -/* Line 1778 of yacc.c */ -#line 895 "src/mmlparse2.y" +#line 907 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[(1) - (2)].sym)), (yyvsp[(2) - (2)].code)); + (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[-1].sym)), (yyvsp[0].code)); } +#line 4013 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 202: -/* Line 1778 of yacc.c */ -#line 898 "src/mmlparse2.y" +#line 910 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_define_deref, 2, - code_new_define((yyvsp[(1) - (4)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(3) - (4)].code))); + code_new_define((yyvsp[-3].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-1].code))); } +#line 4023 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 203: -/* Line 1778 of yacc.c */ -#line 903 "src/mmlparse2.y" +#line 915 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_set_empty, 1, code_new_size(0)); } +#line 4029 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 204: -/* Line 1778 of yacc.c */ -#line 904 "src/mmlparse2.y" +#line 916 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_range2, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_set_range2, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4037 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 205: -/* Line 1778 of yacc.c */ -#line 907 "src/mmlparse2.y" +#line 919 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_range2, 3, (yyvsp[(2) - (5)].code), (yyvsp[(4) - (5)].code), code_new_numb(numb_new_integer(1))); + (yyval.code) = code_new_inst(i_set_range2, 3, (yyvsp[-3].code), (yyvsp[-1].code), code_new_numb(numb_new_integer(1))); } +#line 4045 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 206: -/* Line 1778 of yacc.c */ -#line 910 "src/mmlparse2.y" +#line 922 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_range, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_set_range, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4053 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 207: -/* Line 1778 of yacc.c */ -#line 913 "src/mmlparse2.y" +#line 925 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_range, 3, (yyvsp[(2) - (5)].code), (yyvsp[(4) - (5)].code), code_new_numb(numb_new_integer(1))); + (yyval.code) = code_new_inst(i_set_range, 3, (yyvsp[-3].code), (yyvsp[-1].code), code_new_numb(numb_new_integer(1))); } +#line 4061 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 208: -/* Line 1778 of yacc.c */ -#line 916 "src/mmlparse2.y" +#line 928 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_argmin, 3, code_new_numb(numb_new_integer(1)), (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_set_argmin, 3, code_new_numb(numb_new_integer(1)), (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4069 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 209: -/* Line 1778 of yacc.c */ -#line 919 "src/mmlparse2.y" +#line 931 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_argmin, 3, (yyvsp[(3) - (7)].code), (yyvsp[(5) - (7)].code), (yyvsp[(7) - (7)].code)); + (yyval.code) = code_new_inst(i_set_argmin, 3, (yyvsp[-4].code), (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4077 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 210: -/* Line 1778 of yacc.c */ -#line 922 "src/mmlparse2.y" +#line 934 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_argmax, 3, code_new_numb(numb_new_integer(1)), (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_set_argmax, 3, code_new_numb(numb_new_integer(1)), (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4085 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 211: -/* Line 1778 of yacc.c */ -#line 925 "src/mmlparse2.y" +#line 937 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_argmax, 3, (yyvsp[(3) - (7)].code), (yyvsp[(5) - (7)].code), (yyvsp[(7) - (7)].code)); + (yyval.code) = code_new_inst(i_set_argmax, 3, (yyvsp[-4].code), (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4093 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 212: -/* Line 1778 of yacc.c */ -#line 928 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 940 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 4099 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 213: -/* Line 1778 of yacc.c */ -#line 929 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_new_tuple, 1, (yyvsp[(2) - (3)].code)); } +#line 941 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_new_tuple, 1, (yyvsp[-1].code)); } +#line 4105 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 214: -/* Line 1778 of yacc.c */ -#line 930 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_new_elem, 1, (yyvsp[(2) - (3)].code)); } +#line 942 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_new_elem, 1, (yyvsp[-1].code)); } +#line 4111 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 215: -/* Line 1778 of yacc.c */ -#line 931 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_idxset, 1, (yyvsp[(2) - (3)].code)); } +#line 943 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_idxset, 1, (yyvsp[-1].code)); } +#line 4117 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 216: -/* Line 1778 of yacc.c */ -#line 932 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_expr, 2, (yyvsp[(2) - (5)].code), (yyvsp[(4) - (5)].code)); } +#line 944 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_expr, 2, (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4123 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 217: -/* Line 1778 of yacc.c */ -#line 933 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_set_expr, 2, (yyvsp[(2) - (5)].code), (yyvsp[(4) - (5)].code)); } +#line 945 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_set_expr, 2, (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4129 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 218: -/* Line 1778 of yacc.c */ -#line 934 "src/mmlparse2.y" +#line 946 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_proj, 2, (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code)); + (yyval.code) = code_new_inst(i_set_proj, 2, (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4137 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 219: -/* Line 1778 of yacc.c */ -#line 937 "src/mmlparse2.y" +#line 949 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_set_indexset, 1, code_new_symbol((yyvsp[(3) - (4)].sym))); + (yyval.code) = code_new_inst(i_set_indexset, 1, code_new_symbol((yyvsp[-1].sym))); } +#line 4145 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 220: -/* Line 1778 of yacc.c */ -#line 940 "src/mmlparse2.y" +#line 952 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4153 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 221: -/* Line 1778 of yacc.c */ -#line 946 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_new, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); } +#line 958 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_new, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4159 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 222: -/* Line 1778 of yacc.c */ -#line 947 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_param, 2, (yyvsp[(1) - (2)].code), (yyvsp[(2) - (2)].code)); } +#line 959 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_param, 2, (yyvsp[-1].code), (yyvsp[0].code)); } +#line 4165 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 223: -/* Line 1778 of yacc.c */ -#line 951 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_skip, 1, (yyvsp[(2) - (2)].code)); } +#line 963 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_skip, 1, (yyvsp[0].code)); } +#line 4171 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 224: -/* Line 1778 of yacc.c */ -#line 952 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_use, 1, (yyvsp[(2) - (2)].code)); } +#line 964 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_use, 1, (yyvsp[0].code)); } +#line 4177 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 225: -/* Line 1778 of yacc.c */ -#line 953 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_comment, 1, (yyvsp[(2) - (2)].code)); } +#line 965 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_comment, 1, (yyvsp[0].code)); } +#line 4183 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 226: -/* Line 1778 of yacc.c */ -#line 954 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read_match, 1, (yyvsp[(2) - (2)].code)); } +#line 966 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read_match, 1, (yyvsp[0].code)); } +#line 4189 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 227: -/* Line 1778 of yacc.c */ -#line 958 "src/mmlparse2.y" +#line 970 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_tuple_list_new, 1, (yyvsp[(1) - (1)].code)); + (yyval.code) = code_new_inst(i_tuple_list_new, 1, (yyvsp[0].code)); } +#line 4197 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 228: -/* Line 1778 of yacc.c */ -#line 961 "src/mmlparse2.y" +#line 973 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_tuple_list_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_tuple_list_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4205 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 229: -/* Line 1778 of yacc.c */ -#line 964 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_read, 1, (yyvsp[(1) - (1)].code)); } +#line 976 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_read, 1, (yyvsp[0].code)); } +#line 4211 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 230: -/* Line 1778 of yacc.c */ -#line 968 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_eq, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 980 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_eq, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4217 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 231: -/* Line 1778 of yacc.c */ -#line 969 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_ne, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 981 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_ne, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4223 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 232: -/* Line 1778 of yacc.c */ -#line 970 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_gt, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 982 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_gt, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4229 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 233: -/* Line 1778 of yacc.c */ -#line 971 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_ge, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 983 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_ge, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4235 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 234: -/* Line 1778 of yacc.c */ -#line 972 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_lt, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 984 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_lt, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4241 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 235: -/* Line 1778 of yacc.c */ -#line 973 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_le, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 985 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_le, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4247 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 236: -/* Line 1778 of yacc.c */ -#line 974 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_seq, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 986 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_seq, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4253 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 237: -/* Line 1778 of yacc.c */ -#line 975 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_sneq, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 987 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_sneq, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4259 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 238: -/* Line 1778 of yacc.c */ -#line 976 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_subs, 2, (yyvsp[(3) - (3)].code), (yyvsp[(1) - (3)].code)); } +#line 988 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_subs, 2, (yyvsp[0].code), (yyvsp[-2].code)); } +#line 4265 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 239: -/* Line 1778 of yacc.c */ -#line 977 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_sseq, 2, (yyvsp[(3) - (3)].code), (yyvsp[(1) - (3)].code)); } +#line 989 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_sseq, 2, (yyvsp[0].code), (yyvsp[-2].code)); } +#line 4271 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 240: -/* Line 1778 of yacc.c */ -#line 978 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_subs, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 990 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_subs, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4277 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 241: -/* Line 1778 of yacc.c */ -#line 979 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_sseq, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 991 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_sseq, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4283 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 242: -/* Line 1778 of yacc.c */ -#line 980 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_and, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 992 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_and, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4289 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 243: -/* Line 1778 of yacc.c */ -#line 981 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_or, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 993 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_or, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4295 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 244: -/* Line 1778 of yacc.c */ -#line 982 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_xor, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 994 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_xor, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4301 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 245: -/* Line 1778 of yacc.c */ -#line 983 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_not, 1, (yyvsp[(2) - (2)].code)); } +#line 995 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_not, 1, (yyvsp[0].code)); } +#line 4307 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 246: -/* Line 1778 of yacc.c */ -#line 984 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 996 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 4313 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 247: -/* Line 1778 of yacc.c */ -#line 985 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_is_elem, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 997 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_is_elem, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4319 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 248: -/* Line 1778 of yacc.c */ -#line 986 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_bool_exists, 1, (yyvsp[(3) - (4)].code)); } +#line 998 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_bool_exists, 1, (yyvsp[-1].code)); } +#line 4325 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 249: -/* Line 1778 of yacc.c */ -#line 987 "src/mmlparse2.y" +#line 999 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_define_deref, 2, - code_new_define((yyvsp[(1) - (4)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(3) - (4)].code))); + code_new_define((yyvsp[-3].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-1].code))); } +#line 4335 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 250: -/* Line 1778 of yacc.c */ -#line 992 "src/mmlparse2.y" +#line 1004 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4343 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 251: -/* Line 1778 of yacc.c */ -#line 998 "src/mmlparse2.y" +#line 1010 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_tuple_empty, 0); } +#line 4349 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 252: -/* Line 1778 of yacc.c */ -#line 999 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_tuple_new, 1, (yyvsp[(2) - (3)].code)); } +#line 1011 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_tuple_new, 1, (yyvsp[-1].code)); } +#line 4355 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 253: -/* Line 1778 of yacc.c */ -#line 1003 "src/mmlparse2.y" +#line 1015 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_tuple_empty, 0); } +#line 4363 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 254: -/* Line 1778 of yacc.c */ -#line 1006 "src/mmlparse2.y" +#line 1018 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_tuple_new, 1, (yyvsp[(2) - (3)].code)); + (yyval.code) = code_new_inst(i_tuple_new, 1, (yyvsp[-1].code)); } +#line 4371 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 255: -/* Line 1778 of yacc.c */ -#line 1012 "src/mmlparse2.y" +#line 1024 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_elem_list_new, 1, (yyvsp[(1) - (1)].code)); + (yyval.code) = code_new_inst(i_elem_list_new, 1, (yyvsp[0].code)); } +#line 4379 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 256: -/* Line 1778 of yacc.c */ -#line 1015 "src/mmlparse2.y" +#line 1027 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_elem_list_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); + (yyval.code) = code_new_inst(i_elem_list_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4387 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 257: -/* Line 1778 of yacc.c */ -#line 1021 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 1033 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 4393 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 258: -/* Line 1778 of yacc.c */ -#line 1022 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_add, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1034 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_add, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4399 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 259: -/* Line 1778 of yacc.c */ -#line 1023 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_sub, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1035 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_sub, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4405 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 260: -/* Line 1778 of yacc.c */ -#line 1027 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(1) - (1)].code); } +#line 1039 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 4411 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 261: -/* Line 1778 of yacc.c */ -#line 1028 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_mul, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1040 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_mul, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4417 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 262: -/* Line 1778 of yacc.c */ -#line 1029 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_div, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1041 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_div, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4423 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 263: -/* Line 1778 of yacc.c */ -#line 1030 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_mod, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1042 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_mod, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4429 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 264: -/* Line 1778 of yacc.c */ -#line 1031 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_intdiv, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1043 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_intdiv, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4435 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 265: -/* Line 1778 of yacc.c */ -#line 1032 "src/mmlparse2.y" +#line 1044 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_prod, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_prod, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4443 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 267: -/* Line 1778 of yacc.c */ -#line 1039 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (2)].code); } +#line 1051 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[0].code); } +#line 4449 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 268: -/* Line 1778 of yacc.c */ -#line 1040 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_neg, 1, (yyvsp[(2) - (2)].code)); } +#line 1052 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_neg, 1, (yyvsp[0].code)); } +#line 4455 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 270: -/* Line 1778 of yacc.c */ -#line 1045 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_pow, 2, (yyvsp[(1) - (3)].code), (yyvsp[(3) - (3)].code)); } +#line 1057 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_pow, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4461 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 271: -/* Line 1778 of yacc.c */ -#line 1046 "src/mmlparse2.y" +#line 1058 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_sum, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_sum, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4469 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 272: -/* Line 1778 of yacc.c */ -#line 1049 "src/mmlparse2.y" +#line 1061 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_min, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_min, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4477 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 273: -/* Line 1778 of yacc.c */ -#line 1052 "src/mmlparse2.y" +#line 1064 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_max, 2, (yyvsp[(2) - (4)].code), (yyvsp[(4) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_max, 2, (yyvsp[-2].code), (yyvsp[0].code)); } +#line 4485 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 274: -/* Line 1778 of yacc.c */ -#line 1055 "src/mmlparse2.y" +#line 1067 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_sglmin, 1, (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_sglmin, 1, (yyvsp[-1].code)); } +#line 4493 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 275: -/* Line 1778 of yacc.c */ -#line 1058 "src/mmlparse2.y" +#line 1070 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_sglmax, 1, (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_sglmax, 1, (yyvsp[-1].code)); } +#line 4501 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 276: -/* Line 1778 of yacc.c */ -#line 1064 "src/mmlparse2.y" - { (yyval.code) = code_new_numb((yyvsp[(1) - (1)].numb)); } +#line 1076 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_numb((yyvsp[0].numb)); } +#line 4507 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 277: -/* Line 1778 of yacc.c */ -#line 1065 "src/mmlparse2.y" - { (yyval.code) = code_new_strg((yyvsp[(1) - (1)].strg)); } +#line 1077 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_strg((yyvsp[0].strg)); } +#line 4513 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 278: -/* Line 1778 of yacc.c */ -#line 1066 "src/mmlparse2.y" +#line 1078 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_local_deref, 1, code_new_name((yyvsp[(1) - (1)].name))); + (yyval.code) = code_new_inst(i_local_deref, 1, code_new_name((yyvsp[0].name))); } +#line 4521 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 279: -/* Line 1778 of yacc.c */ -#line 1069 "src/mmlparse2.y" +#line 1081 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[(1) - (2)].sym)), (yyvsp[(2) - (2)].code)); + (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[-1].sym)), (yyvsp[0].code)); } +#line 4529 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 280: -/* Line 1778 of yacc.c */ -#line 1072 "src/mmlparse2.y" +#line 1084 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[(1) - (2)].sym)), (yyvsp[(2) - (2)].code)); + (yyval.code) = code_new_inst(i_symbol_deref, 2, code_new_symbol((yyvsp[-1].sym)), (yyvsp[0].code)); } +#line 4537 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 281: -/* Line 1778 of yacc.c */ -#line 1075 "src/mmlparse2.y" +#line 1087 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_define_deref, 2, - code_new_define((yyvsp[(1) - (4)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(3) - (4)].code))); + code_new_define((yyvsp[-3].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-1].code))); } +#line 4547 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 282: -/* Line 1778 of yacc.c */ -#line 1080 "src/mmlparse2.y" +#line 1092 "src/mmlparse2.y" /* yacc.c:1646 */ { (yyval.code) = code_new_inst(i_define_deref, 2, - code_new_define((yyvsp[(1) - (4)].def)), - code_new_inst(i_tuple_new, 1, (yyvsp[(3) - (4)].code))); + code_new_define((yyvsp[-3].def)), + code_new_inst(i_tuple_new, 1, (yyvsp[-1].code))); } +#line 4557 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 283: -/* Line 1778 of yacc.c */ -#line 1085 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_fac, 1, (yyvsp[(1) - (2)].code)); } +#line 1097 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_fac, 1, (yyvsp[-1].code)); } +#line 4563 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 284: -/* Line 1778 of yacc.c */ -#line 1086 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_card, 1, (yyvsp[(3) - (4)].code)); } +#line 1098 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_card, 1, (yyvsp[-1].code)); } +#line 4569 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 285: -/* Line 1778 of yacc.c */ -#line 1087 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_abs, 1, (yyvsp[(3) - (4)].code)); } +#line 1099 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_abs, 1, (yyvsp[-1].code)); } +#line 4575 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 286: -/* Line 1778 of yacc.c */ -#line 1088 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_sgn, 1, (yyvsp[(3) - (4)].code)); } +#line 1100 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_sgn, 1, (yyvsp[-1].code)); } +#line 4581 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 287: -/* Line 1778 of yacc.c */ -#line 1089 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_round, 1, (yyvsp[(3) - (4)].code)); } +#line 1101 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_round, 1, (yyvsp[-1].code)); } +#line 4587 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 288: -/* Line 1778 of yacc.c */ -#line 1090 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_floor, 1, (yyvsp[(3) - (4)].code)); } +#line 1102 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_floor, 1, (yyvsp[-1].code)); } +#line 4593 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 289: -/* Line 1778 of yacc.c */ -#line 1091 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_ceil, 1, (yyvsp[(3) - (4)].code)); } +#line 1103 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_ceil, 1, (yyvsp[-1].code)); } +#line 4599 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 290: -/* Line 1778 of yacc.c */ -#line 1092 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_log, 1, (yyvsp[(3) - (4)].code)); } +#line 1104 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_log, 1, (yyvsp[-1].code)); } +#line 4605 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 291: -/* Line 1778 of yacc.c */ -#line 1093 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_ln, 1, (yyvsp[(3) - (4)].code)); } +#line 1105 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_ln, 1, (yyvsp[-1].code)); } +#line 4611 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 292: -/* Line 1778 of yacc.c */ -#line 1094 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_exp, 1, (yyvsp[(3) - (4)].code)); } +#line 1106 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_exp, 1, (yyvsp[-1].code)); } +#line 4617 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 293: -/* Line 1778 of yacc.c */ -#line 1095 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_sqrt, 1, (yyvsp[(3) - (4)].code)); } +#line 1107 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_sqrt, 1, (yyvsp[-1].code)); } +#line 4623 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 294: -/* Line 1778 of yacc.c */ -#line 1096 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_sin, 1, (yyvsp[(3) - (4)].code)); } +#line 1108 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_sin, 1, (yyvsp[-1].code)); } +#line 4629 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 295: -/* Line 1778 of yacc.c */ -#line 1097 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_cos, 1, (yyvsp[(3) - (4)].code)); } +#line 1109 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_cos, 1, (yyvsp[-1].code)); } +#line 4635 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 296: -/* Line 1778 of yacc.c */ -#line 1098 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_tan, 1, (yyvsp[(3) - (4)].code)); } +#line 1110 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_tan, 1, (yyvsp[-1].code)); } +#line 4641 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 297: -/* Line 1778 of yacc.c */ -#line 1099 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_asin, 1, (yyvsp[(3) - (4)].code)); } +#line 1111 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_asin, 1, (yyvsp[-1].code)); } +#line 4647 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 298: -/* Line 1778 of yacc.c */ -#line 1100 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_acos, 1, (yyvsp[(3) - (4)].code)); } +#line 1112 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_acos, 1, (yyvsp[-1].code)); } +#line 4653 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 299: -/* Line 1778 of yacc.c */ -#line 1101 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_atan, 1, (yyvsp[(3) - (4)].code)); } +#line 1113 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_atan, 1, (yyvsp[-1].code)); } +#line 4659 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 300: -/* Line 1778 of yacc.c */ -#line 1103 "src/mmlparse2.y" - { (yyval.code) = (yyvsp[(2) - (3)].code); } +#line 1115 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = (yyvsp[-1].code); } +#line 4665 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 301: -/* Line 1778 of yacc.c */ -#line 1104 "src/mmlparse2.y" - { (yyval.code) = code_new_inst(i_expr_length, 1, (yyvsp[(3) - (4)].code)); } +#line 1116 "src/mmlparse2.y" /* yacc.c:1646 */ + { (yyval.code) = code_new_inst(i_expr_length, 1, (yyvsp[-1].code)); } +#line 4671 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 302: -/* Line 1778 of yacc.c */ -#line 1105 "src/mmlparse2.y" +#line 1117 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_substr, 3, (yyvsp[(3) - (8)].code), (yyvsp[(5) - (8)].code), (yyvsp[(7) - (8)].code)); + (yyval.code) = code_new_inst(i_expr_substr, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4679 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 303: -/* Line 1778 of yacc.c */ -#line 1108 "src/mmlparse2.y" +#line 1120 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_rand, 2, (yyvsp[(3) - (6)].code), (yyvsp[(5) - (6)].code)); + (yyval.code) = code_new_inst(i_expr_rand, 2, (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4687 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 304: -/* Line 1778 of yacc.c */ -#line 1111 "src/mmlparse2.y" +#line 1123 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[(2) - (7)].code), (yyvsp[(4) - (7)].code), (yyvsp[(6) - (7)].code)); + (yyval.code) = code_new_inst(i_expr_if_else, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4695 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 305: -/* Line 1778 of yacc.c */ -#line 1114 "src/mmlparse2.y" +#line 1126 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_ord, 3, (yyvsp[(3) - (8)].code), (yyvsp[(5) - (8)].code), (yyvsp[(7) - (8)].code)); + (yyval.code) = code_new_inst(i_expr_ord, 3, (yyvsp[-5].code), (yyvsp[-3].code), (yyvsp[-1].code)); } +#line 4703 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 306: -/* Line 1778 of yacc.c */ -#line 1117 "src/mmlparse2.y" +#line 1129 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_min2, 1, (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_min2, 1, (yyvsp[-1].code)); } +#line 4711 "src/mmlparse2.c" /* yacc.c:1646 */ break; case 307: -/* Line 1778 of yacc.c */ -#line 1120 "src/mmlparse2.y" +#line 1132 "src/mmlparse2.y" /* yacc.c:1646 */ { - (yyval.code) = code_new_inst(i_expr_max2, 1, (yyvsp[(3) - (4)].code)); + (yyval.code) = code_new_inst(i_expr_max2, 1, (yyvsp[-1].code)); } +#line 4719 "src/mmlparse2.c" /* yacc.c:1646 */ break; -/* Line 1778 of yacc.c */ -#line 5024 "src/mmlparse2.c" +#line 4723 "src/mmlparse2.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -5042,7 +4741,7 @@ *++yyvsp = yyval; - /* Now `shift' the result of the reduction. Determine what state + /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ @@ -5057,9 +4756,9 @@ goto yynewstate; -/*------------------------------------. -| yyerrlab -- here on detecting error | -`------------------------------------*/ +/*--------------------------------------. +| yyerrlab -- here on detecting error. | +`--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ @@ -5110,20 +4809,20 @@ if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an - error, discard it. */ + error, discard it. */ if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } + { + /* Return failure if at end of input. */ + if (yychar == YYEOF) + YYABORT; + } else - { - yydestruct ("Error: discarding", - yytoken, &yylval); - yychar = YYEMPTY; - } + { + yydestruct ("Error: discarding", + yytoken, &yylval); + yychar = YYEMPTY; + } } /* Else will try to reuse lookahead token after shifting the error @@ -5142,7 +4841,7 @@ if (/*CONSTCOND*/ 0) goto yyerrorlab; - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; @@ -5155,29 +4854,29 @@ | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ + yyerrstatus = 3; /* Each real token shifted decrements this. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } + { + yyn += YYTERROR; + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) + { + yyn = yytable[yyn]; + if (0 < yyn) + break; + } + } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) - YYABORT; + YYABORT; yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -5228,14 +4927,14 @@ yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval); } - /* Do not reclaim the symbols of the rule which action triggered + /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp); YYPOPSTACK (1); } #ifndef yyoverflow @@ -5246,8 +4945,5 @@ if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); #endif - /* Make sure YYID is used. */ - return YYID (yyresult); + return yyresult; } - - diff -Nru zimpl-3.3.2/src/mmlparse2.h zimpl-3.3.4/src/mmlparse2.h --- zimpl-3.3.2/src/mmlparse2.h 2014-01-29 12:04:35.082751808 +0000 +++ zimpl-3.3.4/src/mmlparse2.h 2017-03-08 13:12:45.000000000 +0000 @@ -1,19 +1,19 @@ -/* A Bison parser, made by GNU Bison 2.6.5. */ +/* A Bison parser, made by GNU Bison 3.0.4. */ /* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc. - + + Copyright (C) 1984, 1989-1990, 2000-2015 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 3 of the License, 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, see . */ @@ -26,13 +26,13 @@ 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. */ #ifndef YY_YY_SRC_MMLPARSE2_H_INCLUDED # define YY_YY_SRC_MMLPARSE2_H_INCLUDED -/* Enabling traces. */ +/* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 1 #endif @@ -40,132 +40,131 @@ extern int yydebug; #endif -/* Tokens. */ +/* Token type. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE - /* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ - enum yytokentype { - DECLSET = 258, - DECLPAR = 259, - DECLVAR = 260, - DECLMIN = 261, - DECLMAX = 262, - DECLSUB = 263, - DECLSOS = 264, - DEFNUMB = 265, - DEFSTRG = 266, - DEFBOOL = 267, - DEFSET = 268, - PRINT = 269, - CHECK = 270, - BINARY = 271, - INTEGER = 272, - REAL = 273, - IMPLICIT = 274, - ASGN = 275, - DO = 276, - WITH = 277, - IN = 278, - TO = 279, - UNTIL = 280, - BY = 281, - FORALL = 282, - EXISTS = 283, - PRIORITY = 284, - STARTVAL = 285, - DEFAULT = 286, - CMP_LE = 287, - CMP_GE = 288, - CMP_EQ = 289, - CMP_LT = 290, - CMP_GT = 291, - CMP_NE = 292, - INFTY = 293, - AND = 294, - OR = 295, - XOR = 296, - NOT = 297, - SUM = 298, - MIN = 299, - MAX = 300, - ARGMIN = 301, - ARGMAX = 302, - PROD = 303, - IF = 304, - THEN = 305, - ELSE = 306, - END = 307, - INTER = 308, - UNION = 309, - CROSS = 310, - SYMDIFF = 311, - WITHOUT = 312, - PROJ = 313, - MOD = 314, - DIV = 315, - POW = 316, - FAC = 317, - CARD = 318, - ROUND = 319, - FLOOR = 320, - CEIL = 321, - RANDOM = 322, - ORD = 323, - ABS = 324, - SGN = 325, - LOG = 326, - LN = 327, - EXP = 328, - SQRT = 329, - SIN = 330, - COS = 331, - TAN = 332, - ASIN = 333, - ACOS = 334, - ATAN = 335, - POWER = 336, - SGNPOW = 337, - READ = 338, - AS = 339, - SKIP = 340, - USE = 341, - COMMENT = 342, - MATCH = 343, - SUBSETS = 344, - INDEXSET = 345, - POWERSET = 346, - VIF = 347, - VABS = 348, - TYPE1 = 349, - TYPE2 = 350, - LENGTH = 351, - SUBSTR = 352, - NUMBSYM = 353, - STRGSYM = 354, - VARSYM = 355, - SETSYM = 356, - NUMBDEF = 357, - STRGDEF = 358, - BOOLDEF = 359, - SETDEF = 360, - DEFNAME = 361, - NAME = 362, - STRG = 363, - NUMB = 364, - SCALE = 365, - SEPARATE = 366, - CHECKONLY = 367, - INDICATOR = 368 - }; + enum yytokentype + { + DECLSET = 258, + DECLPAR = 259, + DECLVAR = 260, + DECLMIN = 261, + DECLMAX = 262, + DECLSUB = 263, + DECLSOS = 264, + DEFNUMB = 265, + DEFSTRG = 266, + DEFBOOL = 267, + DEFSET = 268, + PRINT = 269, + CHECK = 270, + BINARY = 271, + INTEGER = 272, + REAL = 273, + IMPLICIT = 274, + ASGN = 275, + DO = 276, + WITH = 277, + IN = 278, + TO = 279, + UNTIL = 280, + BY = 281, + FORALL = 282, + EXISTS = 283, + PRIORITY = 284, + STARTVAL = 285, + DEFAULT = 286, + CMP_LE = 287, + CMP_GE = 288, + CMP_EQ = 289, + CMP_LT = 290, + CMP_GT = 291, + CMP_NE = 292, + INFTY = 293, + AND = 294, + OR = 295, + XOR = 296, + NOT = 297, + SUM = 298, + MIN = 299, + MAX = 300, + ARGMIN = 301, + ARGMAX = 302, + PROD = 303, + IF = 304, + THEN = 305, + ELSE = 306, + END = 307, + INTER = 308, + UNION = 309, + CROSS = 310, + SYMDIFF = 311, + WITHOUT = 312, + PROJ = 313, + MOD = 314, + DIV = 315, + POW = 316, + FAC = 317, + CARD = 318, + ROUND = 319, + FLOOR = 320, + CEIL = 321, + RANDOM = 322, + ORD = 323, + ABS = 324, + SGN = 325, + LOG = 326, + LN = 327, + EXP = 328, + SQRT = 329, + SIN = 330, + COS = 331, + TAN = 332, + ASIN = 333, + ACOS = 334, + ATAN = 335, + POWER = 336, + SGNPOW = 337, + READ = 338, + AS = 339, + SKIP = 340, + USE = 341, + COMMENT = 342, + MATCH = 343, + SUBSETS = 344, + INDEXSET = 345, + POWERSET = 346, + VIF = 347, + VABS = 348, + TYPE1 = 349, + TYPE2 = 350, + LENGTH = 351, + SUBSTR = 352, + NUMBSYM = 353, + STRGSYM = 354, + VARSYM = 355, + SETSYM = 356, + NUMBDEF = 357, + STRGDEF = 358, + BOOLDEF = 359, + SETDEF = 360, + DEFNAME = 361, + NAME = 362, + STRG = 363, + NUMB = 364, + SCALE = 365, + SEPARATE = 366, + CHECKONLY = 367, + INDICATOR = 368 + }; #endif - +/* Value type. */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE + +union YYSTYPE { -/* Line 2042 of yacc.c */ -#line 79 "src/mmlparse2.y" +#line 91 "src/mmlparse2.y" /* yacc.c:1909 */ unsigned int bits; Numb* numb; @@ -175,28 +174,16 @@ Define* def; CodeNode* code; +#line 178 "src/mmlparse2.h" /* yacc.c:1909 */ +}; -/* Line 2042 of yacc.c */ -#line 181 "src/mmlparse2.h" -} YYSTYPE; +typedef union YYSTYPE YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 -# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 #endif -#ifdef YYPARSE_PARAM -#if defined __STDC__ || defined __cplusplus -int yyparse (void *YYPARSE_PARAM); -#else -int yyparse (); -#endif -#else /* ! YYPARSE_PARAM */ -#if defined __STDC__ || defined __cplusplus + int yyparse (void); -#else -int yyparse (); -#endif -#endif /* ! YYPARSE_PARAM */ #endif /* !YY_YY_SRC_MMLPARSE2_H_INCLUDED */ diff -Nru zimpl-3.3.2/src/mmlparse2.y zimpl-3.3.4/src/mmlparse2.y --- zimpl-3.3.2/src/mmlparse2.y 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/mmlparse2.y 2017-03-08 12:00:18.000000000 +0000 @@ -1,5 +1,4 @@ %{ -#pragma ident "@(#) $Id: mmlparse2.y,v 1.13 2014/01/12 09:47:38 bzfkocht Exp $" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mmlparse2.y */ @@ -9,7 +8,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -38,7 +37,14 @@ /*lint -esym(768,bits) -esym(553,YYSTACK_USE_ALLOCA) */ /*lint -esym(593,yymsg) Custodial pointer possibly not freed */ /*lint -esym(426,mem_malloc) call violates semantics */ - + +#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" +#pragma clang diagnostic ignored "-Wconversion" +#pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic ignored "-Wunused-macros" +#pragma clang diagnostic ignored "-Wimplicit-function-declaration" +#pragma clang diagnostic ignored "-Wunreachable-code" + #include #include #include @@ -68,6 +74,12 @@ #define YYERROR_VERBOSE 1 +/* the function is actually getting a YYSTYPE* as argument, but the + * type isn't available here, so it is decalred to accept any number of + * arguments, i.e. yylex() and not yylex(void). + */ +extern int yylex(); + /*lint -sem(yyerror, 1p && nulterm(1), r_no) */ extern void yyerror(const char* s); diff -Nru zimpl-3.3.2/src/mmlscan.c zimpl-3.3.4/src/mmlscan.c --- zimpl-3.3.2/src/mmlscan.c 2014-01-29 12:04:35.730769091 +0000 +++ zimpl-3.3.4/src/mmlscan.c 2017-03-07 17:21:37.000000000 +0000 @@ -17,8 +17,8 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 37 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 0 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -185,7 +185,15 @@ /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -217,6 +225,7 @@ #define EOB_ACT_LAST_MATCH 2 #define YY_LESS_LINENO(n) + #define YY_LINENO_REWIND_TO(ptr) /* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ @@ -256,7 +265,7 @@ /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -340,7 +349,7 @@ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +static int yy_n_chars; /* number of characters read into yy_ch_buf */ yy_size_t yyleng; /* Points to current character in buffer. */ @@ -407,7 +416,7 @@ /* %% [1.0] yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here */ /* Begin user sect3 */ -#define yywrap() 1 +#define yywrap() (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define FLEX_DEBUG @@ -423,13 +432,21 @@ int yylineno = 1; extern char *yytext; +#ifdef yytext_ptr +#undef yytext_ptr +#endif #define yytext_ptr yytext +/* %% [1.5] DFA */ + /* %if-c-only Standard (non-C++) definition */ static yy_state_type yy_get_previous_state (void ); static yy_state_type yy_try_NUL_trans (yy_state_type current_state ); static int yy_get_next_buffer (void ); +#if defined(__GNUC__) && __GNUC__ >= 3 +__attribute__((__noreturn__)) +#endif static void yy_fatal_error (yyconst char msg[] ); /* %endif */ @@ -498,7 +515,7 @@ 62, 63, 0 } ; -static yyconst flex_int32_t yy_ec[256] = +static yyconst YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, @@ -530,7 +547,7 @@ 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[49] = +static yyconst YY_CHAR yy_meta[49] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 1, 1, 1, 1, 2, 2, 1, @@ -539,7 +556,7 @@ 2, 2, 2, 2, 2, 2, 2, 1 } ; -static yyconst flex_int16_t yy_base[347] = +static yyconst flex_uint16_t yy_base[347] = { 0, 0, 0, 405, 406, 47, 49, 388, 398, 396, 394, 43, 47, 384, 383, 382, 381, 0, 406, 406, 39, @@ -623,7 +640,7 @@ 346, 346, 0, 343, 343, 343 } ; -static yyconst flex_int16_t yy_nxt[455] = +static yyconst flex_uint16_t yy_nxt[455] = { 0, 4, 5, 6, 7, 8, 9, 10, 4, 4, 11, 12, 12, 12, 13, 14, 15, 16, 17, 17, 18, @@ -739,18 +756,18 @@ static yyconst flex_int16_t yy_rule_linenum[107] = { 0, - 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, - 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 170, 171, 172, 173, 174, 175, 176, 178, + 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, + 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, + 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, + 174, 175, 176, 177, 178, 179, 180, 181, 182, 184, - 184, 191, 308, 314, 321, 323 + 190, 197, 314, 320, 327, 329 } ; /* The intent behind this definition is that it'll catch @@ -771,7 +788,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -788,7 +805,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #line 27 "src/mmlscan.l" -#pragma ident "@(#) $Id: mmlscan.l,v 1.62 2014/01/12 09:47:38 bzfkocht Exp $" + +#pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic ignored "-Wconversion" +#pragma clang diagnostic ignored "-Wmissing-prototypes" +#pragma clang diagnostic ignored "-Wunused-macros" +#pragma clang diagnostic ignored "-Wmissing-noreturn" +#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" /*lint -e429 */ /*lint -e506 -e525 -e528 -e527 -e537 -e539 -e551 -e553 -e613 -e633 */ @@ -830,7 +853,7 @@ static int yycolumn = 0; static int yydecl = 0; -#line 834 "src/mmlscan.c" +#line 857 "src/mmlscan.c" #define INITIAL 0 @@ -876,11 +899,11 @@ FILE *yyget_in (void ); -void yyset_in (FILE * in_str ); +void yyset_in (FILE * _in_str ); FILE *yyget_out (void ); -void yyset_out (FILE * out_str ); +void yyset_out (FILE * _out_str ); yy_size_t yyget_leng (void ); @@ -888,7 +911,7 @@ int yyget_lineno (void ); -void yyset_lineno (int line_number ); +void yyset_lineno (int _line_number ); /* %if-bison-bridge */ /* %endif */ @@ -907,6 +930,9 @@ /* %not-for-header */ +#ifndef YY_NO_UNPUT + +#endif /* %ok-for-header */ /* %endif */ @@ -939,7 +965,12 @@ /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1052,7 +1083,7 @@ /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif /* %% [6.0] YY_RULE_SETUP definition goes here */ @@ -1065,15 +1096,10 @@ */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; -/* %% [7.0] user's declarations go here */ -#line 77 "src/mmlscan.l" - -#line 1076 "src/mmlscan.c" - if ( !(yy_init) ) { (yy_init) = 1; @@ -1108,7 +1134,13 @@ yy_load_buffer_state( ); } - while ( 1 ) /* loops until end-of-file is reached */ + { +/* %% [7.0] user's declarations go here */ +#line 83 "src/mmlscan.l" + +#line 1142 "src/mmlscan.c" + + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { /* %% [8.0] yymore()-related code goes here */ yy_cp = (yy_c_buf_p); @@ -1126,7 +1158,7 @@ yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -1184,502 +1216,502 @@ case 1: YY_RULE_SETUP -#line 78 "src/mmlscan.l" +#line 84 "src/mmlscan.l" { yycolumn += yyleng; return POW; } YY_BREAK case 2: YY_RULE_SETUP -#line 79 "src/mmlscan.l" +#line 85 "src/mmlscan.l" { yycolumn += yyleng; return ASGN; } YY_BREAK case 3: YY_RULE_SETUP -#line 80 "src/mmlscan.l" +#line 86 "src/mmlscan.l" { yycolumn += yyleng; return CMP_EQ; } YY_BREAK case 4: YY_RULE_SETUP -#line 81 "src/mmlscan.l" +#line 87 "src/mmlscan.l" { yycolumn += yyleng; return CMP_LE; } YY_BREAK case 5: YY_RULE_SETUP -#line 82 "src/mmlscan.l" +#line 88 "src/mmlscan.l" { yycolumn += yyleng; return CMP_GE; } YY_BREAK case 6: YY_RULE_SETUP -#line 83 "src/mmlscan.l" +#line 89 "src/mmlscan.l" { yycolumn += yyleng; return CMP_LT; } YY_BREAK case 7: YY_RULE_SETUP -#line 84 "src/mmlscan.l" +#line 90 "src/mmlscan.l" { yycolumn += yyleng; return CMP_GT; } YY_BREAK case 8: YY_RULE_SETUP -#line 85 "src/mmlscan.l" +#line 91 "src/mmlscan.l" { yycolumn += yyleng; return CMP_NE; } YY_BREAK case 9: YY_RULE_SETUP -#line 86 "src/mmlscan.l" +#line 92 "src/mmlscan.l" { yycolumn += yyleng; return FAC; } YY_BREAK case 10: YY_RULE_SETUP -#line 87 "src/mmlscan.l" +#line 93 "src/mmlscan.l" { yycolumn += yyleng; return NOT; } YY_BREAK case 11: YY_RULE_SETUP -#line 88 "src/mmlscan.l" +#line 94 "src/mmlscan.l" { yycolumn += yyleng; return AND; } YY_BREAK case 12: YY_RULE_SETUP -#line 89 "src/mmlscan.l" +#line 95 "src/mmlscan.l" { yycolumn += yyleng; return OR; } YY_BREAK case 13: YY_RULE_SETUP -#line 90 "src/mmlscan.l" +#line 96 "src/mmlscan.l" { yycolumn += yyleng; return XOR; } YY_BREAK case 14: YY_RULE_SETUP -#line 91 "src/mmlscan.l" +#line 97 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLSET; return DECLSET; } YY_BREAK case 15: YY_RULE_SETUP -#line 92 "src/mmlscan.l" +#line 98 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLPAR; return DECLPAR; } YY_BREAK case 16: YY_RULE_SETUP -#line 93 "src/mmlscan.l" +#line 99 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLVAR; return DECLVAR; } YY_BREAK case 17: YY_RULE_SETUP -#line 94 "src/mmlscan.l" +#line 100 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLMAX; return DECLMAX; } YY_BREAK case 18: YY_RULE_SETUP -#line 95 "src/mmlscan.l" +#line 101 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLMIN; return DECLMIN; } YY_BREAK case 19: YY_RULE_SETUP -#line 96 "src/mmlscan.l" +#line 102 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLSUB; return DECLSUB; } YY_BREAK case 20: YY_RULE_SETUP -#line 97 "src/mmlscan.l" +#line 103 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DECLSOS; return DECLSOS; } YY_BREAK case 21: YY_RULE_SETUP -#line 98 "src/mmlscan.l" +#line 104 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DEFNUMB; return DEFNUMB; } YY_BREAK case 22: YY_RULE_SETUP -#line 99 "src/mmlscan.l" +#line 105 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DEFSTRG; return DEFSTRG; } YY_BREAK case 23: YY_RULE_SETUP -#line 100 "src/mmlscan.l" +#line 106 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DEFBOOL; return DEFBOOL; } YY_BREAK case 24: YY_RULE_SETUP -#line 101 "src/mmlscan.l" +#line 107 "src/mmlscan.l" { yycolumn += yyleng; yydecl = DEFSET; return DEFSET; } YY_BREAK case 25: YY_RULE_SETUP -#line 102 "src/mmlscan.l" +#line 108 "src/mmlscan.l" { yycolumn += yyleng; return IN; } YY_BREAK case 26: YY_RULE_SETUP -#line 103 "src/mmlscan.l" +#line 109 "src/mmlscan.l" { yycolumn += yyleng; return WITH; } YY_BREAK case 27: YY_RULE_SETUP -#line 104 "src/mmlscan.l" +#line 110 "src/mmlscan.l" { yycolumn += yyleng; return DO; } YY_BREAK case 28: YY_RULE_SETUP -#line 105 "src/mmlscan.l" +#line 111 "src/mmlscan.l" { yycolumn += yyleng; return BINARY; } YY_BREAK case 29: YY_RULE_SETUP -#line 106 "src/mmlscan.l" +#line 112 "src/mmlscan.l" { yycolumn += yyleng; return INTEGER; } YY_BREAK case 30: YY_RULE_SETUP -#line 107 "src/mmlscan.l" +#line 113 "src/mmlscan.l" { yycolumn += yyleng; return REAL; } YY_BREAK case 31: YY_RULE_SETUP -#line 108 "src/mmlscan.l" +#line 114 "src/mmlscan.l" { yycolumn += yyleng; return SUM; } YY_BREAK case 32: YY_RULE_SETUP -#line 109 "src/mmlscan.l" +#line 115 "src/mmlscan.l" { yycolumn += yyleng; return PROD; } YY_BREAK case 33: YY_RULE_SETUP -#line 110 "src/mmlscan.l" +#line 116 "src/mmlscan.l" { yycolumn += yyleng; return FORALL; } YY_BREAK case 34: YY_RULE_SETUP -#line 111 "src/mmlscan.l" +#line 117 "src/mmlscan.l" { yycolumn += yyleng; return EXISTS; } YY_BREAK case 35: YY_RULE_SETUP -#line 112 "src/mmlscan.l" +#line 118 "src/mmlscan.l" { yycolumn += yyleng; return VIF; } YY_BREAK case 36: YY_RULE_SETUP -#line 113 "src/mmlscan.l" +#line 119 "src/mmlscan.l" { yycolumn += yyleng; return IF; } YY_BREAK case 37: YY_RULE_SETUP -#line 114 "src/mmlscan.l" +#line 120 "src/mmlscan.l" { yycolumn += yyleng; return THEN; } YY_BREAK case 38: YY_RULE_SETUP -#line 115 "src/mmlscan.l" +#line 121 "src/mmlscan.l" { yycolumn += yyleng; return ELSE; } YY_BREAK case 39: YY_RULE_SETUP -#line 116 "src/mmlscan.l" +#line 122 "src/mmlscan.l" { yycolumn += yyleng; return END; } YY_BREAK case 40: YY_RULE_SETUP -#line 117 "src/mmlscan.l" +#line 123 "src/mmlscan.l" { yycolumn += yyleng; return TO; } YY_BREAK case 41: YY_RULE_SETUP -#line 118 "src/mmlscan.l" +#line 124 "src/mmlscan.l" { yycolumn += yyleng; return UNTIL; } YY_BREAK case 42: YY_RULE_SETUP -#line 119 "src/mmlscan.l" +#line 125 "src/mmlscan.l" { yycolumn += yyleng; return BY; } YY_BREAK case 43: YY_RULE_SETUP -#line 120 "src/mmlscan.l" +#line 126 "src/mmlscan.l" { yycolumn += yyleng; return UNION; } YY_BREAK case 44: YY_RULE_SETUP -#line 121 "src/mmlscan.l" +#line 127 "src/mmlscan.l" { yycolumn += yyleng; return INTER; } YY_BREAK case 45: YY_RULE_SETUP -#line 122 "src/mmlscan.l" +#line 128 "src/mmlscan.l" { yycolumn += yyleng; return SYMDIFF; } YY_BREAK case 46: YY_RULE_SETUP -#line 123 "src/mmlscan.l" +#line 129 "src/mmlscan.l" { yycolumn += yyleng; return CROSS; } YY_BREAK case 47: YY_RULE_SETUP -#line 124 "src/mmlscan.l" +#line 130 "src/mmlscan.l" { yycolumn += yyleng; return PROJ; } YY_BREAK case 48: YY_RULE_SETUP -#line 125 "src/mmlscan.l" +#line 131 "src/mmlscan.l" { yycolumn += yyleng; return WITHOUT; } YY_BREAK case 49: YY_RULE_SETUP -#line 126 "src/mmlscan.l" +#line 132 "src/mmlscan.l" { yycolumn += yyleng; return MOD; } YY_BREAK case 50: YY_RULE_SETUP -#line 127 "src/mmlscan.l" +#line 133 "src/mmlscan.l" { yycolumn += yyleng; return DIV; } YY_BREAK case 51: YY_RULE_SETUP -#line 128 "src/mmlscan.l" +#line 134 "src/mmlscan.l" { yycolumn += yyleng; return MIN; } YY_BREAK case 52: YY_RULE_SETUP -#line 129 "src/mmlscan.l" +#line 135 "src/mmlscan.l" { yycolumn += yyleng; return MAX; } YY_BREAK case 53: YY_RULE_SETUP -#line 130 "src/mmlscan.l" +#line 136 "src/mmlscan.l" { yycolumn += yyleng; return ARGMIN; } YY_BREAK case 54: YY_RULE_SETUP -#line 131 "src/mmlscan.l" +#line 137 "src/mmlscan.l" { yycolumn += yyleng; return ARGMAX; } YY_BREAK case 55: YY_RULE_SETUP -#line 132 "src/mmlscan.l" +#line 138 "src/mmlscan.l" { yycolumn += yyleng; return READ; } YY_BREAK case 56: YY_RULE_SETUP -#line 133 "src/mmlscan.l" +#line 139 "src/mmlscan.l" { yycolumn += yyleng; return AS; } YY_BREAK case 57: YY_RULE_SETUP -#line 134 "src/mmlscan.l" +#line 140 "src/mmlscan.l" { yycolumn += yyleng; return SKIP; } YY_BREAK case 58: YY_RULE_SETUP -#line 135 "src/mmlscan.l" +#line 141 "src/mmlscan.l" { yycolumn += yyleng; return USE; } YY_BREAK case 59: YY_RULE_SETUP -#line 136 "src/mmlscan.l" +#line 142 "src/mmlscan.l" { yycolumn += yyleng; return COMMENT; } YY_BREAK case 60: YY_RULE_SETUP -#line 137 "src/mmlscan.l" +#line 143 "src/mmlscan.l" { yycolumn += yyleng; return SCALE; } YY_BREAK case 61: YY_RULE_SETUP -#line 138 "src/mmlscan.l" +#line 144 "src/mmlscan.l" { yycolumn += yyleng; return SEPARATE; } YY_BREAK case 62: YY_RULE_SETUP -#line 139 "src/mmlscan.l" +#line 145 "src/mmlscan.l" { yycolumn += yyleng; return CHECKONLY; } YY_BREAK case 63: YY_RULE_SETUP -#line 140 "src/mmlscan.l" +#line 146 "src/mmlscan.l" { yycolumn += yyleng; return INDICATOR; } YY_BREAK case 64: YY_RULE_SETUP -#line 141 "src/mmlscan.l" +#line 147 "src/mmlscan.l" { yycolumn += yyleng; return CARD; } YY_BREAK case 65: YY_RULE_SETUP -#line 142 "src/mmlscan.l" +#line 148 "src/mmlscan.l" { yycolumn += yyleng; return ABS; } YY_BREAK case 66: YY_RULE_SETUP -#line 143 "src/mmlscan.l" +#line 149 "src/mmlscan.l" { yycolumn += yyleng; return VABS; } YY_BREAK case 67: YY_RULE_SETUP -#line 144 "src/mmlscan.l" +#line 150 "src/mmlscan.l" { yycolumn += yyleng; return SGN; } YY_BREAK case 68: YY_RULE_SETUP -#line 145 "src/mmlscan.l" +#line 151 "src/mmlscan.l" { yycolumn += yyleng; return ROUND; } YY_BREAK case 69: YY_RULE_SETUP -#line 146 "src/mmlscan.l" +#line 152 "src/mmlscan.l" { yycolumn += yyleng; return FLOOR; } YY_BREAK case 70: YY_RULE_SETUP -#line 147 "src/mmlscan.l" +#line 153 "src/mmlscan.l" { yycolumn += yyleng; return CEIL; } YY_BREAK case 71: YY_RULE_SETUP -#line 148 "src/mmlscan.l" +#line 154 "src/mmlscan.l" { yycolumn += yyleng; return LOG; } YY_BREAK case 72: YY_RULE_SETUP -#line 149 "src/mmlscan.l" +#line 155 "src/mmlscan.l" { yycolumn += yyleng; return LN; } YY_BREAK case 73: YY_RULE_SETUP -#line 150 "src/mmlscan.l" +#line 156 "src/mmlscan.l" { yycolumn += yyleng; return EXP; } YY_BREAK case 74: YY_RULE_SETUP -#line 151 "src/mmlscan.l" +#line 157 "src/mmlscan.l" { yycolumn += yyleng; return SQRT; } YY_BREAK case 75: YY_RULE_SETUP -#line 152 "src/mmlscan.l" +#line 158 "src/mmlscan.l" { yycolumn += yyleng; return SIN; } YY_BREAK case 76: YY_RULE_SETUP -#line 153 "src/mmlscan.l" +#line 159 "src/mmlscan.l" { yycolumn += yyleng; return COS; } YY_BREAK case 77: YY_RULE_SETUP -#line 154 "src/mmlscan.l" +#line 160 "src/mmlscan.l" { yycolumn += yyleng; return TAN; } YY_BREAK case 78: YY_RULE_SETUP -#line 155 "src/mmlscan.l" +#line 161 "src/mmlscan.l" { yycolumn += yyleng; return ASIN; } YY_BREAK case 79: YY_RULE_SETUP -#line 156 "src/mmlscan.l" +#line 162 "src/mmlscan.l" { yycolumn += yyleng; return ACOS; } YY_BREAK case 80: YY_RULE_SETUP -#line 157 "src/mmlscan.l" +#line 163 "src/mmlscan.l" { yycolumn += yyleng; return ATAN; } YY_BREAK case 81: YY_RULE_SETUP -#line 158 "src/mmlscan.l" +#line 164 "src/mmlscan.l" { yycolumn += yyleng; return POWER; } YY_BREAK case 82: YY_RULE_SETUP -#line 159 "src/mmlscan.l" +#line 165 "src/mmlscan.l" { yycolumn += yyleng; return SGNPOW; } YY_BREAK case 83: YY_RULE_SETUP -#line 160 "src/mmlscan.l" +#line 166 "src/mmlscan.l" { yycolumn += yyleng; return PRIORITY; } YY_BREAK case 84: YY_RULE_SETUP -#line 161 "src/mmlscan.l" +#line 167 "src/mmlscan.l" { yycolumn += yyleng; return STARTVAL; } YY_BREAK case 85: YY_RULE_SETUP -#line 162 "src/mmlscan.l" +#line 168 "src/mmlscan.l" { yycolumn += yyleng; return DEFAULT; } YY_BREAK case 86: YY_RULE_SETUP -#line 163 "src/mmlscan.l" +#line 169 "src/mmlscan.l" { yycolumn += yyleng; return SUBSETS; } YY_BREAK case 87: YY_RULE_SETUP -#line 164 "src/mmlscan.l" +#line 170 "src/mmlscan.l" { yycolumn += yyleng; return POWERSET; } YY_BREAK case 88: YY_RULE_SETUP -#line 165 "src/mmlscan.l" +#line 171 "src/mmlscan.l" { yycolumn += yyleng; return INDEXSET; } YY_BREAK case 89: YY_RULE_SETUP -#line 166 "src/mmlscan.l" +#line 172 "src/mmlscan.l" { yycolumn += yyleng; return PRINT; } YY_BREAK case 90: YY_RULE_SETUP -#line 167 "src/mmlscan.l" +#line 173 "src/mmlscan.l" { yycolumn += yyleng; return CHECK; } YY_BREAK case 91: YY_RULE_SETUP -#line 168 "src/mmlscan.l" +#line 174 "src/mmlscan.l" { yycolumn += yyleng; return INFTY; } YY_BREAK case 92: YY_RULE_SETUP -#line 169 "src/mmlscan.l" +#line 175 "src/mmlscan.l" { yycolumn += yyleng; return RANDOM; } YY_BREAK case 93: YY_RULE_SETUP -#line 170 "src/mmlscan.l" +#line 176 "src/mmlscan.l" { yycolumn += yyleng; return ORD; } YY_BREAK case 94: YY_RULE_SETUP -#line 171 "src/mmlscan.l" +#line 177 "src/mmlscan.l" { yycolumn += yyleng; return TYPE1; } YY_BREAK case 95: YY_RULE_SETUP -#line 172 "src/mmlscan.l" +#line 178 "src/mmlscan.l" { yycolumn += yyleng; return TYPE2; } YY_BREAK case 96: YY_RULE_SETUP -#line 173 "src/mmlscan.l" +#line 179 "src/mmlscan.l" { yycolumn += yyleng; return IMPLICIT; } YY_BREAK case 97: YY_RULE_SETUP -#line 174 "src/mmlscan.l" +#line 180 "src/mmlscan.l" { yycolumn += yyleng; return LENGTH; } YY_BREAK case 98: YY_RULE_SETUP -#line 175 "src/mmlscan.l" +#line 181 "src/mmlscan.l" { yycolumn += yyleng; return SUBSTR; } YY_BREAK case 99: YY_RULE_SETUP -#line 176 "src/mmlscan.l" +#line 182 "src/mmlscan.l" { yycolumn += yyleng; return MATCH; } YY_BREAK case 100: YY_RULE_SETUP -#line 178 "src/mmlscan.l" +#line 184 "src/mmlscan.l" { yycolumn += yyleng; lval->numb = numb_new_ascii(yytext); @@ -1689,7 +1721,7 @@ YY_BREAK case 101: YY_RULE_SETUP -#line 184 "src/mmlscan.l" +#line 190 "src/mmlscan.l" { yycolumn += yyleng; lval->numb = numb_new_ascii(yytext); @@ -1699,7 +1731,7 @@ YY_BREAK case 102: YY_RULE_SETUP -#line 191 "src/mmlscan.l" +#line 197 "src/mmlscan.l" { Symbol* sym; @@ -1820,7 +1852,7 @@ case 103: /* rule 103 can match eol */ YY_RULE_SETUP -#line 308 "src/mmlscan.l" +#line 314 "src/mmlscan.l" { yycolumn += yyleng; yytext[strlen(yytext) - 1] = '\0'; @@ -1831,7 +1863,7 @@ case 104: /* rule 104 can match eol */ YY_RULE_SETUP -#line 314 "src/mmlscan.l" +#line 320 "src/mmlscan.l" { yycolumn += yyleng; yytext[strlen(yytext) - 1] = '\0'; @@ -1842,24 +1874,24 @@ case 105: /* rule 105 can match eol */ YY_RULE_SETUP -#line 321 "src/mmlscan.l" +#line 327 "src/mmlscan.l" { yycolumn += yyleng; } YY_BREAK case 106: YY_RULE_SETUP -#line 323 "src/mmlscan.l" +#line 329 "src/mmlscan.l" { yycolumn += yyleng; return *yytext; } YY_BREAK case YY_STATE_EOF(INITIAL): -#line 325 "src/mmlscan.l" +#line 331 "src/mmlscan.l" { yycolumn += yyleng; return EOF; } YY_BREAK case 107: YY_RULE_SETUP -#line 327 "src/mmlscan.l" +#line 333 "src/mmlscan.l" ECHO; YY_BREAK -#line 1863 "src/mmlscan.c" +#line 1895 "src/mmlscan.c" case YY_END_OF_BUFFER: { @@ -1882,7 +1914,11 @@ * back-up) that will match for the new input source. */ (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; +/* %if-c-only */ YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; +/* %endif */ +/* %if-c++-only */ +/* %endif */ YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } @@ -1990,6 +2026,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ + } /* end of user's declarations */ } /* end of yylex */ /* %ok-for-header */ @@ -2013,9 +2050,9 @@ /* %if-c++-only */ /* %endif */ { - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = (yytext_ptr); - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = (yytext_ptr); + yy_size_t number_to_move, i; int ret_val; if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) @@ -2044,7 +2081,7 @@ /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; + number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -2126,9 +2163,9 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((int) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); @@ -2153,8 +2190,8 @@ /* %if-c++-only */ /* %endif */ { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; /* %% [15.0] code to get the start state into yy_current_state goes here */ yy_current_state = (yy_start); @@ -2162,7 +2199,7 @@ for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { /* %% [16.0] code to find the next state goes here */ - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2191,11 +2228,11 @@ /* %if-c++-only */ /* %endif */ { - register int yy_is_jam; + int yy_is_jam; /* %% [17.0] code to find the next state, and perhaps do backing up, goes here */ - register char *yy_cp = (yy_c_buf_p); + char *yy_cp = (yy_c_buf_p); - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; if ( yy_accept[yy_current_state] ) { (yy_last_accepting_state) = yy_current_state; @@ -2213,9 +2250,11 @@ return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT /* %if-c-only */ /* %endif */ +#endif /* %if-c-only */ #ifndef YY_NO_INPUT @@ -2321,6 +2360,9 @@ yy_load_buffer_state( ); } +/* %if-c++-only */ +/* %endif */ + /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @@ -2368,7 +2410,11 @@ { (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; +/* %if-c-only */ yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; +/* %endif */ +/* %if-c++-only */ +/* %endif */ (yy_hold_char) = *(yy_c_buf_p); } @@ -2390,7 +2436,7 @@ if ( ! b ) YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - b->yy_buf_size = size; + b->yy_buf_size = (yy_size_t)size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. @@ -2406,6 +2452,9 @@ return b; } +/* %if-c++-only */ +/* %endif */ + /** Destroy the buffer. * @param b a buffer created with yy_create_buffer() * @@ -2444,7 +2493,11 @@ yy_flush_buffer(b ); +/* %if-c-only */ b->yy_input_file = file; +/* %endif */ +/* %if-c++-only */ +/* %endif */ b->yy_fill_buffer = 1; /* If b is the current buffer, then yy_init_buffer was _probably_ @@ -2579,7 +2632,7 @@ * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); @@ -2596,7 +2649,7 @@ if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = (yy_buffer_stack_max) + grow_size; (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc @@ -2679,7 +2732,7 @@ YY_BUFFER_STATE b; char *buf; yy_size_t n; - int i; + yy_size_t i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -2712,7 +2765,7 @@ /* %if-c-only */ static void yy_fatal_error (yyconst char* msg ) { - (void) fprintf( stderr, "%s\n", msg ); + (void) fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } /* %endif */ @@ -2788,29 +2841,29 @@ /* %endif */ /** Set the current line number. - * @param line_number + * @param _line_number line number * */ -void yyset_lineno (int line_number ) +void yyset_lineno (int _line_number ) { - yylineno = line_number; + yylineno = _line_number; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * * @see yy_switch_to_buffer */ -void yyset_in (FILE * in_str ) +void yyset_in (FILE * _in_str ) { - yyin = in_str ; + yyin = _in_str ; } -void yyset_out (FILE * out_str ) +void yyset_out (FILE * _out_str ) { - yyout = out_str ; + yyout = _out_str ; } int yyget_debug (void) @@ -2818,9 +2871,9 @@ return yy_flex_debug; } -void yyset_debug (int bdebug ) +void yyset_debug (int _bdebug ) { - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } /* %endif */ @@ -2893,7 +2946,8 @@ #ifndef yytext_ptr static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) { - register int i; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } @@ -2902,7 +2956,7 @@ #ifdef YY_NEED_STRLEN static int yy_flex_strlen (yyconst char * s ) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2912,11 +2966,12 @@ void *yyalloc (yy_size_t size ) { - return (void *) malloc( size ); + return (void *) malloc( size ); } void *yyrealloc (void * ptr, yy_size_t size ) { + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2929,7 +2984,7 @@ void yyfree (void * ptr ) { - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } /* %if-tables-serialization definitions */ @@ -2939,7 +2994,7 @@ /* %ok-for-header */ -#line 327 "src/mmlscan.l" +#line 333 "src/mmlscan.l" static const Stmt* yystmt = NULL; diff -Nru zimpl-3.3.2/src/mmlscan.l zimpl-3.3.4/src/mmlscan.l --- zimpl-3.3.2/src/mmlscan.l 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/mmlscan.l 2017-03-07 17:20:11.000000000 +0000 @@ -7,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -24,7 +24,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ %{ -#pragma ident "@(#) $Id: mmlscan.l,v 1.62 2014/01/12 09:47:38 bzfkocht Exp $" + +#pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic ignored "-Wconversion" +#pragma clang diagnostic ignored "-Wmissing-prototypes" +#pragma clang diagnostic ignored "-Wunused-macros" +#pragma clang diagnostic ignored "-Wmissing-noreturn" +#pragma clang diagnostic ignored "-Wunneeded-internal-declaration" /*lint -e429 */ /*lint -e506 -e525 -e528 -e527 -e537 -e539 -e551 -e553 -e613 -e633 */ diff -Nru zimpl-3.3.2/src/mono.c zimpl-3.3.4/src/mono.c --- zimpl-3.3.2/src/mono.c 2014-02-28 10:13:09.081061099 +0000 +++ zimpl-3.3.4/src/mono.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: mono.c,v 1.15 2012/07/29 15:09:27 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mono.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -228,7 +227,6 @@ { const MonoElem* ea; const MonoElem* eb; - const Entry* entry_a; assert(mono_is_valid(ma)); assert(mono_is_valid(mb)); @@ -241,11 +239,11 @@ for(ea = &ma->first; ea != NULL; ea = ea->next) { - assert(entry_is_valid(ea->entry)); - assert(entry_get_type(ea->entry) == SYM_VAR); - - entry_a = ea->entry; + const Entry* entry_a = ea->entry; + assert(entry_is_valid(entry_a)); + assert(entry_get_type(entry_a) == SYM_VAR); + for(eb = &mb->first; eb != NULL; eb = eb->next) if (entry_a == eb->entry) break; diff -Nru zimpl-3.3.2/src/mono.h zimpl-3.3.4/src/mono.h --- zimpl-3.3.2/src/mono.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/mono.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: mono.h,v 1.14 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mono.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/mshell.c zimpl-3.3.4/src/mshell.c --- zimpl-3.3.2/src/mshell.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/mshell.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: mshell.c,v 1.19 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mshell.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -132,7 +131,7 @@ memlist = p->next; } -static void mem_tag_err( +static NORETURN void mem_tag_err( MHDR* p, int typ, const char* file1, @@ -236,7 +235,6 @@ if (item == 0 || size == 0) { fprintf(stderr, errmsg2, item, size, file, line); - abort(); exit(EXIT_FAILURE); } if ((p = calloc(mem_alloc_size(size * item), sizeof(char))) == MHDR_NIL) diff -Nru zimpl-3.3.2/src/mshell.h zimpl-3.3.4/src/mshell.h --- zimpl-3.3.2/src/mshell.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/mshell.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: mshell.h,v 1.15 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mshell.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/numbdbl.c zimpl-3.3.4/src/numbdbl.c --- zimpl-3.3.2/src/numbdbl.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/numbdbl.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: numbdbl.c,v 1.12 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: numbdbl.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/numbgmp.c zimpl-3.3.4/src/numbgmp.c --- zimpl-3.3.2/src/numbgmp.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/numbgmp.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: numbgmp.c,v 1.39 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: numbgmp.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -588,7 +587,7 @@ d = log10(mpq_get_d(numb->value.numb)); /* !finite == !isfinite == isnan || isinf */ - if (d != d) /*lint !e777 */ /* == isnan(d) || isinf(d) */ + if ((d != d) || (d == -HUGE_VAL)) /*lint !e777 */ /* == isnan(d) || isinf(d) */ { sprintf(temp, "*** Error 700: log(%f)", mpq_get_d(numb->value.numb)); perror(temp); @@ -641,12 +640,12 @@ d = log(mpq_get_d(numb->value.numb)); /* !finite == !isfinite == isnan || isinf */ - if (d != d) /*lint !e777 */ /* == isnan(d) || isinf(d) */ + if ((d != d) || (d == -HUGE_VAL)) /*lint !e777 */ /* == isnan(d) || isinf(d) */ { sprintf(temp, "*** Error 702: ln(%f)", mpq_get_d(numb->value.numb)); perror(temp); return NULL; - } + } sprintf(temp, "%.16e", d); return numb_new_ascii(temp); diff -Nru zimpl-3.3.2/src/numb.h zimpl-3.3.4/src/numb.h --- zimpl-3.3.2/src/numb.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/numb.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: numb.h,v 1.6 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: numb.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/prog.c zimpl-3.3.4/src/prog.c --- zimpl-3.3.2/src/prog.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/prog.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: prog.c,v 1.25 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: prog.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -83,7 +82,7 @@ prog->size = PROG_EXTEND_SIZE; prog->used = 0; prog->extend = PROG_EXTEND_SIZE; - prog->stmt = calloc(prog->size, sizeof(*prog->stmt)); + prog->stmt = calloc((size_t)prog->size, sizeof(*prog->stmt)); SID_set(prog, PROG_SID); assert(prog_is_valid(prog)); @@ -188,10 +187,10 @@ char* prog_tostr(const Prog* prog, const char* prefix, const char* title, int max_output_line_len) { - int len; - char* text; - int pos = 0; - int i; + size_t len; + char* text; + int pos = 0; + int i; assert(prog_is_valid(prog)); assert(prefix != NULL); @@ -238,7 +237,7 @@ /* for(i = 0; i < prog->used; i++) * pos += sprintf(&text[pos], "%s%s\n", prefix, stmt_get_text(prog->stmt[i])); */ - assert(pos + 1 == len); + assert((size_t)pos + 1 == len); return text; } diff -Nru zimpl-3.3.2/src/prog.h zimpl-3.3.4/src/prog.h --- zimpl-3.3.2/src/prog.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/prog.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: prog.h,v 1.6 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: prog.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/random.c zimpl-3.3.4/src/random.c --- zimpl-3.3.2/src/random.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/random.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: random.c,v 1.9 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: random.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/random.h zimpl-3.3.4/src/random.h --- zimpl-3.3.2/src/random.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/random.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: random.h,v 1.9 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: random.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2007-2012 by Thorsten Koch + * Copyright (C) 2007-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/rathumwrite.c zimpl-3.3.4/src/rathumwrite.c --- zimpl-3.3.2/src/rathumwrite.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/rathumwrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -#pragma ident "@(#) $Id: rathumwrite.c,v 1.10 2012/07/29 15:09:28 bzfkocht Exp $" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: lpfwrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratlpfwrite.c zimpl-3.3.4/src/ratlpfwrite.c --- zimpl-3.3.2/src/ratlpfwrite.c 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/ratlpfwrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratlpfwrite.c,v 1.28 2014/01/12 09:47:38 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: lpfwrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratlp.h zimpl-3.3.4/src/ratlp.h --- zimpl-3.3.2/src/ratlp.h 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/ratlp.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratlp.h,v 1.27 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratlp.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratlpstore.c zimpl-3.3.4/src/ratlpstore.c --- zimpl-3.3.2/src/ratlpstore.c 2012-07-29 15:09:28.000000000 +0000 +++ zimpl-3.3.4/src/ratlpstore.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratlpstore.c,v 1.41 2012/07/29 15:09:28 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: lpstore.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -1195,7 +1194,7 @@ /*ARGSUSED*/ void lps_addqme( - Lps* lp, + UNUSED Lps* lp, Con* con, Var* var1, Var* var2, @@ -1221,7 +1220,7 @@ /*ARGSUSED*/ void lps_addterm( - Lps* lp, + UNUSED Lps* lp, Con* con, const Term* term) { diff -Nru zimpl-3.3.2/src/ratlpstore.h zimpl-3.3.4/src/ratlpstore.h --- zimpl-3.3.2/src/ratlpstore.h 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratlpstore.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratlpstore.h,v 1.23 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratlpstore.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratlptypes.h zimpl-3.3.4/src/ratlptypes.h --- zimpl-3.3.2/src/ratlptypes.h 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratlptypes.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratlptypes.h,v 1.16 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratlptypes.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratmpswrite.c zimpl-3.3.4/src/ratmpswrite.c --- zimpl-3.3.2/src/ratmpswrite.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratmpswrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratmpswrite.c,v 1.24 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: mpswrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -60,7 +59,14 @@ if (use_field5) { - fprintf(fp, " %c%c %-8.8s %-8.8s %12g\n", + /* Field: 1 2 3 4 5 6 + * Columns: 2-3 5-12 15-22 25-36 40-47 50-61 + * 1 2 3 4 5 6 + * 1234567890123456789012345678901234567890123456789012345678901234567890 + * -AB-NNNNNNNN--NNNNNNNN--FFFFFFFFFFFF + * x$SE@5b2 c1_718 45.786 + */ + fprintf(fp, " %c%c %-8.8s %-8.8s %12g\n", toupper(indicator1), toupper(indicator2), name1, name2, mpq_get_d(value)); } else @@ -172,7 +178,7 @@ if (text != NULL) fprintf(fp, "%s", text); - fprintf(fp, "NAME %8.8s\n", lp->name); + fprintf(fp, "NAME %8.8s\n", lp->name); fprintf(fp, "ROWS\n"); write_data(fp, FALSE, 'N', ' ', "OBJECTIV", "", const_zero); diff -Nru zimpl-3.3.2/src/ratmstwrite.c zimpl-3.3.4/src/ratmstwrite.c --- zimpl-3.3.2/src/ratmstwrite.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratmstwrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratmstwrite.c,v 1.13 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratmstwrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratordwrite.c zimpl-3.3.4/src/ratordwrite.c --- zimpl-3.3.2/src/ratordwrite.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratordwrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratordwrite.c,v 1.19 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratordwrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratpresolve.c zimpl-3.3.4/src/ratpresolve.c --- zimpl-3.3.2/src/ratpresolve.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratpresolve.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: ratpresolve.c,v 1.17 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: lpstore.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/ratsoswrite.c zimpl-3.3.4/src/ratsoswrite.c --- zimpl-3.3.2/src/ratsoswrite.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/ratsoswrite.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -#pragma ident "@(#) $Id: ratsoswrite.c,v 1.4 2012/07/29 15:09:29 bzfkocht Exp $" /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: ratsoswrite.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2005-2012 by Thorsten Koch + * Copyright (C) 2005-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/rdefpar.c zimpl-3.3.4/src/rdefpar.c --- zimpl-3.3.2/src/rdefpar.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/rdefpar.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: rdefpar.c,v 1.18 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: rdefpar.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/rdefpar.h zimpl-3.3.4/src/rdefpar.h --- zimpl-3.3.2/src/rdefpar.h 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/rdefpar.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: rdefpar.h,v 1.6 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: rdefpar.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/set4.c zimpl-3.3.4/src/set4.c --- zimpl-3.3.2/src/set4.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/set4.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: set4.c,v 1.26 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: set4.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -659,7 +658,6 @@ Tuple* tuple; Entry* entry; Numb* numb; - List* subset_list; assert(set_is_valid(set)); assert(subset_size >= 0); @@ -693,7 +691,7 @@ do { - subset_list = NULL; + List* subset_list = NULL; for(i = 0; i < subset_size; i++) { diff -Nru zimpl-3.3.2/src/set4.h zimpl-3.3.4/src/set4.h --- zimpl-3.3.2/src/set4.h 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/set4.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: set4.h,v 1.20 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: set4.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/setempty.c zimpl-3.3.4/src/setempty.c --- zimpl-3.3.2/src/setempty.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/setempty.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setempty.c,v 1.14 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setempty.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -31,6 +30,7 @@ #include #include "bool.h" +#include "lint.h" #include "mshell.h" #include "numb.h" #include "elem.h" @@ -140,7 +140,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_empty_get_tuple( +static NORETURN void set_empty_get_tuple( const Set* set, int idx, Tuple* tuple, @@ -194,10 +194,10 @@ */ /*ARGSUSED*/ static Bool iter_next( - SetIter* iter, - const Set* set, - Tuple* tuple, - int offset) + SetIter* iter, + const Set* set, + UNUSED Tuple* tuple, + UNUSED int offset) { assert(set_empty_iter_is_valid(iter)); assert(set_empty_is_valid(set)); @@ -210,7 +210,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void iter_exit(SetIter* iter, const Set* set) +static void iter_exit(SetIter* iter, UNUSED const Set* set) { assert(set_empty_iter_is_valid(iter)); @@ -224,7 +224,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void iter_reset(SetIter* iter, const Set* set) +static void iter_reset(SetIter* iter, UNUSED const Set* set) { assert(set_empty_iter_is_valid(iter)); } diff -Nru zimpl-3.3.2/src/set.h zimpl-3.3.4/src/set.h --- zimpl-3.3.2/src/set.h 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/set.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: set.h,v 1.8 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: set4.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/setlist.c zimpl-3.3.4/src/setlist.c --- zimpl-3.3.2/src/setlist.c 2012-07-29 15:09:29.000000000 +0000 +++ zimpl-3.3.4/src/setlist.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setlist.c,v 1.26 2012/07/29 15:09:29 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setlist.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -31,6 +30,7 @@ #include #include "bool.h" +#include "lint.h" #include "mshell.h" #include "ratlptypes.h" #include "numb.h" @@ -279,14 +279,14 @@ */ static void set_list_free(Set* set) { - int i; - assert(set_list_is_valid(set)); set->head.refc--; if (set->head.refc == 0) { + int i; + SID_del2(set->list); for(i = 0; i < set->head.members; i++) @@ -428,7 +428,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_list_iter_exit(SetIter* iter, const Set* set) +static void set_list_iter_exit(SetIter* iter, UNUSED const Set* set) { assert(set_list_iter_is_valid(iter)); @@ -442,7 +442,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_list_iter_reset(SetIter* iter, const Set* set) +static void set_list_iter_reset(SetIter* iter, UNUSED const Set* set) { assert(set_list_iter_is_valid(iter)); diff -Nru zimpl-3.3.2/src/setmulti.c zimpl-3.3.4/src/setmulti.c --- zimpl-3.3.2/src/setmulti.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/setmulti.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setmulti.c,v 1.26 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setmulti.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -31,6 +30,7 @@ #include #include +#include "lint.h" #include "bool.h" #include "mshell.h" #include "ratlptypes.h" @@ -92,11 +92,10 @@ const int* bb = (const int*)b; int i; - int d; for(i = 0; i < cmp_dim; i++) { - d = aa[i] - bb[i]; + int d = aa[i] - bb[i]; if (d != 0) return d; @@ -318,7 +317,6 @@ const int* key = (const int*)a; const int* subset = (const int*)b; int i; - int d; assert(key != NULL); assert(subset != NULL); @@ -327,7 +325,7 @@ for(i = 0; i < cmp_dim; i++) { - d = key[i] - subset[i]; + int d = key[i] - subset[i]; if (d != 0) return d; @@ -645,7 +643,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_multi_iter_exit(SetIter* iter, const Set* set) +static void set_multi_iter_exit(SetIter* iter, UNUSED const Set* set) { assert(set_multi_iter_is_valid(iter)); @@ -662,7 +660,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_multi_iter_reset(SetIter* iter, const Set* set) +static void set_multi_iter_reset(SetIter* iter, UNUSED const Set* set) { assert(set_multi_iter_is_valid(iter)); diff -Nru zimpl-3.3.2/src/setprod.c zimpl-3.3.4/src/setprod.c --- zimpl-3.3.2/src/setprod.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/setprod.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setprod.c,v 1.20 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setprod.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/setpseudo.c zimpl-3.3.4/src/setpseudo.c --- zimpl-3.3.2/src/setpseudo.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/setpseudo.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setpseudo.c,v 1.14 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setpseudo.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -31,6 +30,7 @@ #include #include "bool.h" +#include "lint.h" #include "mshell.h" #include "numb.h" #include "elem.h" @@ -191,10 +191,10 @@ */ /*ARGSUSED*/ static Bool iter_next( - SetIter* iter, - const Set* set, - Tuple* tuple, - int offset) + SetIter* iter, + UNUSED const Set* set, + UNUSED Tuple* tuple, + UNUSED int offset) { assert(set_pseudo_iter_is_valid(iter)); assert(set_pseudo_is_valid(set)); @@ -212,7 +212,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void iter_exit(SetIter* iter, const Set* set) +static void iter_exit(SetIter* iter, UNUSED const Set* set) { assert(set_pseudo_iter_is_valid(iter)); @@ -226,7 +226,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void iter_reset(SetIter* iter, const Set* set) +static void iter_reset(SetIter* iter, UNUSED const Set* set) { assert(set_pseudo_iter_is_valid(iter)); diff -Nru zimpl-3.3.2/src/setrange.c zimpl-3.3.4/src/setrange.c --- zimpl-3.3.2/src/setrange.c 2013-02-24 16:01:58.000000000 +0000 +++ zimpl-3.3.4/src/setrange.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: setrange.c,v 1.21 2013/02/24 16:01:58 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: setrange.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -31,6 +30,7 @@ #include #include "bool.h" +#include "lint.h" #include "mshell.h" #include "numb.h" #include "elem.h" @@ -329,7 +329,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_range_iter_exit(SetIter* iter, const Set* set) +static void set_range_iter_exit(SetIter* iter, UNUSED const Set* set) { assert(set_range_iter_is_valid(iter)); @@ -343,7 +343,7 @@ * ------------------------------------------------------------------------- */ /*ARGSUSED*/ -static void set_range_iter_reset(SetIter* iter, const Set* set) +static void set_range_iter_reset(SetIter* iter, UNUSED const Set* set) { assert(set_range_iter_is_valid(iter)); diff -Nru zimpl-3.3.2/src/source.c zimpl-3.3.4/src/source.c --- zimpl-3.3.2/src/source.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/source.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: source.c,v 1.13 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: source.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/stkchk.c zimpl-3.3.4/src/stkchk.c --- zimpl-3.3.2/src/stkchk.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/stkchk.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: stkchk.c,v 1.3 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: stkchk.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2011-2012 by Thorsten Koch + * Copyright (C) 2011-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/stkchk.h zimpl-3.3.4/src/stkchk.h --- zimpl-3.3.2/src/stkchk.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/stkchk.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: stkchk.h,v 1.4 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: stkchk.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2011-2012 by Thorsten Koch + * Copyright (C) 2011-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/stmt.c zimpl-3.3.4/src/stmt.c --- zimpl-3.3.2/src/stmt.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/stmt.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: stmt.c,v 1.29 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: stmt.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -81,13 +80,15 @@ static void show_suppressed_warnings(void) { - int i; - if (verbose > VERB_QUIET && verbose < VERB_CHATTER) + { + int i; + for(i = 0; i < MAX_WARNINGS; i++) if (warning_count[i] > 1) fprintf(stderr, "--- Warning %3d: suppressed %d further message(s)\n", i, warning_count[i] - 1); + } } Bool stmt_trigger_warning(int no) diff -Nru zimpl-3.3.2/src/stmt.h zimpl-3.3.4/src/stmt.h --- zimpl-3.3.2/src/stmt.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/stmt.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: stmt.h,v 1.6 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: stmt.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/strstore2.c zimpl-3.3.4/src/strstore2.c --- zimpl-3.3.2/src/strstore2.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/strstore2.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: strstore2.c,v 1.10 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: strstore2.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/strstore.h zimpl-3.3.4/src/strstore.h --- zimpl-3.3.2/src/strstore.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/strstore.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: strstore.h,v 1.6 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: strstore2.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/symbol.c zimpl-3.3.4/src/symbol.c --- zimpl-3.3.2/src/symbol.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/symbol.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: symbol.c,v 1.36 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: symbol.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/symbol.h zimpl-3.3.4/src/symbol.h --- zimpl-3.3.2/src/symbol.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/symbol.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: symbol.h,v 1.6 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: symbol.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/term2.c zimpl-3.3.4/src/term2.c --- zimpl-3.3.2/src/term2.c 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/term2.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: term2.c,v 1.18 2014/01/12 09:47:38 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: term2.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -703,12 +702,11 @@ Bool term_is_all_integer(const Term* term) { - VarClass vc; - int i; + int i; for(i = 0; i < term->used; i++) { - vc = xlp_getclass(prog_get_lp(), mono_get_var(term->elem[i], 0)); + VarClass vc = xlp_getclass(prog_get_lp(), mono_get_var(term->elem[i], 0)); if (vc != VAR_INT && vc != VAR_IMP) return FALSE; diff -Nru zimpl-3.3.2/src/term.h zimpl-3.3.4/src/term.h --- zimpl-3.3.2/src/term.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/term.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: term.h,v 1.8 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: term.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/tuple.c zimpl-3.3.4/src/tuple.c --- zimpl-3.3.2/src/tuple.c 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/tuple.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: tuple.c,v 1.35 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: tuple.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -83,8 +82,6 @@ void tuple_free(Tuple* tuple) { - int i; - assert(tuple_is_valid(tuple)); assert(tuple->element != NULL); @@ -92,6 +89,8 @@ if (tuple->refc == 0) { + int i; + for(i = 0; i < tuple->dim; i++) if (tuple->element[i] != NULL) elem_free(tuple->element[i]); @@ -284,8 +283,6 @@ size_t size = TUPLE_STR_SIZE; size_t len = 1; /* one for the zero '\0' */ char* str = malloc(size); - char* selem; - size_t selemlen; int i; assert(tuple_is_valid(tuple)); @@ -295,8 +292,8 @@ for(i = 0; i < tuple->dim; i++) { - selem = elem_tostr(tuple->element[i]); - selemlen = strlen(selem) + 1; + char* selem = elem_tostr(tuple->element[i]); + size_t selemlen = strlen(selem) + 1; if (len + selemlen >= size) { diff -Nru zimpl-3.3.2/src/tuple.h zimpl-3.3.4/src/tuple.h --- zimpl-3.3.2/src/tuple.h 2012-07-29 15:09:30.000000000 +0000 +++ zimpl-3.3.4/src/tuple.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: tuple.h,v 1.7 2012/07/29 15:09:30 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: tuple.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/vinst.c zimpl-3.3.4/src/vinst.c --- zimpl-3.3.2/src/vinst.c 2014-01-12 09:47:38.000000000 +0000 +++ zimpl-3.3.4/src/vinst.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: vinst.c,v 1.34 2014/01/12 09:47:38 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: vinst.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -264,12 +263,7 @@ Bound* upper; Bound* bound_zero; Bound* bound_one; - Entry* entry_xplus; - Entry* entry_xminus; - Entry* entry_bplus; - Entry* entry_bminus; Entry* entry_result; - Numb* numb; VBFixed fixed = VBOOL_OPEN; Trace("handle_vbool_cmp"); @@ -345,13 +339,18 @@ } else { + Entry* entry_xplus; + Entry* entry_xminus; + Entry* entry_bplus; + Entry* entry_bminus; + /* Remove constant from term */ term_add_constant(term, rhs); if (numb_cmp(bound_get_value(lower), numb_zero()) < 0) { - numb = numb_copy(bound_get_value(lower)); + Numb* numb = numb_copy(bound_get_value(lower)); numb_abs(numb); bound_free(lower); lower = bound_new(BOUND_VALUE, numb); @@ -811,13 +810,8 @@ Bool then_case) { Bound* bound; - Numb* big_m; - Term* big_term; const Numb* bound_val; - const Numb* new_rhs; - const char* basename; - char* cname; - + Trace("generate_conditional_constraint"); assert(con_type == CON_RHS || con_type == CON_LHS); @@ -849,16 +843,16 @@ } else { - big_term = term_copy(vif_term); - big_m = then_case ? numb_new_sub(bound_val, rhs) : numb_new_sub(rhs, bound_val); - new_rhs = then_case ? bound_val : rhs; + const char* basename = conname_get(); + char* cname = malloc(strlen(basename) + 5); + Term* big_term = term_copy(vif_term); + Numb* big_m = then_case ? numb_new_sub(bound_val, rhs) : numb_new_sub(rhs, bound_val); + const Numb* new_rhs = then_case ? bound_val : rhs; term_mul_coeff(big_term, big_m); term_append_term(big_term, lhs_term); - basename = conname_get(); - cname = malloc(strlen(basename) + 5); sprintf(cname, "%s_%c_%c", basename, then_case ? 't' : 'e', con_type == CON_RHS ? 'r' : 'l'); @@ -872,14 +866,15 @@ bound_free(bound); } +/*ARGSUSED*/ static void generate_indicator_constraint( - const CodeNode* self, - const Term* vif_term, - const Term* lhs_term, - ConType con_type, - const Numb* rhs, - unsigned int flags, - Bool then_case) + UNUSED const CodeNode* self, + const Term* vif_term, + const Term* lhs_term, + ConType con_type, + const Numb* rhs, + unsigned int flags, + Bool then_case) { Numb* lhs; Term* ind_term; @@ -1051,7 +1046,6 @@ Entry* entry_xminus; Entry* entry_bplus; Entry* entry_result; - Numb* numb; Trace("i_vabs"); @@ -1092,7 +1086,7 @@ if (numb_cmp(bound_get_value(lower), numb_zero()) < 0) { - numb = numb_copy(bound_get_value(lower)); + Numb* numb = numb_copy(bound_get_value(lower)); numb_abs(numb); bound_free(lower); lower = bound_new(BOUND_VALUE, numb); diff -Nru zimpl-3.3.2/src/xlpglue.c zimpl-3.3.4/src/xlpglue.c --- zimpl-3.3.2/src/xlpglue.c 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/xlpglue.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: xlpglue.c,v 1.41 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: xlpglue.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -44,6 +43,7 @@ #include +#include "lint.h" #include "bool.h" #include "mshell.h" #include "ratlptypes.h" @@ -80,9 +80,9 @@ */ /*ARGSUSED*/ Lps* xlp_alloc( - const char* name, /**< Instance name, will appear e.g. in MPS NAME section */ - Bool need_startval, /**< Will we supply starting values for the variables? */ - void* user_data) /**< Pointer with arbitrary data. */ + const char* name, /**< Instance name, will appear e.g. in MPS NAME section */ + Bool need_startval, /**< Will we supply starting values for the variables? */ + UNUSED void* user_data) /**< Pointer with arbitrary data. */ { assert(name != NULL); @@ -464,8 +464,8 @@ */ /*ARGSUSED*/ const char* xlp_getvarname( - const Lps* lp, /**< Pointer to storage */ - const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ + UNUSED const Lps* lp, /**< Pointer to storage */ + const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ { assert(var != NULL); @@ -477,8 +477,8 @@ */ /*ARGSUSED*/ VarClass xlp_getclass( - const Lps* lp, /**< Pointer to storage */ - const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ + UNUSED const Lps* lp, /**< Pointer to storage */ + const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ { assert(var != NULL); @@ -490,8 +490,8 @@ */ /*ARGSUSED*/ Bound* xlp_getlower( - const Lps* lp, /**< Pointer to storage */ - const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ + UNUSED const Lps* lp, /**< Pointer to storage */ + const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ { Bound* bound; Numb* numb; @@ -518,8 +518,8 @@ */ /*ARGSUSED*/ Bound* xlp_getupper( - const Lps* lp, /**< Pointer to storage */ - const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ + UNUSED const Lps* lp, /**< Pointer to storage */ + const Var* var) /**< Pointer to variable as returned by xlp_addvar() */ { Bound* bound; @@ -569,9 +569,9 @@ */ /*ARGSUSED*/ void xlp_addtocost( - Lps* lp, /**< Pointer to storage */ - Var* var, /**< Pointer to variable as returned by xlp_addvar() */ - const Numb* cost) /**< Value to be added to the objective coefficient of the variable */ + UNUSED Lps* lp, /**< Pointer to storage */ + Var* var, /**< Pointer to variable as returned by xlp_addvar() */ + const Numb* cost) /**< Value to be added to the objective coefficient of the variable */ { mpq_t val1; mpq_t val2; diff -Nru zimpl-3.3.2/src/xlpglue.h zimpl-3.3.4/src/xlpglue.h --- zimpl-3.3.2/src/xlpglue.h 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/xlpglue.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: xlpglue.h,v 1.27 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: xlpglue.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/zimpl.c zimpl-3.3.4/src/zimpl.c --- zimpl-3.3.2/src/zimpl.c 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/zimpl.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: zimpl.c,v 1.93 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: zimpl.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/zimpllib.c zimpl-3.3.4/src/zimpllib.c --- zimpl-3.3.2/src/zimpllib.c 2014-01-12 11:07:04.000000000 +0000 +++ zimpl-3.3.4/src/zimpllib.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: zimpllib.c,v 1.33 2014/01/12 11:07:04 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: zimpllib.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2005-2012 by Thorsten Koch + * Copyright (C) 2005-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -162,7 +161,6 @@ "--- Warning 175: Illegal syntax for command line define \"%s\" -- ignored\n"; Set* set; Symbol* sym; - Numb* numb; Tuple* tuple; Entry* entry; char* name; @@ -197,8 +195,9 @@ entry = entry_new_strg(tuple, str_new(value)); else { - numb = numb_new_ascii(value); - entry = entry_new_numb(tuple, numb); + Numb* numb = numb_new_ascii(value); + entry = entry_new_numb(tuple, numb); + numb_free(numb); } symbol_add_entry(sym, entry); @@ -211,7 +210,6 @@ Bool zpl_read(const char* filename, Bool with_management, void* user_data) { Prog* prog = NULL; - Set* set; void* lp = NULL; Bool ret = FALSE; @@ -234,6 +232,8 @@ if (0 == setjmp(zpl_read_env)) { + Set* set; + is_longjmp_ok = TRUE; set = set_pseudo_new(); @@ -282,7 +282,7 @@ Bool zpl_read_with_args(char** argv, int argc, Bool with_management, void* user_data) { - const char* options = "D:mP:sv:"; + const char* options = "D:mP:s:v:"; unsigned long seed = 13021967UL; char** param_table; @@ -290,7 +290,6 @@ int c; int i; Prog* prog = NULL; - Set* set; void* lp = NULL; Bool ret = FALSE; char* inppipe = NULL; @@ -361,6 +360,8 @@ if (0 == setjmp( zpl_read_env)) { + Set* set; + is_longjmp_ok = TRUE; /* Make symbol to hold entries of internal variables diff -Nru zimpl-3.3.2/src/zimpllib.h zimpl-3.3.4/src/zimpllib.h --- zimpl-3.3.2/src/zimpllib.h 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/zimpllib.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: zimpllib.h,v 1.13 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: zimpllib.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2005-2012 by Thorsten Koch + * Copyright (C) 2005-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/zlpglue.c zimpl-3.3.4/src/zlpglue.c --- zimpl-3.3.2/src/zlpglue.c 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/zlpglue.c 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: zlpglue.c,v 1.2 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: zlpglue.c */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2001-2012 by Thorsten Koch + * Copyright (C) 2001-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License diff -Nru zimpl-3.3.2/src/zlpglue.h zimpl-3.3.4/src/zlpglue.h --- zimpl-3.3.2/src/zlpglue.h 2012-07-29 15:09:31.000000000 +0000 +++ zimpl-3.3.4/src/zlpglue.h 2017-03-07 17:20:11.000000000 +0000 @@ -1,4 +1,3 @@ -/* $Id: zlpglue.h,v 1.2 2012/07/29 15:09:31 bzfkocht Exp $ */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* File....: zlpglue.h */ @@ -8,7 +7,7 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Copyright (C) 2003-2012 by Thorsten Koch + * Copyright (C) 2003-2017 by Thorsten Koch * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License