--- mozart-1.4.0.orig/config.sub +++ mozart-1.4.0/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2003-07-04' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # 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. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,7 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +148,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -169,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -228,14 +240,17 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | d10v | d30v | dlx | dsp16xx | dvp \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -244,27 +259,33 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -275,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -294,20 +318,20 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -316,33 +340,43 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -359,6 +393,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -376,6 +413,9 @@ amd64) basic_machine=x86_64-pc ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -407,6 +447,14 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; c90) basic_machine=c90-cray os=-unicos @@ -435,12 +483,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -463,6 +526,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -613,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -628,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -635,16 +714,30 @@ basic_machine=m68k-atari os=-mint ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff @@ -657,6 +750,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -725,10 +821,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -736,9 +828,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -756,6 +851,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -765,6 +868,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -821,6 +930,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -847,6 +960,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -858,6 +975,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -947,6 +1067,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -960,6 +1084,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1003,6 +1131,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1033,6 +1165,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1049,13 +1184,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1128,19 +1260,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1158,12 +1294,15 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1176,6 +1315,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1197,6 +1339,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1219,6 +1364,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1255,6 +1403,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1277,6 +1428,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1286,9 +1443,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1314,6 +1471,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1332,9 +1492,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1467,9 +1633,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1494,7 +1666,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- mozart-1.4.0.orig/mozart_1.4.0-6ubuntu1.patch +++ mozart-1.4.0/mozart_1.4.0-6ubuntu1.patch @@ -0,0 +1,12 @@ +diff -pruN 1.4.0-6/share/bin/ozplatform 1.4.0-6ubuntu1/share/bin/ozplatform +--- 1.4.0-6/share/bin/ozplatform 2011-04-04 21:09:15.000000000 +0100 ++++ 1.4.0-6ubuntu1/share/bin/ozplatform 2011-04-04 21:02:10.000000000 +0100 +@@ -18,7 +18,7 @@ case $system in + s390*\ Linux\ *) OZARCH=linux-s390 + ;; + #----------------------------------------------------------------- +- armv4l\ Linux\ *) OZARCH=linux-arm ++ arm*\ Linux\ *) OZARCH=linux-arm + ;; + armv5tel\ Linux\ *) OZARCH=linux-arm + ;; --- mozart-1.4.0.orig/reconf.sh +++ mozart-1.4.0/reconf.sh @@ -5,3 +5,13 @@ autoconf -l . $f > `expr $f : '\(.*\).in'` chmod +x `expr $f : '\(.*\).in'` done + +# DEBIAN: +# regenerate configure for DSS + +for f in `find . -name configure.ac -print`; do + echo Processing $f + autoconf -I . $f > `expr $f : '\(.*\).ac'` + chmod +x `expr $f : '\(.*\).ac'` +done + --- mozart-1.4.0.orig/config.guess +++ mozart-1.4.0/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. -timestamp='2003-07-02' +timestamp='2008-01-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +18,15 @@ # # 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. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -136,6 +139,23 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +if [ "${UNAME_SYSTEM}" = "Linux" ] ; then + eval $set_cc_for_build + cat << EOF > $dummy.c + #include + #ifdef __UCLIBC__ + # ifdef __UCLIBC_CONFIG_VERSION__ + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ + # else + LIBC=uclibc + # endif + #else + LIBC=gnu + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` +fi + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -158,6 +178,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -196,50 +217,32 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU @@ -277,42 +280,49 @@ "EV7.9 (21364A)") UNAME_MACHINE="alphaev79" ;; esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -320,32 +330,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +364,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +379,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -383,37 +393,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,32 +450,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -478,29 +492,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -508,7 +522,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -523,15 +537,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -544,28 +562,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -627,9 +645,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -637,11 +665,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -669,153 +697,192 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - # GNU/FreeBSD systems have a "k" prefix to indicate we are using - # FreeBSD's kernel, but not the complete OS. - case ${LIBC} in gnu) kernel_only='k' ;; esac - echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; + echo cris-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-${LIBC} + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -832,8 +899,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -851,15 +922,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-${LIBC} + exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; + echo powerpc-unknown-linux-${LIBC} + exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; + echo powerpc64-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -871,35 +949,41 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + echo hppa64-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; + echo x86_64-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -913,20 +997,22 @@ p'` case "$ld_supported_targets" in elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" ;; a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" + exit ;; coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" + exit ;; esac + # This should get integrated into the C code below, but now we hack + if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi # Determine whether the default compiler is a.out or elf eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -942,23 +1028,33 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -966,24 +1062,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -991,15 +1090,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1091,68 +1191,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1160,22 +1273,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1186,28 +1302,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1239,7 +1374,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1328,11 +1463,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1341,22 +1477,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1367,7 +1503,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- mozart-1.4.0.orig/aclocal.m4 +++ mozart-1.4.0/aclocal.m4 @@ -98,9 +98,14 @@ dnl configure only in a subdirectory of the source tree. dnl ------------------------------------------------------------------ +dnl DEBIAN: +dnl In upstream this is looking for contrib then config.cache. This breaks for +dnl Debian where we build from within the source tree (and the search for contrib +dnl sets BUILDTOP to SRCTOP). I don't see why just config.cache shouldn't work +dnl for all cases ... AC_DEFUN(OZ_PATH_BUILDTOP,[ AC_CACHE_CHECK([for BUILDTOP],oz_cv_path_BUILDTOP,[ - OZ_PATH_UPWARD(oz_cv_path_BUILDTOP,.,[contrib config.cache]) + OZ_PATH_UPWARD(oz_cv_path_BUILDTOP,.,[config.cache]) if test -z "$oz_cv_path_BUILDTOP"; then AC_MSG_ERROR([cannot find BUILDTOP]) fi]) @@ -134,6 +139,12 @@ OZBUILDDATE=$oz_cv_build_date; AC_SUBST(OZBUILDDATE)]) +AC_DEFUN(OZ_BUILD_TIME,[ + AC_CACHE_CHECK([for build time],oz_cv_build_time,[ + oz_cv_build_time=`date +"%H%M%S"`]) + OZBUILDTIME=$oz_cv_build_time; + AC_SUBST(OZBUILDTIME)]) + AC_DEFUN(OZ_VERSION,[ AC_CACHE_CHECK([for oz version],oz_cv_ozversion,[ oz_cv_ozversion=`sh $SRCTOP/OZVERSION`]) @@ -192,6 +203,7 @@ AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) OZ_BUILD_DATE + OZ_BUILD_TIME AC_SUBST(PLATFORM) OZ_OZLOADSEP OZ_OZLOADWIN --- mozart-1.4.0.orig/mkinstalldirs +++ mozart-1.4.0/mkinstalldirs @@ -40,7 +40,7 @@ if test ! -d "${pathcomp}"; then echo "mkdir $pathcomp" 1>&2 - mkdir "${pathcomp}" || errstatus=$? + mkdir "${pathcomp}" || test -d "${pathcomp}" || errstatus=$? dochmod "${pathcomp}" fi --- mozart-1.4.0.orig/configure +++ mozart-1.4.0/configure @@ -596,7 +596,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1250,9 +1250,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1255: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1256: checking for OZLOADSEP" >&5 +echo "configure:1269: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1272,7 +1285,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1276: checking for OZLOADWIN" >&5 +echo "configure:1289: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1310,7 +1323,7 @@ echo $ac_n "checking for --enable-contrib""... $ac_c" 1>&6 -echo "configure:1314: checking for --enable-contrib" >&5 +echo "configure:1327: checking for --enable-contrib" >&5 # Check whether --enable-contrib or --disable-contrib was given. if test "${enable_contrib+set}" = set; then enableval="$enable_contrib" @@ -1327,7 +1340,7 @@ fi echo $ac_n "checking for --enable-doc""... $ac_c" 1>&6 -echo "configure:1331: checking for --enable-doc" >&5 +echo "configure:1344: checking for --enable-doc" >&5 # Check whether --enable-doc or --disable-doc was given. if test "${enable_doc+set}" = set; then enableval="$enable_doc" @@ -1351,7 +1364,7 @@ fi echo $ac_n "checking for --enable-subdirs""... $ac_c" 1>&6 -echo "configure:1355: checking for --enable-subdirs" >&5 +echo "configure:1368: checking for --enable-subdirs" >&5 # Check whether --enable-subdirs or --disable-subdirs was given. if test "${enable_subdirs+set}" = set; then enableval="$enable_subdirs" @@ -1378,7 +1391,7 @@ echo $ac_n "checking for --with-stdlib""... $ac_c" 1>&6 -echo "configure:1382: checking for --with-stdlib" >&5 +echo "configure:1395: checking for --with-stdlib" >&5 # Check whether --with-stdlib or --without-stdlib was given. if test "${with_stdlib+set}" = set; then withval="$with_stdlib" @@ -1561,6 +1574,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/debian/mozart.dirs +++ mozart-1.4.0/debian/mozart.dirs @@ -0,0 +1,8 @@ +usr/bin +usr/include/mozart +usr/lib/mozart/bin +usr/share/doc/mozart +usr/share/mozart/bin +usr/share/mozart/cache +usr/share/emacs/site-lisp/mozart +usr/share/pixmaps --- mozart-1.4.0.orig/debian/mozart32.xpm +++ mozart-1.4.0/debian/mozart32.xpm @@ -0,0 +1,313 @@ +/* XPM */ +static char * mozart32_xpm[] = { +"32 32 278 2", +" c None", +". c #FFD96B", +"+ c #FED764", +"@ c #FFD354", +"# c #FFD55B", +"$ c #FEDB76", +"% c #FFE189", +"& c #FFF7DF", +"* c #FFE59B", +"= c #FFD24F", +"- c #FFD762", +"; c #FFD866", +"> c #FFDC75", +", c #FFF0C5", +"' c #FFFCF2", +") c #FFFFFF", +"! c #FFF6DD", +"~ c #FFD353", +"{ c #FFD251", +"] c #FED96B", +"^ c #FFDB73", +"/ c #FFECB5", +"( c #FFFCF5", +"_ c #FFF7E1", +": c #FFDD7D", +"< c #FFD661", +"[ c #FFE086", +"} c #FFF5D9", +"| c #FFFFFD", +"1 c #FFF9E7", +"2 c #FFF3D3", +"3 c #FFD352", +"4 c #FFDA71", +"5 c #FEE088", +"6 c #FEDC77", +"7 c #FFDD7B", +"8 c #FFFAEA", +"9 c #FFF6DB", +"0 c #FFE599", +"a c #FFDC77", +"b c #FFEEBC", +"c c #FFD458", +"d c #FED96A", +"e c #FFD559", +"f c #FFD250", +"g c #FFD456", +"h c #FFE28B", +"i c #FFD96A", +"j c #FFDE7D", +"k c #FFFCF3", +"l c #FFFFFE", +"m c #FFEAAD", +"n c #F7D982", +"o c #C3A448", +"p c #856D28", +"q c #534419", +"r c #5E4D1C", +"s c #A48732", +"t c #E6BD47", +"u c #FFE28F", +"v c #FFFEFC", +"w c #FFFEFB", +"x c #FFE598", +"y c #FFDD7C", +"z c #F5CD56", +"A c #9A8032", +"B c #1F1A09", +"C c #030301", +"D c #000000", +"E c #0D0A04", +"F c #4E4118", +"G c #EBC148", +"H c #FFE69F", +"I c #FFFDF9", +"J c #FFE088", +"K c #FFD96C", +"L c #FFE9AB", +"M c #FEDB75", +"N c #897129", +"O c #0A0803", +"P c #0C0A04", +"Q c #4A3D16", +"R c #514318", +"S c #0F0C05", +"T c #493C16", +"U c #E4BB46", +"V c #FFECB3", +"W c #FFE495", +"X c #FFEDB9", +"Y c #FFFDF7", +"Z c #FFFCF4", +"` c #FFD865", +" . c #FEDE82", +".. c #FCE08D", +"+. c #FFD457", +"@. c #F7CB4C", +"#. c #211B0A", +"$. c #504218", +"%. c #E4BC46", +"&. c #EDC349", +"*. c #745F23", +"=. c #090703", +"-. c #94792C", +";. c #FFF1C7", +">. c #FFFAEB", +",. c #FFF9E9", +"'. c #F3DC99", +"). c #C5A444", +"!. c #FED14E", +"~. c #FFD55C", +"{. c #CDA83E", +"]. c #6B5820", +"^. c #F9CD4D", +"/. c #F7CC4B", +"(. c #3E3312", +"_. c #010100", +":. c #28210B", +"<. c #F9CD4C", +"[. c #FFF6DC", +"}. c #FEF8E7", +"|. c #EDDBA8", +"1. c #957D37", +"2. c #27200C", +"3. c #201B09", +"4. c #C3A03C", +"5. c #C3A03B", +"6. c #3B3011", +"7. c #E0B945", +"8. c #A78932", +"9. c #100D05", +"0. c #E3BB46", +"a. c #FFEEBF", +"b. c #FFF2CD", +"c. c #C5AC64", +"d. c #584920", +"e. c #0B0903", +"f. c #050401", +"g. c #93792D", +"h. c #EBC147", +"i. c #090803", +"j. c #040301", +"k. c #806926", +"l. c #433714", +"m. c #020201", +"n. c #DAB343", +"o. c #FFDA6D", +"p. c #FDEEC0", +"q. c #CDB56F", +"r. c #6C5A23", +"s. c #040401", +"t. c #FFD765", +"u. c #FDD14F", +"v. c #413614", +"w. c #1A1608", +"x. c #DCB443", +"y. c #FCD04E", +"z. c #524419", +"A. c #120F05", +"B. c #EEC449", +"C. c #F6CD57", +"D. c #3B3111", +"E. c #4E4017", +"F. c #B79638", +"G. c #FFD459", +"H. c #B99839", +"I. c #1B1608", +"J. c #32290F", +"K. c #AB8C34", +"L. c #9A7F2F", +"M. c #1E1909", +"N. c #6C5920", +"O. c #90762B", +"P. c #392F11", +"Q. c #AC8D34", +"R. c #F9CC4C", +"S. c #614F1D", +"T. c #C8A53D", +"U. c #FFD868", +"V. c #FFD867", +"W. c #F5C94B", +"X. c #836B27", +"Y. c #0F0C04", +"Z. c #010000", +"`. c #D3AE40", +" + c #DEB643", +".+ c #FED14F", +"++ c #483B14", +"@+ c #2D250D", +"#+ c #D7B141", +"$+ c #9C802F", +"%+ c #3C3112", +"&+ c #161206", +"*+ c #151106", +"=+ c #2A2411", +"-+ c #6B624A", +";+ c #EFE3C0", +">+ c #FFF9E8", +",+ c #FFE69E", +"'+ c #FFD660", +")+ c #201A09", +"!+ c #B69537", +"~+ c #FFD764", +"{+ c #FEDA72", +"]+ c #FBCF4E", +"^+ c #E1B945", +"/+ c #BD9C39", +"(+ c #BC9A38", +"_+ c #D3BE81", +":+ c #F4F0E3", +"<+ c #FFEEBD", +"[+ c #4C3E16", +"}+ c #F1C64A", +"|+ c #C2A03A", +"1+ c #544519", +"2+ c #AB8C33", +"3+ c #FEDB78", +"4+ c #FFDA6E", +"5+ c #FFFDF8", +"6+ c #FFEFC2", +"7+ c #FFDF84", +"8+ c #FFEFBF", +"9+ c #FFEAAF", +"0+ c #FFD355", +"a+ c #DCB544", +"b+ c #070602", +"c+ c #66531D", +"d+ c #020200", +"e+ c #100D04", +"f+ c #6F5B21", +"g+ c #FED660", +"h+ c #FFDC79", +"i+ c #FFD252", +"j+ c #FFE9AA", +"k+ c #FFF1C9", +"l+ c #FFDB72", +"m+ c #C9A53D", +"n+ c #201A0A", +"o+ c #A58834", +"p+ c #E9C661", +"q+ c #FED96D", +"r+ c #FFF0C7", +"s+ c #FFDC78", +"t+ c #FFE8A5", +"u+ c #B69637", +"v+ c #030201", +"w+ c #211B09", +"x+ c #8E762F", +"y+ c #EAC351", +"z+ c #FFD351", +"A+ c #FFEEBE", +"B+ c #ECC248", +"C+ c #241D0A", +"D+ c #5F4E1C", +"E+ c #C3A343", +"F+ c #FAD875", +"G+ c #FEDB77", +"H+ c #FFFBEE", +"I+ c #FFDF82", +"J+ c #FFDE7E", +"K+ c #BE9D3A", +"L+ c #B99A41", +"M+ c #FED869", +"N+ c #FFD65E", +"O+ c #FFFDF6", +"P+ c #FFF5D6", +"Q+ c #FFD55A", +"R+ c #FFDF81", +"S+ c #FEDD7D", +"T+ c #FFE7A2", +"U+ c #FFE9A7", +"V+ c #FFF3D1", +"W+ c #FEDD80", +"X+ c #FFD65D", +"Y+ c #FFF5D7", +"Z+ c #FFF3D0", +"`+ c #FFE8A8", +" @ c #FFDA6F", +".@ c #FFD55D", +" . . ", +" + @ # ", +" $ % & * = - ", +" ; > , ' ) ! ~ { ", +" ] ^ / ( ) ) ) _ { = ~ ", +" : < [ } | ) 1 ( ) 2 = = 3 4 ", +" 5 6 = = 7 8 9 0 a 8 ) b = = = c ", +" d e f = = g h i 3 j k l m = = = = ; ", +" n o p q r s t = = = = u v w x = = # # c y ", +" z A B C D D E F G = = = H | I J = K , L f . ", +" M ~ N O P Q R S D D T U = = V ) ' W X Y ) Z ` = . ", +"..+.= @.#.D $.%.&.*.D D =.-.= = ;.) w >.l ) ,.'.).!.~. ", +" +.= {.D D ].^.= /.(._.D :.<.= [.) ) ) }.|.1.2.3.4.{ < ", +" # = 5.D D 6.7.= = 8.9.D O 0.= a.) w b.c.d.e.D f.g.= c ", +" g h.i.D j.k.= = &.l.D m.n.= o.p.q.r.s.D f.D O s = = t. ", +" ~.u.v.D D w.x.= y.z.D A.B.= 3 C.6.j.m.D.E.D 9.F.= = G. ", +" e H.I.D D J.K.L.M.j.N.= = = = O.P.Q.R.S.D M.T.= = = U. ", +" V.W.X.D D _.A.Y.Z.P.`.3 = = = &. +.+= ++D @+#+= = = f ", +" t.= $+%+&+*+=+-+;+k | >+,+'+= = = .+)+D %+%..+G !+&.~+ ", +" {+~ ]+^+/+(+_+:+) ) ) ) I <+~ = = W.A.D [+}+|+1+I.2+3 3+", +" 4+= = = 4+5+) 6+7+8+I ) ) 9+0+= a+b+D P.c+d+D e+f+g+h+", +" i+= = j+) I . = - k+) ) 1 l+= m+_.D j.C D n+o+p+ ", +" q+f @ r+) | s+= = V.' ) | t+= u+_.D v+w+x+y+ ", +" # z+, ) ) 9+~ = f X l ) A+= B+C+_.D+E+F+ ", +" G+= * ) ) H+I+= = J+Z ) X = = K+L+M+ ", +" N+V.O+) l P+Q+= R+Z w 0 = = . S+ ", +" 0+T+Y ) ) 9 U+>+) V+; '+W+ ", +" ~.X+/ ) ) ) ) ) >.J+- ", +" @ f % 6+Y+Z+`+a ", +" 4 f f +.- @ ", +" c { .@ ", +" 4 4+ "}; --- mozart-1.4.0.orig/debian/compat +++ mozart-1.4.0/debian/compat @@ -0,0 +1 @@ +7 --- mozart-1.4.0.orig/debian/convertTextPickle.1 +++ mozart-1.4.0/debian/convertTextPickle.1 @@ -0,0 +1,53 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH CONVERTTEXTPICKLE 1 "February 5, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insyert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +convertTextPickle \- Convert Mozart pickles from version 1.0.1 +.SH SYNOPSIS +.B convertTextPickle +.RI options ... +.SH DESCRIPTION +.TP +If you had saved data structures into pickles with Mozart 1.0.1, then +you'll want to use them in newer releases of Mozart as well. The +format of pickles has changed after 1.0.1, however. This command line +utility can help you to convert pickles. Concerning limitations and +how to overcome them, please refer to the compat module. + +.SH OPTIONS +.TP +.B --help, -h, -? +Display information on legal options, then exit. +.TP +.B --in=\fIfile\fP, -i \fIfile\fP +Select the file from which to read a text pickle in old format. +.TP +.B --out=\fIfile\fP, -o \fIfile\fP +Select the file to which to write the converted pickle in new format. + +.SH SEE ALSO +Full documentation of the Mozart system and the Oz programming +language is available through the +the \fImozart-doc\fP package, or from the mozart web page +\fIwww.mozart-oz.org\fP. + +.SH AUTHOR +This manual page was compiled from the Mozart documentation +because the original package does not have a manual page for +convertTextPickle. + + --- mozart-1.4.0.orig/debian/README.Debian +++ mozart-1.4.0/debian/README.Debian @@ -0,0 +1,35 @@ +Mozart for Debian +================= + +* Differences in the installation + +Per default, the Mozart distribution is installed as one directory tree, +whose root can later be specified by the $OZHOME environment variable and +obtained from within Mozart using the oz.home system property. +Unfortunately, the installation practice violates the Filesystem Hierarchy +Standard (FHS), to which Debian adheres. For this package, I have +therefore tried to eliminate all references to oz.home in the source, and +hard-wired the Debian-specific installation directories. + +One not very unfortunate consequence of this is that profiles are broken +(http://www.mozart-oz.org/documentation/opi/node6.html#chapter.profiles) + +* The Mozart Standard Library + +Mozart 1.2.3 was the first version to include the Mozart standard library, +which will be developed and updated separately from the core system. +Current versions of the standard library will be provided by the +mozart-stdlib package. + +* Enabling Oz Applets + +Most Mozart demos are available as Oz applets -- Oz applications that can +be started by clicking a link on a web page. To learn how to enable Oz +applets in your browser, visit + + http://www.mozart-oz.org/documentation/install/ + +* More information + +For additional information, please visit the Mozart web site at +http://www.mozart-oz.org/. --- mozart-1.4.0.orig/debian/mozart.emacsen-install +++ mozart-1.4.0/debian/mozart.emacsen-install @@ -0,0 +1,23 @@ +#!/bin/sh +# /usr/lib/emacsen-common/packages/install/mozart + +set -e + +FLAVOR=$1 +echo install/mozart: handling install of emacsen flavor ${FLAVOR} + +el_dir=/usr/share/emacs/site-lisp/mozart +el_files="mozart.el oz-extra.el oz-server.el oz.el Fontifier.el" +elc_dir=/usr/share/${FLAVOR}/site-lisp/mozart + +byte_compile_options="-batch -f batch-byte-compile" + +if [ ${FLAVOR} != emacs ]; then + echo install/mozart: byte-compiling for ${FLAVOR} + test -d ${elc_dir} || mkdir ${elc_dir} + (cd ${el_dir} && cp ${el_files} ${elc_dir}) + (cd ${elc_dir} && ${FLAVOR} ${byte_compile_options} ${el_files} 2>/dev/null) + for f in ${el_files}; do rm ${elc_dir}/$f; done +fi + +exit 0 --- mozart-1.4.0.orig/debian/ozdoc.1 +++ mozart-1.4.0/debian/ozdoc.1 @@ -0,0 +1,97 @@ +.TH OZDOC 1 "February 5, 2003" +.SH NAME +ozdoc \- Produce documentation using the ozdoc DTD +.SH SYNOPSIS +.B ozdoc +.RI options ... +.SH DESCRIPTION +.TP +The Oz Documentation DTD provides a means to markup technical documentation so +that it is easy to convert it to alternative publication formats such as LaTeX +and HTML. +.B ozdoc +can be used to process SGML sources written according to the Oz Documentation +DTD. +.SH OPTIONS +.TP +.B --in=\fIfile\fP +The input SGML file. +.TP +.B --type=\fItype\fP +What output to generate (supported types: html-color, html-mono, +html-stylesheets, html-global-index, chunk) +.TP +.B --out=\fIdirectory\fP +The output directory. +.TP +.B --(no)autoindex +Automatically generate index entries. +.TP +.B --include=\fIA1\fP,...,\fIAn\fP +Assume ''. +.TP +.B --link=\fItext\fP,\fIrelURL\fP +Include a link in the margin of each page. +.TP +.B --stylesheet=\fIrelURL\fP +What style sheet to use for generated pages. +.TP +.B --(no)latextogif +Generate GIF files from LaTeX code. +.TP +.B --latexdb=\fIfile\fP +Reuse GIFs generated from LaTeX code. +.TP +.B --(no)split +Split the document into several nodes. +.TP +.B --(no)abstract +Generate an abstract.html auxiliary file. +.TP +.B --keeppictures +Do no recreate GIF from PS if already there. +.TP +.B --xrefdb=\fIfile\fP +Where to look up respectively store references. +.TP +.B --xrefdir=\fIrelURL\fP +Where this document goes relative to the whole documentation installation +directory. +.TP +.B --xreftree=\fIrelURL\fP +How to get to whole doc installation from the directory where this document +goes. +.TP +.B --indexdb=\fIfile\fP +Where to look up respectively store index entries. +.TP +.B --make-hhc=\fIfile\fP +Where to write a HTML Help contents file. +.TP +.B --ozdoc-home=\fIdirectory\fP +ozdoc installation directory. +.TP +.B --author-path=\fIpath\fP +.TP +.B --bib-path=\fIpath\fP +.TP +.B --bst-path=\fIpath\fP +.TP +.B --sbin-path=\fIpath\fP +Where to look for author databases, bib files, bst files, and ozdoc scripts. +.TP +.B --catalog=\fIfile\fP +Specify the catalog file to use for parsing. + +.SH SEE ALSO +Full documentation of the Mozart system and the Oz programming +language is available through the +the \fImozart-doc\fP package, or from the mozart web page +\fIwww.mozart-oz.org\fP. + +.SH AUTHOR +This manual page was compiled from the Mozart documentation +because the original package does not have a manual page for +ozdoc. + + --- mozart-1.4.0.orig/debian/mozart.xpm +++ mozart-1.4.0/debian/mozart.xpm @@ -0,0 +1,426 @@ +/* XPM */ +static char * OzIcon_xpm[] = { +"48 48 375 2", +" c None", +". c #FFDD7B", +"+ c #FFDA6F", +"@ c #FCE296", +"# c #FFD764", +"$ c #FFD24F", +"% c #FDE295", +"& c #FFD96B", +"* c #FFD351", +"= c #FFD55A", +"- c #FFD661", +"; c #FDDF88", +"> c #FFD352", +", c #FFD96A", +"' c #FFF0C5", +") c #FFF8E5", +"! c #FFDC77", +"~ c #FFE28E", +"{ c #FFD55C", +"] c #FFE8A6", +"^ c #FFFBF1", +"/ c #FFFFFF", +"( c #FFFFFD", +"_ c #FFE7A3", +": c #FFD456", +"< c #FFE599", +"[ c #FFD866", +"} c #FFE18A", +"| c #FFF8E4", +"1 c #FFFFFE", +"2 c #FFF7E0", +"3 c #FFD458", +"4 c #FFDD79", +"5 c #FDDD7F", +"6 c #FFD251", +"7 c #FFDB73", +"8 c #FFF3D0", +"9 c #FFF5D7", +"0 c #FFD353", +"a c #FFD250", +"b c #FFDF83", +"c c #FFD55B", +"d c #FFD763", +"e c #FFECB5", +"f c #FFFDF8", +"g c #FFF1CA", +"h c #FED869", +"i c #FFE089", +"j c #FED764", +"k c #FFDB72", +"l c #FFFAEB", +"m c #FFF3D2", +"n c #FFECB6", +"o c #FCE8B0", +"p c #FFF7E2", +"q c #FFFBEF", +"r c #FFE7A0", +"s c #FFD455", +"t c #FFEDB9", +"u c #FFE7A1", +"v c #FFE189", +"w c #FFFEF9", +"x c #FFD867", +"y c #FFF2CD", +"z c #FFE28F", +"A c #FFE086", +"B c #FFDE7F", +"C c #FED65F", +"D c #FFDB71", +"E c #FFF7E1", +"F c #FFFEFC", +"G c #FCE5A2", +"H c #FED86B", +"I c #E8BF48", +"J c #B09035", +"K c #7F6927", +"L c #776224", +"M c #987C2D", +"N c #D8B242", +"O c #FACE4D", +"P c #FFD355", +"Q c #FFFCF5", +"R c #FFFDF6", +"S c #FEDB74", +"T c #EAC14A", +"U c #7D6624", +"V c #1C1708", +"W c #000000", +"X c #0B0904", +"Y c #5C4B1B", +"Z c #E3BB45", +"` c #FFD65F", +" . c #FFE69E", +".. c #FFD354", +"+. c #FFE598", +"@. c #FDE191", +"#. c #DDB541", +"$. c #382E10", +"%. c #010100", +"&. c #28210C", +"*. c #D2AC3F", +"=. c #FFDC76", +"-. c #FFFEFB", +";. c #FFF9E7", +">. c #FFE9AB", +",. c #FFD869", +"'. c #FDE39B", +"). c #E6BD46", +"!. c #2C240C", +"~. c #010101", +"{. c #181407", +"]. c #1D1808", +"^. c #030201", +"/. c #221C0B", +"(. c #DFB743", +"_. c #FFE087", +":. c #FFF5D8", +"<. c #FFF5D9", +"[. c #FFFCF4", +"}. c #FFDA6D", +"|. c #FDE294", +"1. c #FFD868", +"2. c #FED14E", +"3. c #725D22", +"4. c #6A571E", +"5. c #E6BD45", +"6. c #F0C549", +"7. c #826A27", +"8. c #4A3C16", +"9. c #FED14D", +"0. c #FFE69C", +"a. c #FFFEFA", +"b. c #FFDC78", +"c. c #FFD55D", +"d. c #FBE6A8", +"e. c #FFD457", +"f. c #EDC348", +"g. c #120E05", +"h. c #241D0A", +"i. c #EBC147", +"j. c #FDD04E", +"k. c #65531D", +"l. c #040301", +"m. c #BA9836", +"n. c #FFEBB3", +"o. c #FFFDF9", +"p. c #E5C053", +"q. c #7F6824", +"r. c #F9CD4C", +"s. c #FFD459", +"t. c #BF9D39", +"u. c #342B0F", +"v. c #EEC447", +"w. c #31280D", +"x. c #4D3F16", +"y. c #FFF0C7", +"z. c #FFF0C3", +"A. c #F0CB60", +"B. c #8C732A", +"C. c #120F06", +"D. c #836B27", +"E. c #FFDF81", +"F. c #9D8130", +"G. c #131005", +"H. c #D9B341", +"I. c #B19134", +"J. c #070502", +"K. c #1B1607", +"L. c #E5BC45", +"M. c #FFF5DA", +"N. c #FADA7D", +"O. c #B09036", +"P. c #32280E", +"Q. c #191507", +"R. c #E0B844", +"S. c #A88A32", +"T. c #887028", +"U. c #453914", +"V. c #080703", +"W. c #CDA93F", +"X. c #FFFEFD", +"Y. c #FFE497", +"Z. c #D5B149", +"`. c #514217", +" + c #0A0803", +".+ c #D0AB40", +"++ c #D6AF3F", +"@+ c #130F05", +"#+ c #E3BB44", +"$+ c #B39335", +"%+ c #C3A03C", +"&+ c #FFF2CA", +"*+ c #FFFDF7", +"=+ c #FFECB4", +"-+ c #E8C255", +";+ c #766122", +">+ c #090803", +",+ c #E2BA45", +"'+ c #FED96D", +")+ c #F7CC4C", +"!+ c #65531E", +"~+ c #F8CC4C", +"{+ c #0B0903", +"]+ c #D1AC40", +"^+ c #F7D573", +"/+ c #A18431", +"(+ c #261F0A", +"_+ c #151105", +":+ c #27200B", +"<+ c #F3C849", +"[+ c #FFDF85", +"}+ c #FED24F", +"|+ c #7F6826", +"1+ c #090703", +"2+ c #B09034", +"3+ c #F6CA4A", +"4+ c #231D09", +"5+ c #F0C548", +"6+ c #EFC449", +"7+ c #2A220C", +"8+ c #806925", +"9+ c #A68731", +"0+ c #342B11", +"a+ c #E6BD47", +"b+ c #221C0A", +"c+ c #120F05", +"d+ c #B69536", +"e+ c #FCD04E", +"f+ c #F7CB4C", +"g+ c #866E27", +"h+ c #7A6423", +"i+ c #AB8C32", +"j+ c #020201", +"k+ c #544518", +"l+ c #E2B943", +"m+ c #997D2F", +"n+ c #4F4017", +"o+ c #FFDF84", +"p+ c #A78931", +"q+ c #050401", +"r+ c #403412", +"s+ c #201B0A", +"t+ c #E3BA44", +"u+ c #FBCE4D", +"v+ c #6C581E", +"w+ c #B79635", +"x+ c #FCCF4E", +"y+ c #836B26", +"z+ c #725D21", +"A+ c #FFDA70", +"B+ c #7B6524", +"C+ c #161206", +"D+ c #C5A23B", +"E+ c #FCCF4D", +"F+ c #614F1B", +"G+ c #917729", +"H+ c #FEDA6F", +"I+ c #9B7F2D", +"J+ c #191407", +"K+ c #473D20", +"L+ c #DCC687", +"M+ c #FFF4D4", +"N+ c #FFF3CF", +"O+ c #FFE088", +"P+ c #372D10", +"Q+ c #A68933", +"R+ c #F2C749", +"S+ c #DFB744", +"T+ c #866E28", +"U+ c #443814", +"V+ c #3F3311", +"W+ c #403411", +"X+ c #61501D", +"Y+ c #AE9A5F", +"Z+ c #F7F1DE", +"`+ c #C29F3A", +" @ c #A88931", +".@ c #29210B", +"+@ c #786223", +"@@ c #FFD761", +"#@ c #FBCF4D", +"$@ c #FACD4C", +"%@ c #FBCE4C", +"&@ c #FFDF82", +"*@ c #FFFCF2", +"=@ c #FFF1CB", +"-@ c #EAC046", +";@ c #080602", +">@ c #DFB742", +",@ c #D1AC3E", +"'@ c #4C3E15", +")@ c #050402", +"!@ c #151106", +"~@ c #D9B241", +"{@ c #FDE190", +"]@ c #FFE59A", +"^@ c #FFD865", +"/@ c #FFECB7", +"(@ c #FFE392", +"_@ c #FFF3D1", +":@ c #FFEFC2", +"<@ c #D3AD40", +"[@ c #0E0B04", +"}@ c #DCB541", +"|@ c #705B1F", +"1@ c #69561F", +"2@ c #FED14F", +"3@ c #FEDC7A", +"4@ c #FFEBB0", +"5@ c #FFF1C8", +"6@ c #BB9A3A", +"7@ c #030301", +"8@ c #1F1908", +"9@ c #0D0B03", +"0@ c #756022", +"a@ c #E4BB45", +"b@ c #FCE5A4", +"c@ c #FFFAEC", +"d@ c #FFD65D", +"e@ c #FFF4D3", +"f@ c #A78930", +"g@ c #020101", +"h@ c #483B15", +"i@ c #D0AB3F", +"j@ c #FDD359", +"k@ c #FEDE81", +"l@ c #826B26", +"m@ c #020100", +"n@ c #2D250D", +"o@ c #B89736", +"p@ c #FED356", +"q@ c #FFDE7D", +"r@ c #FFEAAD", +"s@ c #FFF2CC", +"t@ c #B29235", +"u@ c #060502", +"v@ c #171306", +"w@ c #876E26", +"x@ c #EEC44A", +"y@ c #FEDA74", +"z@ c #FFDE80", +"A@ c #FFFBEE", +"B@ c #FFDE7E", +"C@ c #FFE7A4", +"D@ c #604F1C", +"E@ c #E0B843", +"F@ c #FED661", +"G@ c #FFF4D5", +"H@ c #FFE69F", +"I@ c #D0AB3E", +"J@ c #3C3111", +"K@ c #C4A039", +"L@ c #FED459", +"M@ c #FDE192", +"N@ c #FFE59B", +"O@ c #FBCF51", +"P@ c #FFD660", +"Q@ c #FFFAEA", +"R@ c #FFF8E6", +"S@ c #FFFBF0", +"T@ c #FFD65E", +"U@ c #FFF9E9", +"V@ c #FFDC75", +"W@ c #FFEAAB", +"X@ c #FFEEBB", +"Y@ c #FEDF87", +"Z@ c #FFEEBE", +"`@ c #FFD762", +" # c #FEE396", +".# c #FFF7DE", +"+# c #FFE496", +"@# c #FCE39B", +"## c #FFDB74", +"$# c #FFDC7A", +"%# c #FED96E", +" . + ", +" @ # $ $ % ", +" & * = $ $ - ", +" ; > , ' ) = $ $ ! ", +" ~ - { ] ^ / ( _ $ $ : ", +" < [ * } | 1 / / / 2 3 $ $ 4 ", +" 5 6 7 8 / / / / / / 9 0 $ $ a ", +" b c d e f / / / / / / / g $ $ $ $ h ", +" i j $ k l / / / / 2 m / / / n $ $ $ $ 6 b ", +" o ! $ $ $ = p / / q r s t / / / u $ $ $ $ $ d ", +" 4 3 $ $ $ $ $ v w t x $ $ y / / / z $ $ $ $ $ $ A ", +" B C $ $ $ $ $ $ $ > D * $ $ $ E / / F B $ $ $ $ $ $ : ", +" G H I J K L M N O $ $ $ $ $ $ $ P Q / / R + $ $ $ $ $ $ $ S ", +" + T U V W W W W X Y Z $ $ $ $ $ $ x f / / ^ ` $ $ $ { .` $ ..+. ", +" @.= #.$.%.W W W W W W W &.*.$ $ $ $ $ =.-./ / l 6 $ * z ;.1 >.$ $ ,. ", +" '.d $ ).!.W W ~.{.].^.W W W W /.(.$ $ $ $ _.1 / / :.> ! <./ / / [.}.$ $ |. ", +" 1.$ $ 2.3.W W ~.4.5.6.7.%.W W W W 8.9.$ $ $ 0./ / / <.n a./ / / / | b.$ $ c. ", +"d.e.$ $ $ f.g.W W h.i.$ $ j.k.W W W W l.m.$ $ $ n./ / / / / / / / o.] p.q.r.$ $ ! ", +" s.$ $ $ t.W W W u.r.$ $ $ v.w.W W W W x.2.$ $ y./ / / / / / o.z.A.B.C.%.D.$ $ e. ", +" E.$ $ $ F.W W W G.H.$ $ $ $ I.J.W W W K.L.$ $ 8 / / / / / M.N.O.P.W W W Q.R.$ $ 7 ", +" 3 $ $ S.W W W W T.$ $ $ $ O U.W W W V.W.$ $ _.X./ / q Y.Z.`.J.W W W W +.+$ $ * ", +" } $ $ ++~.W W W @+#+$ $ $ $ $+W W W W %+$ $ $ &+*+=+-+;+>+W W W W W W Q.,+$ $ $ x ", +" '+$ )+&.W W W W !+2.$ $ $ ~+W W W {+]+$ $ $ 1.^+/+(+W W W W _+W W W :+<+$ $ $ 6 [+ ", +" * }+|+W W W W 1+2+$ $ $ 3+W W W 4+5+$ $ $ $ 6+7+W W W X 8+9+W W W 0+2.$ $ $ $ ` ", +" D $ a+b+W W W W c+d+e+f+g+W W W h+$ $ $ $ $ $ i+j+1+k+l+$ m+W W W n+$ $ $ $ $ $ o+ ", +" : $ p+q+W W W W +x.r+q+W W s+t+$ $ $ $ $ $ u+v+w+x+$ $ y+W W W z+$ $ $ $ $ $ P ", +" A+$ j.B+W W W W W W W W W C+D+$ : $ $ $ $ $ $ E+$ $ $ $ F+W W W G+$ $ $ $ $ $ $ H+ ", +" ` $ 2.I+J+W W W W W l.K+L+M+a./ f N+O+P $ $ $ $ $ $ $ P+W W %.Q+$ $ $ $ f.R+$ ..< ", +" |.$ $ $ S+T+U+V+W+X+Y+Z+/ / / / / / / y.c $ $ $ $ $ E+s+W W l.`+$ $ ~+ @.@+@j.$ [ ", +" @@$ $ $ $ #@$@%@&@*@/ / / / / / / / 1 =@s.$ $ $ $ -@{.W W ;@>@$ ,@'@)@W !@~@$ a {@", +" ]@0 $ $ $ $ $ ^@q / / f /@(@_@1 / / / / :@6 $ $ $ <@[@W W +}@|@q+W W W %.1@2@..E.", +" 3@$ $ $ $ $ 4@/ / X.+.a $ s.5@/ / / / / B $ $ $ 6@7@W W ^.8@W W W W 9@0@a@}.b@ ", +" P $ $ $ $ c@/ / *@,.$ $ $ d@) / / / / e@$ $ $ f@W W W W W W W g@h@i@j@&@ ", +" k@$ $ $ { F / / -.. $ $ $ $ b F / / / *+A+$ $ l@W W W W W m@n@o@p@q@ ", +" s.$ $ ` X./ / / r@a $ $ $ 0 s@/ / / / z $ $ t@u@W W W v@w@x@y@ ", +" z@a $ * F / / / A@- $ $ $ $ B@-./ / / C@$ $ O x.W j+D@E@F@} ", +" h $ $ G@/ / / / /@$ $ $ $ $ ) / / / H@$ $ $ I@J@K@L@v ", +" M@6 $ N@/ / / / o.4 $ $ $ $ y / / ( A $ $ $ $ O@3@ ", +" + $ P@Q@/ / / / ;.1.$ $ s R@/ / S@T@$ $ $ , Y. ", +" s.$ Y.F / / / / U@v V@s@/ / / W@$ $ d@@. ", +" S $ 0 X@/ / / / / / / / / / G@c s Y@ ", +" { $ : Z@/ / / / / / / / _@`@k ", +" #a $ 6 i .#f / / o.E +#x @# ", +" # $ $ $ P k _._.##` $# ", +" ~ 0 $ $ $ $ $ a V@ ", +" %#$ $ $ 6 1. ", +" ..$ ` b ", +" z@&@ "}; --- mozart-1.4.0.orig/debian/mozart.emacsen-startup +++ mozart-1.4.0/debian/mozart.emacsen-startup @@ -0,0 +1,17 @@ +;; -*-emacs-lisp-*- +;; +;; Emacs startup file for the Debian GNU/Linux mozart package + +(setq load-path + (cons (concat "/usr/share/" (symbol-name flavor) "/site-lisp/mozart") + load-path)) + +(setq auto-mode-alist + (append '(("\\.oz$" . oz-mode) + ("\\.ozg$" . oz-gump-mode)) + auto-mode-alist)) + +(autoload 'run-oz "oz" "" t) +(autoload 'oz-mode "oz" "" t) +(autoload 'oz-gump-mode "oz" "" t) +(autoload 'oz-new-buffer "oz" "" t) --- mozart-1.4.0.orig/debian/rules +++ mozart-1.4.0/debian/rules @@ -0,0 +1,169 @@ +#!/usr/bin/make -f +# +# Mozart for Debian/GNU +# Marco Kuhlmann +# Kevin Glynn +# This file is public domain software, based on an example by Joey Hess. +# + +# Uncomment this to turn on verbose mode: +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work: +export DH_OPTIONS + +# These are used for cross-compiling: +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +srcdir := $(CURDIR) +builddir := $(CURDIR)/BUILD +installdir := $(CURDIR)/debian/mozart +installdir_doc := $(CURDIR)/debian/mozart-doc + +ozhome := /usr/share/mozart +ozplatform := $(shell $(srcdir)/share/bin/ozplatform) + +source: source-stamp +source-stamp: + dh_testdir + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub $(srcdir)/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess $(srcdir)/config.guess + echo > $@ + +configure: configure-stamp +configure-stamp: source-stamp $(srcdir)/configure + dh_testdir + mkdir $(builddir) || true + @echo -n "OZPLATFORM system triple: " + @echo "`/bin/uname -m` `/bin/uname -s` `/bin/uname -r`" + cd $(builddir) && $(srcdir)/configure \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=$(ozhome) \ + --disable-copy-tcl-libs \ + --disable-compile-elisp \ + --disable-contrib-micq \ + --enable-opt \ + --enable-doc \ + --with-documents=all + echo > $@ + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) -C $(builddir) + echo > $@ + +clean: + dh_testdir + dh_testroot + rm -rf $(builddir) + dh_clean -X.ozf.orig + +# installs mozart binary package +install: build-stamp + dh_testdir + dh_testroot + dh_installdirs -a + $(MAKE) -C $(builddir) PREFIX=$(installdir)$(ozhome) install + # Run test suite +# cd $(builddir)/share/test && \ +# make boot-all && \ +# make boot-check + # move binaries to their proper places + for f in oz ozengine ozc ozl ozd oztool convertTextPickle ozdoc; do \ + mv $(installdir)$(ozhome)/bin/$$f $(installdir)/usr/bin/$$f; \ + done + mv $(installdir)$(ozhome)/bin/ozplatform \ + $(installdir)/usr/lib/mozart/bin/ozplatform + for f in oldpickle2text pickle2text text2pickle; do \ + ln -sf ../../../bin/oz $(installdir)/usr/lib/mozart/bin/$$f && \ + rm $(installdir)$(ozhome)/bin/$$f; \ + done + # move architecture-dependent files into /usr/lib/mozart + cd $(installdir)$(ozhome) && \ + find -type f -a -name '*.so-*' | \ + tar --create --files-from - --remove-files | \ + (cd $(installdir)/usr/lib/mozart && tar --preserve --extract) + rm -r $(installdir)$(ozhome)/cache/x-oz/boot + rm -rf $(installdir)/usr/lib/mozart/platform + # move libDSS.so into /usr/lib/mozart/platform + mv $(installdir)$(ozhome)/lib/libDSS.so $(installdir)/usr/lib/mozart/platform/$(ozplatform)/lib/; \ + rm -rf $(installdir)$(ozhome)/lib + mv $(installdir)$(ozhome)/platform \ + $(installdir)/usr/lib/mozart/ + # remove superfluous tcl/tk stuff + rm -r $(installdir)/usr/lib/mozart/platform/$(ozplatform)/wish + # move elisp files to their proper place + mv $(installdir)$(ozhome)/share/elisp/* \ + $(installdir)/usr/share/emacs/site-lisp/mozart/ + rm -r $(installdir)$(ozhome)/share/elisp + # move include files to their proper place + mv $(installdir)$(ozhome)/include/* \ + $(installdir)/usr/include/mozart/ + rm -r $(installdir)$(ozhome)/include + # install readme; remove licenses (see debian/copyright) + mv $(installdir)$(ozhome)/README \ + $(installdir)/usr/share/doc/mozart + rm $(installdir)$(ozhome)/LICENSE* + # install mozart pixmap + cp -p debian/mozart32.xpm \ + $(installdir)/usr/share/pixmaps + cp -p debian/mozart.xpm \ + $(installdir)/usr/share/pixmaps + # Remove the documentation and the examples (that is for mozart-doc) + rm -r $(installdir)$(ozhome)/doc + rm -r $(installdir)$(ozhome)/examples + # debhelper stuff + dh_testdir -a + dh_testroot -a + dh_installchangelogs -Xdoc/changes -a + dh_installdocs -a + dh_installmenu -a + dh_installemacsen -a + dh_installman -a debian/*.1 $(srcdir)/doc/man/*.1 + dh_fixperms -a + dh_strip -a + dh_compress -a -X.oz -X.oza -X.ozg -X.ppm + dh_installdeb -a + dh_shlibdeps -l$(installdir)/usr/lib/mozart/platform/$(ozplatform)/lib/ -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +# installs arch independent documentation files +install-doc: build-stamp install + dh_testdir + dh_testroot + dh_installdirs -i + # Build docn + $(MAKE) -C $(builddir) PREFIX=$(installdir)$(ozhome) install + # link to the documentation and the examples from /usr/share/doc/mozart-doc + mv $(installdir)$(ozhome)/doc $(installdir_doc)$(ozhome)/ + ln -sf ../../mozart/doc $(installdir_doc)/usr/share/doc/mozart-doc/doc + ln -sf ../../mozart/doc $(installdir_doc)/usr/share/doc/mozart-doc/html + mv $(installdir)$(ozhome)/examples $(installdir_doc)$(ozhome)/ + ln -sf ../../mozart/examples $(installdir_doc)/usr/share/doc/mozart-doc/examples + # debhelper stuff + dh_testdir + dh_testroot + dh_installchangelogs -Xdoc/changes -i + dh_installdocs -i + dh_compress -i -X.oz -X.oza -X.ozg -X.ppm + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-indep: build install install-doc + +binary-arch: build install + +binary: binary-arch binary-indep + +.PHONY: source configure build clean install binary-indep binary-arch binary + --- mozart-1.4.0.orig/debian/mozart-doc.doc-base +++ mozart-1.4.0/debian/mozart-doc.doc-base @@ -0,0 +1,9 @@ +Document: mozart-doc +Title: Mozart Programming System Documentation +Author: Kevin Glynn +Abstract: These web pages provide extensive documentation for the Mozart programming system. +Section: Programming/MozartOz + +Format: HTML +Index: /usr/share/doc/mozart-doc/doc/index.html +Files: /usr/share/doc/mozart-doc/doc/index.html --- mozart-1.4.0.orig/debian/control +++ mozart-1.4.0/debian/control @@ -0,0 +1,37 @@ +Source: mozart +Section: devel +Priority: optional +Maintainer: Kevin Glynn +Standards-Version: 3.9.2 +Homepage: http://www.mozart-oz.org/ +Vcs-Git: git://anonscm.debian.org/collab-maint/mozart.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/mozart.git +Build-Depends: debhelper (>> 7.0.0), bison (>= 1.25), flex-old (>= 2.5.3), ghostscript, libgdbm-dev, libgmp-dev, m4, netpbm, sp, tcl8.4-dev, texlive, texlive-pstricks, tk8.4-dev, zlib1g-dev, emacs23 | emacs22 | xemacs21 + +Package: mozart +Architecture: hppa i386 m68k mipsel mips powerpc sparc s390 arm armeb armel kfreebsd-i386 sh4 +Depends: ${shlibs:Depends}, ${misc:Depends}, emacs23 | emacsen +Conflicts: mozart-contrib, mozart-doc-html +Suggests: mozart-doc, mozart-stdlib, mozart-gtk, mime-support (>= 3.18) +Description: Mozart Programming System + Mozart is an advanced development platform for intelligent, distributed + applications. It is based on the Oz language, which supports declarative + programming, object-oriented programming, constraint programming, and + concurrency as part of a coherent whole. For distribution, Mozart + provides a true network transparent implementation with support for + network awareness, openness, and fault tolerance. Security is upcoming. + Mozart is an ideal platform for both general-purpose distributed + applications as well as for hard problems requiring sophisticated + optimization and inferencing abilities. + +Package: mozart-doc +Section: doc +Architecture: all +Depends: konqueror | www-browser, ${misc:Depends} +Conflicts: mozart-doc-html +Replaces: mozart-doc-html +Recommends: mozart (>= 1.3.0) +Description: Mozart Programming System (Documentation) + This package contains Mozart documentation (tutorials and reference + manuals) in HTML format. It also include a set of demo applets, so you + should probably install the mozart to really benefit from this package. --- mozart-1.4.0.orig/debian/oz.1 +++ mozart-1.4.0/debian/oz.1 @@ -0,0 +1,55 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH OZ 1 "February 5, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insyert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +Oz \- The Oz Programming Interface +.SH SYNOPSIS +.B oz +.RI [ emacs " args ] + +.SH DESCRIPTION +.TP +\fBoz\fP starts up an Emacs process, passing to it all arguments given +on the command line, creates a new buffer named \fIOz\fP, and starts a +Mozart sub-process. +.P +The command used to invoke Emacs is determined through the following +steps: If the environment variable \fIOZEMACS\fP is set, its contents +is used. Else, if a command named \fBemacs\fP is found in the +\fIPATH\fP, this is used. Else, if a command named \fBxemacs\fP is +found in the \fIPATH\fP, this is used. Else, if a command named +\fBlemacs\fP is found in the \fIPATH\fP, this is used. + + +.SH SEE ALSO +Full documentation of the Mozart system and the Oz programming +language is available through the +the \fImozart-doc\fP package, or from the mozart web page +\fIwww.mozart-oz.org\fP. +See in particular the document \fIThe Oz Programming Interface\fP. + +.P +.BR ozc (1), +.BR ozd (1), +.BR ozengine (1), +.BR ozl (1), +.BR oztool (1), +.BR convertTextPickle (1). + +.SH AUTHOR +This manual page was compiled from the Mozart documentation +because the original package does not have a manual page for oz. --- mozart-1.4.0.orig/debian/mozart-doc.dirs +++ mozart-1.4.0/debian/mozart-doc.dirs @@ -0,0 +1,2 @@ +usr/share/doc/mozart-doc +usr/share/mozart --- mozart-1.4.0.orig/debian/mozart-doc.preinst +++ mozart-1.4.0/debian/mozart-doc.preinst @@ -0,0 +1,48 @@ +#! /bin/sh +# preinst script for mozart-doc +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install|upgrade) + # + # Remove left over directories from earlier installations. These are + # replaced by symlinks. + # + if dpkg --compare-versions "$2" lt "1.3.1.20040616-4"; then + for a in doc examples html + do + if [ -d /usr/share/doc/mozart-doc/$a ] + then + rm -rf /usr/share/doc/mozart-doc/$a + fi + done + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- mozart-1.4.0.orig/debian/copyright +++ mozart-1.4.0/debian/copyright @@ -0,0 +1,96 @@ +This is the Debian prepackaged version of the Mozart Programming System. + +It has been built from sources obtained from the Mozart CVS; see + + http://www.mozart-oz.org/download/ + +See http://www.mozart-oz.org/people.html for a list of original authors. + +The package was originally put together by Ralf Treinen , +and then maintained heroically by Marco Kuhlmann . +It has been maintained by Kevin Glynn since version 1.3.0. + +Changes with respect to the original sources: + + * added Debian specific package maintenance files + * added man pages for oz, convertTextPickle, and ozdoc + * debianised the source tree (see debian/debianise.diff) + * make configure recognise new versions of bison (see debian/bison.diff) + * make configure recognise new versions of flex (see debian/flex.diff) + + +Copyright: + + License Agreement + for +Mozart, an implementation of Oz 3 +---------------------------------- + +This software and its documentation are copyrighted +by Saarland University, the Swedish Institute of +Computer Science (SICS), the German Research Center +for Artificial Intelligence (DFKI), and other +parties. The following terms apply to all files +associated with the software unless explicitly +disclaimed in individual files (see the file +LICENSE-others for a list of these exceptions). + +The authors hereby grant permission to use, copy, +modify, distribute, and license this software and +its documentation for any purpose, provided that +existing copyright notices are retained in all +copies and that this notice is included verbatim +in any distributions. No written agreement, +license, or royalty fee is required for any of the +authorized uses. Modifications to this software +may be copyrighted by their authors and need not +follow the licensing terms described here, +provided that the new terms are clearly indicated +on the first page of each file where they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE +LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, +INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT +OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR +ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM +ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR +A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS +SOFTWARE AND ITS DOCUMENTATION ARE PROVIDED ON AN +"AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS +HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, +UPDATES, ENHANCEMENTS, OR MODIFICATIONS. + +The following [from LICENSE-others] is a list of files in the Mozart +source tree that are not covered by the Mozart LICENSE. Note that the +Mozart system itself is independent of these packages which are +provided as convenient tools: + +mozart/platform/tools/gump/ozflex/* + + See the file mozart/platform/tools/gump/ozflex/COPYING + + (SLIGHTLY MODIFIED VERSION OF BSD LICENSE) + +mozart/platform/tools/gump/ozbison/* + + See the file mozart/platform/tools/gump/ozbison/COPYING + + (GNU GENERAL PUBLIC LICENSE V2 + On Debian GNU/Linux systems, the complete text of the GNU GENERAL + PUBLIC LICENSE V2 can be found in `/usr/share/common-licenses/GPL-2') + +mozart/platform/wish/unixMain.cc + + See there + + (MODIFIED BSD LICENSE) + +mozart/doc/tcltk/tcl8.0-tk8.0-man-html.tar.gz + + See the included file copyright.htm + + (MODIFIED BSD LICENSE) --- mozart-1.4.0.orig/debian/menu +++ mozart-1.4.0/debian/menu @@ -0,0 +1,3 @@ +?package(mozart):needs="X11" section="Applications/Programming"\ + icon="/usr/share/pixmaps/mozart32.xpm"\ + title="Mozart" command="/usr/bin/oz" --- mozart-1.4.0.orig/debian/changelog +++ mozart-1.4.0/debian/changelog @@ -0,0 +1,568 @@ +mozart (1.4.0-8ubuntu1) oneiric; urgency=low + + * Merge with Debian; remaining changes: + - Recognize ARM architectures newer than armv5 in the build system, + to make some progress on building the package. + + -- Matthias Klose Thu, 08 Sep 2011 20:26:42 +0200 + +mozart (1.4.0-8) unstable; urgency=low + + * Whoops, really change standards version to 3.9.2 as promised below. + * Update Vcs fields to match new Alioth defaults. + + -- Kevin Glynn Sun, 05 Jun 2011 10:48:56 +0200 + +mozart (1.4.0-7) unstable; urgency=low + + * faultstates.eps was making gs seg fault, regenerated from png using + sam2p. (closes: 624593) + * Removed Pierre Machard from uploaders. Thanks for everything Pierre. + (closes: 576555) + * Changed libgmp3-dev build dependency to libgmp-dev. + * Fix description-synopsis-starts-with-article Lintian warning. + * Standards Version 3.9.2. (No change) + + -- Kevin Glynn Sat, 04 Jun 2011 14:14:10 +0200 + +mozart (1.4.0-6ubuntu1) natty; urgency=low + + * Recognize ARM architectures newer than armv5 in the build system, + to make some progress on building the package. + + -- Jani Monoses Mon, 04 Apr 2011 20:55:52 +0300 + +mozart (1.4.0-6) unstable; urgency=medium + + * Explicitly exclude the doc/changes directory when searching + for changelogs (closes: 608374) + + -- Kevin Glynn Sun, 02 Jan 2011 12:00:32 -0600 + +mozart (1.4.0-5) unstable; urgency=low + + * Support for s390x + + -- Kevin Glynn Sun, 21 Mar 2010 10:07:09 -0500 + +mozart (1.4.0-4) unstable; urgency=low + + * Add support for Renesas SH platform (sh4). Thanks to Nobuhiro Iwamatsu. + (closes: 573526) + * Fix changelog entry to wrap at 80 cols to keep lintian happy + + -- Kevin Glynn Sat, 13 Mar 2010 11:26:48 -0600 + +mozart (1.4.0-3) unstable; urgency=low + + * Add Homepage to control file, remove homepage from description + * Bump emacs dependencies to emacs23 (closes: 572287) + * Depend on ${misc:depends} (misc debhelper dependencies) to make + lintian happy + * Update debhelper COMPAT to 7, don't need to remove *-stamp files + in clean now + * Standards Version 3.8.4 (No change) + + -- Kevin Glynn Tue, 09 Mar 2010 21:21:30 -0600 + +mozart (1.4.0-2) unstable; urgency=low + + * Don't set -march in CXXFLAGS for all unknown architectures when building + DSS. Fixes FTBFS on many architectures (closes: 522682) + * Quieten lintian: Fix Section for mozart-doc, and Section for + mozart-doc.doc-base + * Bumped Standards-Version to 3.8.1 (no change required) + + -- Kevin Glynn Sun, 05 Apr 2009 14:57:19 -0500 + +mozart (1.4.0-1) unstable; urgency=low + + * New upstream release 1.4.0 (actually up to date with trunk svn rev 17188) + - The major change in this release is a rewrite of the distribution support + to use the Distribution SubSystem (DSS) http://dss.sics.se/. This is a + language independent distribution library, but is only used by Mozart/Oz + as far as I know. (closes: 511017) + * micq contrib is broken and no longer built (as upstream) + * Changed package source layout to be more conventional. We no longer rename + the files in the upstream tarball, we don't put the date in the upstream + version number. + * debian/control: Add VCS-Git and VCS-Browser. Debian packaging is now in + collab-maint on alioth. Patches welcomed. See debian/README.git for details + * Fix gs-gpl -> ghostscript build dependency + * Upstream has removed RFC 2229 so we don't need to repack the source and I + have removed README.Source. + * Upstream has fixed most instances of 'gcc warning when assigning a constant + string' so that big patch is no longer required. + + + -- Kevin Glynn Sat, 04 Apr 2009 14:50:35 -0500 + +mozart (1.3.2.20060615+dfsg-4) unstable; urgency=low + + * set inhibit-splash-screen to avoid emacs22's annoying (for oz users) + splash screen + * emacs22 is now allowed for building and is default emacs dependency + (closes: 434922) + * added architectures arme[l/b] (closes: 428976) + * don't strip flex.exe, let Debian's build system do that if required + (closes: 437595) + * change maintainer email address (DD!). Thanks to all my sponsors + * Add const to many, many 'char *' signatures to avoid gcc warning when + assigning a constant string. Patch is a bit involved so that we don't + break pre-compiled native functors. See + http://lists.gforge.info.ucl.ac.be/pipermail/mozart-hackers/2008/002968.html + for details + * dependency gs -> gs-gpl + * Standards Version 3.7.3 (menu position changes: Apps/Programming -> + Applications/Programming) + * Fixed some lintian warnings + + -- Kevin Glynn Sun, 27 Apr 2008 09:22:53 -0500 + +mozart (1.3.2.20060615+dfsg-3) unstable; urgency=low + + * Add support for GNU/kFreeBSD, thanks to Petr Salinger + for proposing / testing (closes: 401627) + * debian/control: Build-Depend on texlive instead of tetex + * debian/rules: replaced explicit setting of DH_COMPAT with debian/compat + to quieten lintian + * And upped debhelper compat level from 4 to 5. + + -- Kevin Glynn Sat, 05 May 2007 09:11:45 -0500 + +mozart (1.3.2.20060615+dfsg-2) unstable; urgency=medium + + * In Debian sparc64 == sparc32 == sparc, so we can map sparc64 to + linux-sparc (closes: 400355). Urgency medium for RC bug. + + -- Kevin Glynn Sat, 2 Dec 2006 09:14:35 -0600 + +mozart (1.3.2.20060615+dfsg-1) unstable; urgency=low + + * Removed text of RFC 2229 from mozart/share/demo/dictClient/ in the + upstream source tarball. Added a README to that directory in the + Debian source telling how to obtain the file (closes: 393399) + + -- Kevin Glynn Mon, 16 Oct 2006 17:51:24 -0500 + +mozart (1.3.2.20060615-2) unstable; urgency=low + + * Replace $(PWD) by $(CURDIR) in debian/rules so that we can be + built via sudo (which now limits the environment passed to children) + * Fix ozplatform to recognize armv5tel as linux-arm + + -- Kevin Glynn Thu, 28 Sep 2006 22:38:16 -0400 + +mozart (1.3.2.20060615-1) unstable; urgency=low + + * New Upstream Release (1.3.2) + + -- Kevin Glynn Wed, 21 Jun 2006 15:24:03 -0500 + +mozart (1.3.1.20040616-13) unstable; urgency=low + + * Add 32x32 mozart icon (mozart32.xpm) for use in menu entries + * Change depends from emacsen -> emacs21 | emacsen to make lintian happy + * Bumped Standards-Version to 3.7.2 (no change required) + + -- Kevin Glynn Mon, 19 Jun 2006 09:44:28 -0500 + +mozart (1.3.1.20040616-12) unstable; urgency=low + + * Update mozart icon to higher resolution version + * Change depends from emacs21 | xemacs21 to allow installations with + only emacs-snapshot installed (closes: 337858). build-depends is still + emacs21 | xemacs21 because the documentation won't build with + emacs-snapshot. + * Merged fix from upstream to work with emacs v22 (e.g. emacs-snapshot). + Fix removes read-only from compilation buffer + * Merged patches from upstream for: + - build with gcc-4,1 (closes: 358449) + - install with emacs-snapshot (closes: 337858) + (but we still can't *build* with emacs-snapshot) + - allow reflect contribs to build with debian source + - reverts a broken fix from upstream that means ozfs built + with debian mozart releases 1.3.1.20040616-8 through 1.3.1.20040616-11 + are incompatible with all other 1.3.x mozart emulators, and vice-versa + (they will block or segment fault on calls to NewPort). Reverting this + breakage makes us compatible with debian stable and future mozart + releases. + + -- Kevin Glynn Mon, 5 Jun 2006 11:04:10 -0500 + +mozart (1.3.1.20040616-11) unstable; urgency=low + + * Add arm architecture. + + -- Pierre Machard Fri, 26 Aug 2005 21:05:20 +0200 + +mozart (1.3.1.20040616-10) unstable; urgency=low + + * Back out symlink change. Use relative paths for symbolic links + (Debian Policy 10.5). + + -- Kevin Glynn Wed, 24 Aug 2005 09:46:17 +0200 + +mozart (1.3.1.20040616-9) unstable; urgency=low + + * Merge updates from Mozart's release branch (to 7-Aug-2005) + many bug fixes, allow builds with gcc 4.x (closes: 323737). + * Use absolute paths when making links to doc directories, this stops + problems for people with symlinked /usr/share/doc (i.e., me!). + * Bumped Standards-Version to 3.6.2. + + -- Kevin Glynn Mon, 8 Aug 2005 14:46:29 +0200 + +mozart (1.3.1.20040616-8) unstable; urgency=low + + * mozart-doc replaces mozart-doc-html (so that users don't lose docn on + upgrade from woody) + * flex -> flex-old in build dependencies. We build from pre-generated + scanner and parser files, but if we ever need to regenerate then we will + need flex-old. + + -- Kevin Glynn Fri, 28 Jan 2005 15:37:14 +0100 + +mozart (1.3.1.20040616-7) unstable; urgency=high + + * Urgency set to high because upgrading from Woody fails + * Add a conflicts on mozart-contrib and mozart-doc-html + * Add myself as Uploader + + -- Pierre Machard Mon, 23 Aug 2004 13:35:16 +0200 + +mozart (1.3.1.20040616-6) unstable; urgency=low + + * Sigh, backout running the test suite for now. I don't think the mips + builder has enough oomph. I will investigate after the freeze. + + -- Kevin Glynn Fri, 13 Aug 2004 10:58:31 +0200 + +mozart (1.3.1.20040616-5) unstable; urgency=low + + * Well, well, it seems we build on s390, add to Architecture list + * Run test suite after build + + -- Kevin Glynn Sun, 8 Aug 2004 09:39:07 +0200 + +mozart (1.3.1.20040616-4) unstable; urgency=low + + * Really remove documentation from mozart package + * Put documentation/examples in /usr/share/mozart/doc and link from + /usr/share/doc/mozart[-doc]/[html/examples] (closes: 262484,262447) + * Forcibly remove docn installed by 1.2.5 if it exists in + /usr/share/doc/mozart-doc (via preinst). + NB. This generates lots of harmless warnings when upgrading from earlier + debs. + + -- Kevin Glynn Wed, 4 Aug 2004 17:08:40 +0200 + +mozart (1.3.1.20040616-3) unstable; urgency=low + + * Move dh_fixperms before dh_strip, otherwise strip gets + "perm failed" error. + + -- Kevin Glynn Mon, 2 Aug 2004 13:41:03 +0200 + +mozart (1.3.1.20040616-2) unstable; urgency=low + + * Move /usr/X11R6/include/X11/pixmap/mozart.xpm to /usr/share/pixmaps to + quieten lintian + + -- Kevin Glynn Fri, 30 Jul 2004 22:51:29 +0200 + +mozart (1.3.1.20040616-1) unstable; urgency=low + + * New upstream release (CVS tag mozart-1-3-1) (closes: #204045,#256597) + * Upload into Debian unstable before freeze, many thanks to + Pierre Machard for sponsoring + * mozart-doc is now Architecture: all (closes: #233417) + + -- Kevin Glynn Wed, 28 Jul 2004 13:01:38 +0200 + +mozart (1.3.0.20040413-2) unstable; urgency=low + + * Add documentation to doc-base, mozart-doc pages now appear in dhelp and dwww + + -- Kevin Glynn Thu, 29 Apr 2004 18:48:48 +0200 + +mozart (1.3.0.20040413-1) unstable; urgency=low + + * New upstream version (CVS tag mozart-1-3-0) + * New maintainer + + -- Kevin Glynn Mon, 26 Apr 2004 19:43:21 +0200 + +mozart (1.2.5.20030212-3) unstable; urgency=low + + * Maintainer field set to QA Group + * Removed emacs20 depend and build-depend (closes: #229930) + + -- Emanuele Rocca Sun, 1 Feb 2004 15:44:15 +0100 + +mozart (1.2.5.20030212-2) unstable; urgency=low + + * removed insecure mailcap entry (closes: #197826) + * build against new libgdbm package (closes: #199592) + * adapted to new version of Debian policy + + -- Marco Kuhlmann Wed, 2 Jul 2003 11:00:42 +0200 + +mozart (1.2.5.20030212-1) unstable; urgency=low + + * new upstream version (CVS tag mozart-1-2-5-r1) + * debian/control: Conflicts/Replaces mozart-doc-html (closes: #192911) + * debian/copyright: use verbatim copies of LICENSE* files + * mozart/aclocal.m4: use dummy skeleton file to call flex (closes: #192714) + + -- Marco Kuhlmann Thu, 15 May 2003 14:27:20 +0200 + +mozart (1.2.5.20030205-1) unstable; urgency=low + + * new upstream version (CVS tag mozart-1-2-0-gcc-3-2) + * packages are now split up into base, doc, stdlib, and gtk + * patch the source to comply with FHS + * documentation is now built from source + * reverted to old naming scheme (version plus date) + + -- Marco Kuhlmann Wed, 5 Feb 2003 09:17:24 +0100 + +mozart (1.2.4-4) unstable; urgency=low + + * debian/control: upgraded to new version of Debian policy + * debian/rules: delete install-stamp + + -- Marco Kuhlmann Tue, 17 Sep 2002 11:21:21 +0100 + +mozart (1.2.4-3) unstable; urgency=low + + * Forgot that new upstream version closes: #148622 + * debian/control: + - update dependency information to 1.2.4-3 + - provide an Architecture for the doc-html package (closes: #160550) + * debian/rules: avoid symlinks to directories (closes: #159252) + + -- Marco Kuhlmann Wed, 11 Sep 2002 22:00:44 +0100 + +mozart (1.2.4-2) unstable; urgency=low + + * debian/rules: do not assume that autotools-dev is installed + + -- Marco Kuhlmann Fri, 30 Aug 2002 21:15:49 +0100 + +mozart (1.2.4-1) unstable; urgency=low + + * New upstream version. + * Major redesign of debian/rules: + - support cross-compiling + - use ozplatform to determine build architecture + - unpack sources during build + - patch sources during build + - use upstream file lists to create packages + - extensive symlinking to comply with FHS (closes: #104591) + * Package now builds with mips and mipsel (closes: #131172). + * ozdoc.1: copy-and-paste error; changed date + * mozart.emacsen-startup: *.oz/*.ozg files now open up correctly, using + oz-mode/oz-gump-mode + * rewrote the *.emacsen-(install|remove) to clean up the process + + -- Marco Kuhlmann Fri, 30 Aug 2002 14:16:11 +0100 + +mozart (1.2.3.20011204-3) unstable; urgency=low + + * copyright referred to incorrect directory + * Fixed a typo in README.Debian. + * changed configure in src/platform/emulator, src/platform/tools/ozflex + and src/contrib/gtk, as old regular expression to extract version + information for bison does not match any longer + + -- Marco Kuhlmann Sat, 26 Jan 2002 20:26:03 +0000 + +mozart (1.2.3.20011204-2) unstable; urgency=low + + * Last release re-introduced bug#102503 (closes: bug#122785). + * Extended the description for mozart-doc-html to explain the Recommends- + relationship between mozart-doc-html and mozart (closes: bug#122519). + * Delete lintian-relevant src/contrib/gtk/config.cache from source. + + -- Marco Kuhlmann Fri, 07 Dec 2001 18:44:16 +0000 + +mozart (1.2.3.20011204-1) unstable; urgency=low + + * New upstream version. + * debian/control: Added version numbers to the build-dependencies, as + specified in source (aclocal.m4). + * debian/control: Changed package description; the text used is copied from + Mozart project homepage. + * debian/rules: Added a rule to install the standard library. + * debian/README.Debian: Added some explanations on the orig.tar.gz and the + standard library and applied some other minor changes. + + -- Marco Kuhlmann Tue, 04 Dec 2001 20:50:16 +0000 + +mozart (1.2.1.20010816-3) unstable; urgency=low + + * Added manpage for ozdoc (closes: bug#104349) + * Added emacs21 to emacs alternatives in dependencies. + * Fixed some typos in the control file, as pointed out by Matt Zimmerman. + + -- Marco Kuhlmann Thu, 22 Nov 2001 12:23:31 +0000 + +mozart (1.2.1.20010816-2) unstable; urgency=low + + * Fixed ugly typo in control file, which caused no shlibs dependencies to be + written to the packages. + * Fixed wrong section for mozart-doc-html (should be doc, not devel). + + -- Marco Kuhlmann Mon, 10 Sep 2001 12:53:42 +0200 + +mozart (1.2.1.20010816-1) unstable; urgency=low + + * New upstream version. + * Excluded more architectures, as requested from upstream. + * Merged HTML documentation tarball with orig.tar.gz; this makes a separate + orig.tar.gz for mozart-doc-html superfluous. + * Undone {tcl,tk} include patch, as it was merged with upstream. + * Re-integrated doc/tcltk into orig.tar.gz. + + -- Marco Kuhlmann Thu, 30 Aug 2001 12:30:42 +0200 + +mozart (1.2.0.20010514-4) unstable; urgency=low + + * New maintainer. + * Do not hardcode linux-i486 any longer (closes:bug#105900). + + -- Marco Kuhlmann Sun, 22 Jul 2001 22:00:00 +0200 + +mozart (1.2.0.20010514-3) unstable; urgency=low + + * Excluded sparc64 from Architecture, as requested from upstream. + * Set OZ-HOME default properly in mozart.el. + * Moved Fontifier.el to mozart-contrib. + * Upgraded from {tcl,tk}8.2 to {tcl,tk}8.3; undone the old and applied a new + patch to src/platform/wish/configure.in and Makefile.in to honour the + {tcl,tk} include files; re-generated src/platform/wish/configure. + * Symlinked /usr/include/mozart from /usr/lib/mozart/include. + * Removed /usr/lib/mozart/doc and /usr/share/doc/mozart/examples from main + package, as they are not present in the binary tarball and should be put + into the mozart-doc-html package. Moved /usr/lib/mozart/share/doc to + mozart-contrib. + * Used --enable-copy-tcl-libs=no to avoid superfluous library files. + * Removed LICENSE and README from /usr/lib/mozart. + * Added ozdoc to mozart-contrib, like in the binary tarball. + * Cleaned up debian/rules. + + -- Marco Kuhlmann Mon, 9 Jul 2001 23:31:00 +0200 + +mozart (1.2.0.20010514-2) unstable; urgency=low + + * modify src/share/elisp/Makefile.in such that .el files are not compiled, + according to elisp policy. (closes: bug#102503). + Same for src/contrib/doc/code/Makefle.in. + + -- Ralf Treinen Mon, 9 Jul 2001 20:45:40 +0200 + +mozart (1.2.0.20010514-1) unstable; urgency=low + + * New upstream version + * Install the new man pages provided by upstream. Rewrite the debian + manpage from 1.1.0 into more specific manpages for oz and + convertTextPickle. + * Upgraded from {tk,tcl}8.0 to {tk,tcl}8.2 (requires the --with-tk and + with-tcl options to ./configure). This includes a patch to configure.in + and Makefile.in in src/platform/wish in order to honor the include + directory specified by tkConfig.sh in TK_SRC_DIR. + * Build-depends: removed autoconf, added flex + * moved misc/mozart.xpm into debian + * Standards-Version: 3.5.4.0 + * Changed Architecture to any, according to upstream it should + now work on all architectures. + * Updated the copyright file for 1.2.0 + * removed from the upstream source tree the directory doc/tcltk + since not used for this package. + * adapted rules to the new location of contrib in /usr/lib/mozart + * added version number in inter-dependencies of mozart binary packages + + -- Ralf Treinen Thu, 14 Jun 2001 21:06:53 +0200 + +mozart (1.1.0-6) unstable; urgency=low + + * moving from libgmp2 to libgmp3, as requested by libgmp maintainer + Dale Scheetz. For this is it was necessary to apply a patch by + Kostja Popov from upstream to aclocal.m4 + + -- Ralf Treinen Thu, 3 May 2001 20:35:52 +0200 + +mozart (1.1.0-5) unstable; urgency=low + + * removed mozart-doc-html from this package. It is too messy to + build (takes very long, requires java). mozart-doc-html now + has its own source package. + * added autoconf to Build-Depends + * Generate from this source package a second binary package for contribs + (mozart-contrib). closes: Bug#71507. + * remove dependency from emacs19 which is no longer in woody + (closes: Bug#82678), and also dependencies from xemacs19 and xemacs20. + * Added url of the mozart-oz home page to the Description field of + the control file. + * moved to DH_COMPAT=3, and standards-version 3.5.0. Use directories + debian/mozart and debian/mozart-contrib, instead of debian/tmp. + * removed in rules invocation of dh_testversion, as recommended by the + debhelper changelog. + * increased the build-dependency on debhelper to version debehelper (>= + 2.1.0). + * Added build-dependency: bison + * emacs startup: switch automagically to oz mode on *.oz files + * added Suggests: mime-support (>= 3.10-1) for the + application/x-oz-application mime type. + * debian/copyright: added a note about the particular copyrights of + ozbison and ozflex. + + -- Ralf Treinen Mon, 5 Mar 2001 20:18:58 +0100 + +mozart (1.1.0-4) unstable; urgency=low + + * add emacs to Build-Dependencies + * allow alternative xemacs21 in Dependencies (closes: bug#71051). + * debian/rules: add to make configure option for additional include dirs, + seems to be necessary for building with libgmp2dev 2.0.2-8. + + -- Ralf Treinen Thu, 7 Sep 2000 21:05:19 +0200 + +mozart (1.1.0-3) unstable; urgency=low + + * recreate symlink in /usr/lib/mozart/cache since + Christian Schulte from upstream insists that it is essential. + * replace .so links in manpages by symlinks + * gzip manpages + * fix broken symlink for /usr/lib/mozart/doc and replace absolute + symlinks by relative symlinks + * fix in rules invocation of dh_compress to have changelogs compressed + (but not *.oza files) + + -- Ralf Treinen Thu, 31 Aug 2000 16:15:03 +0200 + +mozart (1.1.0-2) unstable; urgency=low + + * made a multi-binary source package for mozart and mozart-doc-html + * have html documentation compiled from source + * move examples and doc to /usr/share/doc/mozart + * fix permission on tcl and tk scripts + * fix multiple installation of emacs files + * dh_clean without file renaming, now that dh_clean understands --exclude + * register mime type for application/x-oz-application + * link only documented binaries to /usr/bin + * remove symlink in /usr/lib/mozart/cache + * replace LICENSE by symlink to copyright in doc + * upstream source: fixed bug in bash scripts in documentation makefiles + (thanks to Denys Duchier) + + -- Ralf Treinen Fri, 7 Jul 2000 19:24:35 +0200 + +mozart (1.1.0-1) unstable; urgency=low + + * Initial Release. + + -- Ralf Treinen Thu, 29 Jun 2000 20:00:37 +0200 + + --- mozart-1.4.0.orig/debian/mozart.emacsen-remove +++ mozart-1.4.0/debian/mozart.emacsen-remove @@ -0,0 +1,18 @@ +#!/bin/sh +# /usr/lib/emacsen-common/packages/remove/mozart + +set -e + +FLAVOR=$1 +echo remove/mozart: handling removal of emacsen flavor ${FLAVOR} + +elc_dir=/usr/share/${FLAVOR}/site-lisp/mozart +elc_files="mozart.elc oz-extra.elc oz-server.elc oz.elc Fontifier.elc" + +if [ ${FLAVOR} != emacs ]; then + echo remove/mozart: purging byte-compiled files for ${FLAVOR} + for f in ${elc_files}; do rm -f ${elc_dir}/$f; done + (test -d ${elc_dir} -a `ls ${elc_dir} | wc -w` -eq 0) && rmdir ${elc_dir} +fi + +exit 0 --- mozart-1.4.0.orig/misc/MacOsX/bundlelibs.sh +++ mozart-1.4.0/misc/MacOsX/bundlelibs.sh @@ -1,4 +1,29 @@ #!/bin/sh +# +# Authors: +# Raphael Collet +# +# Contributors: +# Gustavo Gutierrez +# +# Copyright: +# Raphael Collet, 2008 +# +# Last change: +# $Date$ by $Author$ +# $Revision$ +# +# This file is part of Mozart, an implementation +# of Oz 3: +# http://www.mozart-oz.org +# +# See the file "LICENSE" or +# http://www.mozart-oz.org/LICENSE.html +# for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL +# WARRANTIES. +# + # This script copies the libraries used by emulator.exe into its # application bundle, and modifies the references to these libraries @@ -19,6 +44,7 @@ grep -v /usr/lib/libgcc | grep -v /usr/lib/libstdc\+\+ | grep -v /usr/lib/libz | + grep -v /System/Library/Frameworks/Tk.framework/Versions/8.4/Tk | grep -v /usr/lib/libSystem` # copy libraries in the bundle, and patch the emulator --- mozart-1.4.0.orig/misc/MacOsX/Makefile +++ mozart-1.4.0/misc/MacOsX/Makefile @@ -1,24 +1,33 @@ -# Script to package the mozart system into an application bundle for -# Mac Os X. # -# Author: Gustavo Gutierrez -# Date: May 9 2007 - -# Credits: -# Build file for creating DMG files. +# Authors: +# Gustavo Gutierrez # -# The DMG packager looks for a template.dmg.bz2 for using as its -# DMG template. If it doesn't find one, it generates a clean one. +# Contributors: +# Raphael Collet # -# If you create a DMG template, you should make one containing all -# the files listed in $(SOURCE_FILES) below, and arrange everything to suit -# your style. The contents of the files themselves does not matter, so -# they can be empty (they will be overwritten later). +# Copyright: +# Gustavo Gutierrez, 2008 # -# Remko Troncon -# http://el-tramo.be/about +# Last change: +# $Date$ by $Author$ +# $Revision$ +# +# This file is part of Mozart, an implementation +# of Oz 3: +# http://www.mozart-oz.org +# +# See the file "LICENSE" or +# http://www.mozart-oz.org/LICENSE.html +# for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL +# WARRANTIES. # + +# Makefile to package the a Mozart distribution for Mac OS X as a bundle +# inside a disk image. + + ### # Variables for external tools and directories. ### @@ -29,11 +38,10 @@ ## Cocoa dialog CD=/Users/ggutierrez/Desktop/CocoaDialog.app - ## # Mozart Installation ## -MOZ_INST=/Users/ggutierrez/Work/moz140 +MOZ_INST=/Users/ggutierrez/Work/tmp/installnew ## Mozart documentation MOZ_DOC=/Users/ggutierrez/Desktop/Documentation @@ -44,20 +52,7 @@ ## Directories of mozart installation to be bundled. MOZ_DIRS= platform bin cache share include - -##Mozart documentation folder (html) -#MOZ_DOC_HTML=/Users/ggutierrez/doc - -##Mozart standard library documentation dir (html) -#MOZ_STDLIB_HTML=$(MOZ_HOME)/doc - - -#INTOOL=/usr/bin/install_name_tool -#OTOOL=/usr/bin/otool -L NAME=Mozart -#VERSION=1.4.0 - - APP=$(NAME).app ## Directories inside the bundle @@ -66,18 +61,18 @@ ## The Resources directory is where mozart installation files will be. BND_RESOURCES=$(BND_CONTENTS)/Resources -## The Frameworks directory is where shared libraries used by the emulator will be. -## For instance, libgmp.dylib -BND_FRAMEWORKS=$(BND_CONTENTS)/Frameworks +## The Frameworks directory is where shared libraries used by the emulator +## will be placed. For instance, libgmp.dylib +BND_FRAMEWORKS=$(BND_CONTENTS)/Frameworks -#EXT_LIBS=ext_libs ## The path to the emulator inside the bundle -EMULATOR=$(APP)/Contents/Resources/platform/darwin-i386/emulator.exe +PLATFORM=`$(MOZ_INST)/bin/oztool platform` +EMULATOR=$(APP)/Contents/Resources/platform/$(PLATFORM)/emulator.exe ## Platypus call -PLATCALL = $(PLAT) -i 'appIcon.icns' script.sh ./$(APP) +PLATCALL = $(PLAT) -D -X "oz|OZ" -V "1.4.0" -u 'Gustavo Gutierrez ' -i 'appIcon.icns' script.sh ./$(APP) ## #Create a bundle from skel @@ -91,7 +86,7 @@ done cp -R $(CD) $(BND_RESOURCES) mkdir -p $(BND_FRAMEWORKS)/ -# cp $(EXT_LIBS)/* $(BND_FRAMEWORKS)/ + fixpaths: ./bundlelibs.sh $(EMULATOR) $(APP) --- mozart-1.4.0.orig/share/configure.in +++ mozart-1.4.0/share/configure.in @@ -68,12 +68,29 @@ EXE_EXT='' ;; esac + +case $platform in +win32*) + LD_VAR=PATH + ;; +darwin*) + LD_VAR=DYLD_LIBRARY_PATH + ;; +aix*) + LD_VAR=LIBPATH + ;; +*) + LD_VAR=LD_LIBRARY_PATH + ;; +esac + AC_SUBST(OZEXECFILE) AC_SUBST(EMULATOR_EXE) AC_SUBST(BOOTOZTOOL) AC_SUBST(WINOZTOOLCXXFLAGS) AC_SUBST(WINOZTOOLLDFLAGS) AC_SUBST(EXE_EXT) +AC_SUBST(LD_VAR) dnl ***************************************************************** dnl Checks for programs. --- mozart-1.4.0.orig/share/configure +++ mozart-1.4.0/share/configure @@ -607,7 +607,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1261,9 +1261,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1266: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1267: checking for OZLOADSEP" >&5 +echo "configure:1280: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1283,7 +1296,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1287: checking for OZLOADWIN" >&5 +echo "configure:1300: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1321,7 +1334,7 @@ echo $ac_n "checking for --enable-denys-events""... $ac_c" 1>&6 -echo "configure:1325: checking for --enable-denys-events" >&5 +echo "configure:1338: checking for --enable-denys-events" >&5 # Check whether --enable-denys-events or --disable-denys-events was given. if test "${enable_denys_events+set}" = set; then enableval="$enable_denys_events" @@ -1342,7 +1355,7 @@ echo $ac_n "checking for --enable-site-property""... $ac_c" 1>&6 -echo "configure:1346: checking for --enable-site-property" >&5 +echo "configure:1359: checking for --enable-site-property" >&5 # Check whether --enable-site-property or --disable-site-property was given. if test "${enable_site_property+set}" = set; then enableval="$enable_site_property" @@ -1363,7 +1376,7 @@ echo $ac_n "checking for --enable-compile-elisp""... $ac_c" 1>&6 -echo "configure:1367: checking for --enable-compile-elisp" >&5 +echo "configure:1380: checking for --enable-compile-elisp" >&5 # Check whether --enable-compile-elisp or --disable-compile-elisp was given. if test "${enable_compile_elisp+set}" = set; then enableval="$enable_compile_elisp" @@ -1408,6 +1421,23 @@ ;; esac +case $platform in +win32*) + LD_VAR=PATH + ;; +darwin*) + LD_VAR=DYLD_LIBRARY_PATH + ;; +aix*) + LD_VAR=LIBPATH + ;; +*) + LD_VAR=LD_LIBRARY_PATH + ;; +esac + + + @@ -1416,7 +1446,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1420: checking whether ln -s works" >&5 +echo "configure:1450: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1442,7 +1472,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1446: checking for $ac_word" >&5 +echo "configure:1476: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1477,7 +1507,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1481: checking for $ac_word" >&5 +echo "configure:1511: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1512,7 +1542,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1516: checking for $ac_word" >&5 +echo "configure:1546: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_THEGZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1547,7 +1577,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1551: checking for $ac_word" >&5 +echo "configure:1581: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_THEEMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1582,7 +1612,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1586: checking for --with-global-oz" >&5 +echo "configure:1616: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1616,7 +1646,7 @@ # Extract the first word of "ozplatform", so it can be a program name with args. set dummy ozplatform; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_word" >&5 +echo "configure:1650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZPLATFORM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1662,7 +1692,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1666: checking for --with-global-oz" >&5 +echo "configure:1696: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1696,7 +1726,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1700: checking for $ac_word" >&5 +echo "configure:1730: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1742,7 +1772,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1746: checking for --with-global-oz" >&5 +echo "configure:1776: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1776,7 +1806,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1780: checking for $ac_word" >&5 +echo "configure:1810: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1822,7 +1852,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1826: checking for --with-global-oz" >&5 +echo "configure:1856: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1856,7 +1886,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1860: checking for $ac_word" >&5 +echo "configure:1890: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZENGINE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1902,7 +1932,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1906: checking for --with-global-oz" >&5 +echo "configure:1936: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1936,7 +1966,7 @@ # Extract the first word of "oztool", so it can be a program name with args. set dummy oztool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1940: checking for $ac_word" >&5 +echo "configure:1970: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1982,7 +2012,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1986: checking for --with-global-oz" >&5 +echo "configure:2016: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -2016,7 +2046,7 @@ # Extract the first word of "ozplatform", so it can be a program name with args. set dummy ozplatform; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2020: checking for $ac_word" >&5 +echo "configure:2050: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZPLATFORM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2069,7 +2099,7 @@ : ${oz_picklecompression=9} echo $ac_n "checking for --enable-picklecompression""... $ac_c" 1>&6 -echo "configure:2073: checking for --enable-picklecompression" >&5 +echo "configure:2103: checking for --enable-picklecompression" >&5 # Check whether --enable-picklecompression or --disable-picklecompression was given. if test "${enable_picklecompression+set}" = set; then enableval="$enable_picklecompression" @@ -2105,7 +2135,7 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2109: checking how to run the C preprocessor" >&5 +echo "configure:2139: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2120,13 +2150,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2137,13 +2167,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2154,13 +2184,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2186,7 +2216,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:2190: checking for --with-gmp" >&5 +echo "configure:2220: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -2215,7 +2245,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2219: checking for gmp.h" >&5 +echo "configure:2249: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2226,12 +2256,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2248,12 +2278,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2296,7 +2326,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2300: checking for gmp.h" >&5 +echo "configure:2330: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,12 +2337,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2329,12 +2359,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2382,7 +2412,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2386: checking for library gmp" >&5 +echo "configure:2416: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2406,12 +2436,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2410: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2440: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2436,7 +2466,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2460,7 +2490,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2486,12 +2516,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2490: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2520: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2516,7 +2546,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2570,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2572,7 +2602,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2610,7 +2640,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2636,12 +2666,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2640: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2670: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2666,7 +2696,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2690,7 +2720,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2722,7 +2752,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2765,7 +2795,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2769: checking for library gmp" >&5 +echo "configure:2799: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2789,12 +2819,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2793: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2823: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2819,7 +2849,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2843,7 +2873,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2869,12 +2899,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2873: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2903: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2899,7 +2929,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2953,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2955,7 +2985,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2993,7 +3023,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3019,12 +3049,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:3023: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:3053: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3049,7 +3079,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3073,7 +3103,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3105,7 +3135,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3148,7 +3178,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:3152: checking for library gmp2" >&5 +echo "configure:3182: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -3172,12 +3202,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:3176: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:3206: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3202,7 +3232,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3226,7 +3256,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3252,12 +3282,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3256: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3286: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3282,7 +3312,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3306,7 +3336,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3338,7 +3368,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3376,7 +3406,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3402,12 +3432,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3406: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3436: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3432,7 +3462,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3456,7 +3486,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3488,7 +3518,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3590,7 +3620,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3594: checking gmp version is at least 2" >&5 +echo "configure:3624: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3883,6 +3913,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g @@ -3896,6 +3927,7 @@ s%@WINOZTOOLCXXFLAGS@%$WINOZTOOLCXXFLAGS%g s%@WINOZTOOLLDFLAGS@%$WINOZTOOLLDFLAGS%g s%@EXE_EXT@%$EXE_EXT%g +s%@LD_VAR@%$LD_VAR%g s%@LN_S@%$LN_S%g s%@M4@%$M4%g s%@PERL@%$PERL%g --- mozart-1.4.0.orig/share/Makefile.boot.in +++ mozart-1.4.0/share/Makefile.boot.in @@ -38,6 +38,7 @@ EXE_EXT=@EXE_EXT@ +BOOTDSS=$(BUILDTOP)/platform/dss BOOTEMU=$(BUILDTOP)/platform/emulator/@EMULATOR_EXE@ BOOTENG=$(BUILDTOP)/share/ozengine.sh BOOTCOM=$(BOOTENG) $(BUILDTOP)/share/lib/ozc$(EXE_EXT) @@ -111,8 +112,15 @@ endif endif +ifdef @LD_VAR@ +LD_VAR=$(BOOTDSS):$(@LD_VAR@) +else +LD_VAR=$(BOOTDSS) +endif + boot-%: $(MAKE) $* \ + @LD_VAR@=$(LD_VAR) \ OZEMULATOR=$(BOOTEMU) \ OZENGINE=$(BOOTENG) \ OZC="$(BOOTCOM)" \ --- mozart-1.4.0.orig/share/demo/Makefile.in +++ mozart-1.4.0/share/demo/Makefile.in @@ -83,6 +83,10 @@ install:: $(OZDEMO) $(DEMOAPPLETS) \ $(SYSTEMDOC) $(SYSTEMOZF) $(SYSTEMOZF)/MT10.ozf $(SYSTEMDOC)/MT10.oz +$(DEMOAPPLETS): $(OZDEMO) +$(SYSTEMOZF)/MT10.ozf: $(SYSTEMOZF) +$(SYSTEMDOC)/MT10.oz: $(SYSTEMDOC) + $(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF): $(INSTALL_DIR) $@ @@ -279,7 +283,10 @@ install:: $(OZIMGDIRS) $(OZIMAGES) -$(OZIMGDIRS): +$(OZIMGDIRS): $(OZIMG) +$(OZIMAGES): $(OZIMGDIRS) + +$(OZIMG) $(OZIMGDIRS): $(INSTALL_DIR) $@ $(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm $(INSTALL_FILE) $< $@ --- mozart-1.4.0.orig/share/test/dp-bench/run.oz +++ mozart-1.4.0/share/test/dp-bench/run.oz @@ -84,7 +84,7 @@ define Until [M] = {Module.apply [RemoteFUNCTOR]} - DO = M.do + DO = M.'do' {StartActivities Until} !Ready = unit {Wait GlobalStart} --- mozart-1.4.0.orig/share/tools/Makefile.in +++ mozart-1.4.0/share/tools/Makefile.in @@ -270,6 +270,10 @@ $(OZBIN) $(BINFILES) \ $(OZEX) $(OZEXGUMP) $(EXAMPLEFILES) +$(OZEXGUMP): $(OZEX) +$(BINFILES): $(OZBIN) +$(EXAMPLEFILES): $(OZEXGUMP) + $(OZBIN) $(OZEX) $(OZEXGUMP): $(INSTALL_DIR) $@ @@ -285,6 +289,13 @@ $(OZCARIMAGESDIR) $(OZCARIMAGES) \ $(INSPECTORIMAGESDIR) $(INSPECTORIMAGES) +$(IMAGESDIR): $(CACHEDIR) +$(OZCARIMAGESDIR) $(INSPECTORIMAGESDIR): $(IMAGESDIR) +$(TOOLSFUNCTORS): $(CACHEDIR) +$(IMAGES): $(IMAGESDIR) +$(OZCARIMAGES): $(OZCARIMAGESDIR) +$(INSPECTORIMAGES): $(INSPECTORIMAGESDIR) + $(CACHEDIR) $(IMAGESDIR) $(OZCARIMAGESDIR) $(INSPECTORIMAGESDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/share/tools/ozcar/ozd.oz +++ mozart-1.4.0/share/tools/ozcar/ozd.oz @@ -126,10 +126,11 @@ end elseof X then X end + %% Changed for Debian/GNU: Augmenting the Emacs + %% load path is not necessary _ = {New Open.pipe init(cmd: EMACS - args: ['-L' {Property.get 'oz.home'}#'/share/elisp' - '-l' 'oz' '-f' 'oz-attach' Port])} + args: ['-l' 'oz' '-f' 'oz-attach' Port])} end I = {New Emacs.interface init(E unit --- mozart-1.4.0.orig/share/tools/gump/Main.oz +++ mozart-1.4.0/share/tools/gump/Main.oz @@ -21,7 +21,9 @@ local local - OZHOME = {Property.get 'oz.home'} + %% Changed for Debian/GNU: Platform-specific files like + %% flex.exe are in /usr/lib/mozart + PLATFORMDIR = '/usr/lib/mozart/platform/'#{Property.get 'platform.name'} in %% include dirs for testing in bootstrap mode: %% mozart/platform/emulator mozart/platform/tools/gump @@ -44,7 +46,7 @@ case {Property.condGet 'oz.exe.flex' unit} of unit then case {OS.getEnv 'OZFLEX'} of false then - OZHOME#'/platform/'#{Property.get 'platform.name'}#'/flex.exe' + PLATFORMDIR#'/flex.exe' elseof X then X end elseof X then X end end --- mozart-1.4.0.orig/share/elisp/oz.el +++ mozart-1.4.0/share/elisp/oz.el @@ -29,6 +29,9 @@ ;; Major mode for editing Oz programs ;; +;; debian: a bit ugly putting this here +(setq inhibit-splash-screen t) + ;;{{{ Global Effects (or (member ".ozp" completion-ignored-extensions) --- mozart-1.4.0.orig/share/elisp/Makefile.in +++ mozart-1.4.0/share/elisp/Makefile.in @@ -72,6 +72,8 @@ install: all $(ELISPDIR) $(LIBFILES) +$(LIBFILES): $(ELISPDIR) + $(ELISPDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/share/elisp/mozart.el.in +++ mozart-1.4.0/share/elisp/mozart.el.in @@ -51,8 +51,10 @@ :group 'oz :prefix "oz-"))) +;; Changed for Debian/GNU + (eval-and-compile - (eval '(defcustom oz-prefix "@prefix@" + (eval '(defcustom oz-prefix "/usr/share/mozart" "*Directory where Mozart is installed. Used as fallback if the environment variable OZHOME is not set." :type 'string @@ -99,17 +101,27 @@ (defvar *OZ_PI* (getenv "OZ_PI")) -(defvar *OZHOME* - (or (getenv "OZ_HOME") - (getenv "OZHOME") - oz-prefix)) +;; Changed for Debian/GNU; If *OZHOME* is nil then use standard +;; Debian paths, e.g. look for ozengine in $PATH. +;; THIS BREAKS PROFILES + +;;(defvar *OZHOME* +;; (or (getenv "OZ_HOME") +;; (getenv "OZHOME") +;; oz-prefix)) + +(defvar *OZHOME* nil) (defvar oz-platform (if (memq system-type '(ms-dos windows-nt)) "win32-i486" - (and *OZHOME* - (substring - (shell-command-to-string - (concat *OZHOME* "/bin/ozplatform")) 0 -1)))) + (cond (*OZHOME* + (and *OZHOME* + (substring + (shell-command-to-string + (concat *OZHOME* "/bin/ozplatform")) 0 -1))) + (t (substring + (shell-command-to-string + (concat *OZHOME* "/usr/lib/mozart/bin/ozplatform")) 0 -1))))) (defun oz-platform () (cond (oz-platform) --- mozart-1.4.0.orig/share/examples/Makefile.in +++ mozart-1.4.0/share/examples/Makefile.in @@ -62,16 +62,20 @@ EXFUNCTORS = \ $(FUNCTORS:%=$(OZEX)/fd/graphics/%) -EXDIRS = \ - sampler sampler/constraints \ - fd grammar grammar/shieber \ - fd/graphics - +EXDIRS = fd grammar sampler +EXFDDIRS = fd/graphics +EXGRDIRS = grammar/shieber +EXSAMPLERDIRS = sampler/constraints OZEXDIRS = $(EXDIRS:%=$(OZEX)/%) +OZEXFDDIRS = $(EXFDDIRS:%=$(OZEX)/%) +OZEXGRDIRS = $(EXGRDIRS:%=$(OZEX)/%) +OZEXSAMPLERDIRS = $(EXSAMPLERDIRS:%=$(OZEX)/%) -$(OZEX) $(OZEXDIRS): +$(OZEXFDDIRS) $(OZEXGRDIRS) $(OZEXSAMPLERDIRS): $(OZEXDIRS) +$(OZEXDIRS): $(OZEX) +$(OZEX) $(OZEXDIRS) $(OZEXFDDIRS) $(OZEXGRDIRS) $(OZEXSAMPLERDIRS): $(INSTALL_DIR) $@ FD = \ @@ -116,6 +120,10 @@ install: all $(OZEX) $(OZEXDIRS) $(SAMPLER) $(EXAMPLES) $(EXFUNCTORS) +$(SAMPLER): $(OZEXSAMPLERDIRS) +$(EXAMPLES): $(OZEXFDDIRS) $(OZEXGRDIRS) +$(EXFUNCTORS): $(OZEXFDDIRS) + clean: -rm -f *~ ./*/*~ ./*/*/*~ --- mozart-1.4.0.orig/share/examples/fd/knights.oz +++ mozart-1.4.0/share/examples/fd/knights.oz @@ -26,8 +26,8 @@ %% declare -[Graphics]={Module.link [({Property.get 'oz.home'}# - '/examples/fd/graphics/Knights.ozf')]} +%% Changed for Debian/GNU: examples are in /usr/share/mozart/examples +[Graphics]={Module.link ['/usr/share/mozart/examples/fd/graphics/Knights.ozf')]} {Graphics.add} declare --- mozart-1.4.0.orig/share/examples/fd/queens.oz +++ mozart-1.4.0/share/examples/fd/queens.oz @@ -25,8 +25,8 @@ %% Load graphical plugin for Explorer %% declare -[Graphics]={Module.link [({Property.get 'oz.home'}# - '/examples/fd/graphics/Queens.ozf')]} +%% Changed for Debian/GNU: examples are in /usr/share/mozart/examples +[Graphics]={Module.link ['/usr/share/mozart/examples/fd/graphics/Queens.ozf')]} {Graphics.add} --- mozart-1.4.0.orig/share/bin/ozplatform +++ mozart-1.4.0/share/bin/ozplatform @@ -15,11 +15,15 @@ #----------------------------------------------------------------- mips\ Linux\ *) OZARCH=linux-mips ;; - s390\ Linux\ *) OZARCH=linux-s390 + s390*\ Linux\ *) OZARCH=linux-s390 ;; #----------------------------------------------------------------- armv4l\ Linux\ *) OZARCH=linux-arm ;; + armv5tel\ Linux\ *) OZARCH=linux-arm + ;; + arm*\ Linux\ *) OZARCH=linux-arm + ;; #parisc32\ Linux\ *) OZARCH=linux-hppa32 #;; # so far: userspace is 32 bits on linux-parisc / hppa @@ -40,7 +44,12 @@ ;; m68k\ Linux\ *) OZARCH=linux-m68k ;; - sparc\ Linux\ *) OZARCH=linux-sparc + sparc*\ Linux\ *) OZARCH=linux-sparc + ;; + # so far: userspace is 32 bit on sparc64 + sparc64\ Linux\ *) OZARCH=linux-sparc + ;; + sh*\ Linux\ *) OZARCH=linux-sparc ;; 9000/7*HP-UX*) OZARCH=hpux-700 ;; @@ -52,6 +61,8 @@ ;; *alpha*OSF1*) OZARCH=osf1-alpha ;; + i[4567]86\ GNU/kFreeBSD\ *) OZARCH=linux-i486 + ;; *i386*FreeBSD*) if [ -f /etc/objformat ]; then . /etc/objformat elif [ -f /usr/bin/objformat ]; then OBJFORMAT=`/usr/bin/objformat` --- mozart-1.4.0.orig/share/bin/Makefile.in +++ mozart-1.4.0/share/bin/Makefile.in @@ -54,6 +54,9 @@ install: $(BINDIR) $(LIB_SCRIPTS) $(LIB_LINKS) $(WRAPPERS) +$(LIB_SCRIPTS): $(BINDIR) +$(LIB_LINKS): $(BINDIR) +$(WRAPPERS): $(BINDIR) $(LIB_SCRIPTS): $(BINDIR)/% : % $(INSTALL_BIN) $< $(BINDIR) --- mozart-1.4.0.orig/share/bin/oz.in +++ mozart-1.4.0/share/bin/oz.in @@ -1,35 +1,20 @@ #!/bin/sh -# uncomment and adapt the following line if you want -# to draw links from say /usr/local/bin to OZHOME/bin -# see chapter "installation" in the users manual for more information - -# OZHOME=/usr/local/mozart - - - - -###################################################################### -# you should not edit below this line +# Changed for Debian/GNU: fix to Debian paths # where Oz resides: howcalled="$0" cmd=`basename "$howcalled"` -if test -z "${OZHOME}" -then - dir=`dirname "$howcalled"` - OZHOME=`(cd "$dir"; cd ..; /bin/pwd)` -fi -export OZHOME - -: ${OZPLATFORM=`"$OZHOME/bin/ozplatform"`} -: ${OZEMULATOR="$OZHOME/platform/$OZPLATFORM/emulator.exe"} +OZHOME=/usr/share/mozart +: ${OZPLATFORM=`"/usr/lib/mozart/bin/ozplatform"`} +: ${OZEMULATOR="/usr/lib/mozart/platform/$OZPLATFORM/emulator.exe"} : ${OZVERSION="@OZVERSION@"} : ${OZ_DOTOZ="$HOME/.oz/$OZVERSION"} -: ${OZ_LD_LIBRARY_PATH="$OZ_DOTOZ/platform/$OZPLATFORM/lib:$OZHOME/platform/$OZPLATFORM/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"} -: ${OZ_DYLD_LIBRARY_PATH="$OZ_DOTOZ/platform/$OZPLATFORM/lib:$OZHOME/platform/$OZPLATFORM/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"} +: ${OZ_LD_LIBRARY_PATH="$OZ_DOTOZ/platform/$OZPLATFORM/lib:/usr/lib/mozart/platform/$OZPLATFORM/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"} +: ${OZ_DYLD_LIBRARY_PATH="$OZ_DOTOZ/platform/$OZPLATFORM/lib:/usr/lib/mozart/platform/$OZPLATFORM/lib${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH}"} +export OZHOME LD_LIBRARY_PATH="$OZ_LD_LIBRARY_PATH" export LD_LIBRARY_PATH @@ -44,10 +29,10 @@ then OZPATH=. fi - OZPATH="${OZPATH}:${OZHOME}/share" + OZPATH="${OZPATH}:/usr/share/mozart/share" export OZPATH # increment path - PATH="${OZHOME}/bin:${PATH}" + PATH="/usr/lib/mozart/bin:${PATH}" export PATH OZ_PI=1 export OZ_PI @@ -78,14 +63,8 @@ exit 1 fi fi - if ( "$OZEMACS" --version | grep XEmacs > /dev/null 2>&1 ) - then - exec "$OZEMACS" \ - --eval '(setq load-path (cons "'$OZHOME'/share/elisp" load-path))' \ - -l oz.elc -f run-oz "$@" - else - exec "$OZEMACS" -L "$OZHOME/share/elisp" -l oz.elc -f run-oz "$@" - fi + ## Changed for Debian/GNU: elisp files will be found on default path + exec "$OZEMACS" -l oz.elc -f run-oz "$@" ;; ozengine) # that is the real thing @@ -106,15 +85,18 @@ ;; oztool) - exec sh "$OZHOME/platform/$OZPLATFORM/oztool.sh" "$@" + ## Changed for Debian/GNU + exec sh "/usr/lib/mozart/platform/$OZPLATFORM/oztool.sh" "$@" ;; text2pickle) - exec "$OZHOME/platform/$OZPLATFORM/text2pickle.exe" "$@" + ## Changed for Debian/GNU + exec "/usr/lib/mozart/platform/$OZPLATFORM/text2pickle.exe" "$@" ;; pickle2text|oldpickle2text) - exec "$OZEMULATOR" --pickle2text "$@" | - "$OZHOME/platform/$OZPLATFORM/text2pickle.exe" --textmode + ## Changed for Debian/GNU + exec "$OZEMULATOR" --pickle2text "$@" | + "/usr/lib/mozart/platform/$OZPLATFORM/text2pickle.exe" --textmode ;; *) --- mozart-1.4.0.orig/share/lib/Makefile.in +++ mozart-1.4.0/share/lib/Makefile.in @@ -291,7 +291,8 @@ Builtins.ozf: compiler/Builtins.oz GroundZip.ozf compiler-Builtins.oz Unnester.ozf: compiler/Unnester.oz compiler/TupleSyntax.oz \ - compiler/BindingAnalysis.oz compiler/UnnestFD.oz FD.ozf + compiler/BindingAnalysis.oz compiler/UnnestFD.oz FD.ozf \ + Builtins.ozf Annotate.ozf: compiler/Annotate.oz @@ -374,6 +375,11 @@ $(OZLIB) $(NEWINIT) \ $(NEWIMAGESDIR) $(NEWIMAGES) +$(NEWIMAGESDIR): $(NEWCACHEDIR) +$(NEWFUNCTORS): $(NEWCACHEDIR) +$(NEWINIT): $(OZLIB) +$(NEWIMAGES): $(NEWIMAGESDIR) + $(NEWCACHEDIR) $(NEWIMAGESDIR): $(INSTALL_DIR) $@ @@ -427,10 +433,10 @@ .PHONY: bootstrap check # use the boot compiler to create the functors -bootstrap: - $(MAKE) boot-unzip boot-init boot-ozc boot-all +bootstrap: boot-unzip + $(MAKE) boot-all -boot-all: +boot-all: boot-init boot-ozc $(MAKE) all \ OZC=$(SRCDIR)/boot-ozc.sh \ OZENGINE=$(SRCDIR)/oze.sh \ --- mozart-1.4.0.orig/share/lib/init/Prop.oz +++ mozart-1.4.0/share/lib/init/Prop.oz @@ -53,10 +53,14 @@ elseof V then V end elseof V then V end} +%% Changed for Debian/GNU: The search path is extended by the +%% installation directory for system-independent files, +%% /usr/share/mozart/share. + OZ_SEARCH_PATH = case {Getenv 'OZ_SEARCH_PATH'} of false then case {Getenv 'OZ_PATH'} of false then case {Getenv 'OZPATH'} of false then - '.'#[PATH_SEPARATOR]#OZ_HOME#'/share' + '.'#[PATH_SEPARATOR]#'/usr/share/mozart/share' elseof V then V end elseof V then V end elseof V then V end @@ -67,11 +71,17 @@ elseof V then {SafePath V} end elseof V then {SafePath V} end +%% Changed for Debian/GNU: In the Debian installation, the caches +%% are searched in the following order: user's home cache, +%% system-dependent cache (/usr/lib/mozart), system-independent +%% cache (/usr/share/mozart). + OZ_SEARCH_LOAD = case {Getenv 'OZ_SEARCH_LOAD'} of false then case {Getenv 'OZ_LOAD'} of false then case {Getenv 'OZLOAD'} of false then 'cache='#OZ_DOTOZ#'/cache'#[PATH_SEPARATOR]# - 'cache='#OZ_HOME#'/cache' + 'cache=/usr/lib/mozart/cache'#[PATH_SEPARATOR]# + 'cache=/usr/share/mozart/cache' elseof V then V end elseof V then V end elseof V then V end --- mozart-1.4.0.orig/share/lib/wp/Tk.oz +++ mozart-1.4.0/share/lib/wp/Tk.oz @@ -449,14 +449,17 @@ Stream = local Platform = {Property.get 'platform.name'} - PLTFRM = ({Property.get 'oz.home'} # - '/platform/'#Platform#'/') + %% Changed for Debian/GNU: platform-specific files + %% are in /usr/lib/mozart + PLTFRM = '/usr/lib/mozart/platform/'#Platform#'/' TKEXE = case {Property.get 'platform.arch'} of 'darwin' then 'OzWish.app/Contents/MacOS/OzWish' else 'tk.exe' end in - {OS.putEnv 'TCL_LIBRARY' PLTFRM#'wish/tcl'} - {OS.putEnv 'TK_LIBRARY' PLTFRM#'wish/tk'} + %% Changed for Debian/GNU: use the pre-installed + %% versions of tcl and tk + {OS.putEnv 'TCL_LIBRARY' '/usr/lib/tcl8.4'} + {OS.putEnv 'TK_LIBRARY' '/usr/lib/tk8.4'} % RS: on MS Windows we use a socket: before we used % pipes, but on NT this made problems when certain background --- mozart-1.4.0.orig/share/lib/ozbatch/Compile.oz +++ mozart-1.4.0/share/lib/ozbatch/Compile.oz @@ -211,7 +211,9 @@ '#!/bin/sh\nexec '#Path#' "$0" "$@"\n' end fun {MakeExecFile File} - {Property.get 'oz.home'}#'/bin/'#File + %% Changed for Debian/GNU: binary headers for Windows are + %% in /usr/share/mozart + '/usr/share/mozart/bin/'#File end DefaultExecWindows = file({MakeExecFile 'ozwrapper.bin'}) --- mozart-1.4.0.orig/share/lib/linker/Main.oz +++ mozart-1.4.0/share/lib/linker/Main.oz @@ -71,7 +71,9 @@ '#!/bin/sh\nexec '#Path#' $0 "$@"\n' end fun {MakeExecFile File} - {Property.get 'oz.home'}#'/bin/'#File + %% Changed for Debian/GNU: binary headers for Windows are + %% in /usr/share/mozart + '/usr/share/mozart/bin/'#File end DefaultExecWindows = file({MakeExecFile 'ozwrapper.bin'}) DefaultExecUnix = string({MakeExecHeader 'ozengine'}) --- mozart-1.4.0.orig/contrib/configure +++ mozart-1.4.0/contrib/configure @@ -661,7 +661,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1315,9 +1315,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1320: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1321: checking for OZLOADSEP" >&5 +echo "configure:1334: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1337,7 +1350,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1341: checking for OZLOADWIN" >&5 +echo "configure:1354: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1379,7 +1392,7 @@ echo $ac_n "checking for --enable-contrib-gdbm""... $ac_c" 1>&6 -echo "configure:1383: checking for --enable-contrib-gdbm" >&5 +echo "configure:1396: checking for --enable-contrib-gdbm" >&5 # Check whether --enable-contrib-gdbm or --disable-contrib-gdbm was given. if test "${enable_contrib_gdbm+set}" = set; then enableval="$enable_contrib_gdbm" @@ -1396,7 +1409,7 @@ fi echo $ac_n "checking for --enable-contrib-regex""... $ac_c" 1>&6 -echo "configure:1400: checking for --enable-contrib-regex" >&5 +echo "configure:1413: checking for --enable-contrib-regex" >&5 # Check whether --enable-contrib-regex or --disable-contrib-regex was given. if test "${enable_contrib_regex+set}" = set; then enableval="$enable_contrib_regex" @@ -1413,7 +1426,7 @@ fi echo $ac_n "checking for --enable-contrib-doc""... $ac_c" 1>&6 -echo "configure:1417: checking for --enable-contrib-doc" >&5 +echo "configure:1430: checking for --enable-contrib-doc" >&5 # Check whether --enable-contrib-doc or --disable-contrib-doc was given. if test "${enable_contrib_doc+set}" = set; then enableval="$enable_contrib_doc" @@ -1430,7 +1443,7 @@ fi echo $ac_n "checking for --enable-contrib-os""... $ac_c" 1>&6 -echo "configure:1434: checking for --enable-contrib-os" >&5 +echo "configure:1447: checking for --enable-contrib-os" >&5 # Check whether --enable-contrib-os or --disable-contrib-os was given. if test "${enable_contrib_os+set}" = set; then enableval="$enable_contrib_os" @@ -1447,7 +1460,7 @@ fi echo $ac_n "checking for --enable-contrib-micq""... $ac_c" 1>&6 -echo "configure:1451: checking for --enable-contrib-micq" >&5 +echo "configure:1464: checking for --enable-contrib-micq" >&5 # Check whether --enable-contrib-micq or --disable-contrib-micq was given. if test "${enable_contrib_micq+set}" = set; then enableval="$enable_contrib_micq" @@ -1468,7 +1481,7 @@ echo $ac_n "checking for --enable-contrib-ri""... $ac_c" 1>&6 -echo "configure:1472: checking for --enable-contrib-ri" >&5 +echo "configure:1485: checking for --enable-contrib-ri" >&5 # Check whether --enable-contrib-ri or --disable-contrib-ri was given. if test "${enable_contrib_ri+set}" = set; then enableval="$enable_contrib_ri" @@ -1485,7 +1498,7 @@ fi echo $ac_n "checking for --enable-contrib-lp""... $ac_c" 1>&6 -echo "configure:1489: checking for --enable-contrib-lp" >&5 +echo "configure:1502: checking for --enable-contrib-lp" >&5 # Check whether --enable-contrib-lp or --disable-contrib-lp was given. if test "${enable_contrib_lp+set}" = set; then enableval="$enable_contrib_lp" @@ -1502,7 +1515,7 @@ fi echo $ac_n "checking for --enable-contrib-davinci""... $ac_c" 1>&6 -echo "configure:1506: checking for --enable-contrib-davinci" >&5 +echo "configure:1519: checking for --enable-contrib-davinci" >&5 # Check whether --enable-contrib-davinci or --disable-contrib-davinci was given. if test "${enable_contrib_davinci+set}" = set; then enableval="$enable_contrib_davinci" @@ -1519,7 +1532,7 @@ fi echo $ac_n "checking for --enable-contrib-reflect""... $ac_c" 1>&6 -echo "configure:1523: checking for --enable-contrib-reflect" >&5 +echo "configure:1536: checking for --enable-contrib-reflect" >&5 # Check whether --enable-contrib-reflect or --disable-contrib-reflect was given. if test "${enable_contrib_reflect+set}" = set; then enableval="$enable_contrib_reflect" @@ -1536,7 +1549,7 @@ fi echo $ac_n "checking for --enable-contrib-investigator""... $ac_c" 1>&6 -echo "configure:1540: checking for --enable-contrib-investigator" >&5 +echo "configure:1553: checking for --enable-contrib-investigator" >&5 # Check whether --enable-contrib-investigator or --disable-contrib-investigator was given. if test "${enable_contrib_investigator+set}" = set; then enableval="$enable_contrib_investigator" @@ -1553,7 +1566,7 @@ fi echo $ac_n "checking for --enable-contrib-fcp""... $ac_c" 1>&6 -echo "configure:1557: checking for --enable-contrib-fcp" >&5 +echo "configure:1570: checking for --enable-contrib-fcp" >&5 # Check whether --enable-contrib-fcp or --disable-contrib-fcp was given. if test "${enable_contrib_fcp+set}" = set; then enableval="$enable_contrib_fcp" @@ -1570,7 +1583,7 @@ fi echo $ac_n "checking for --enable-contrib-psql""... $ac_c" 1>&6 -echo "configure:1574: checking for --enable-contrib-psql" >&5 +echo "configure:1587: checking for --enable-contrib-psql" >&5 # Check whether --enable-contrib-psql or --disable-contrib-psql was given. if test "${enable_contrib_psql+set}" = set; then enableval="$enable_contrib_psql" @@ -1587,7 +1600,7 @@ fi echo $ac_n "checking for --enable-contrib-compat""... $ac_c" 1>&6 -echo "configure:1591: checking for --enable-contrib-compat" >&5 +echo "configure:1604: checking for --enable-contrib-compat" >&5 # Check whether --enable-contrib-compat or --disable-contrib-compat was given. if test "${enable_contrib_compat+set}" = set; then enableval="$enable_contrib_compat" @@ -1604,7 +1617,7 @@ fi echo $ac_n "checking for --enable-contrib-directory""... $ac_c" 1>&6 -echo "configure:1608: checking for --enable-contrib-directory" >&5 +echo "configure:1621: checking for --enable-contrib-directory" >&5 # Check whether --enable-contrib-directory or --disable-contrib-directory was given. if test "${enable_contrib_directory+set}" = set; then enableval="$enable_contrib_directory" @@ -1787,6 +1800,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/compat/configure +++ mozart-1.4.0/contrib/compat/configure @@ -593,7 +593,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1247,9 +1247,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1252: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1253: checking for OZLOADSEP" >&5 +echo "configure:1266: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1269,7 +1282,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1273: checking for OZLOADWIN" >&5 +echo "configure:1286: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1309,7 +1322,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1313: checking for --with-global-oz" >&5 +echo "configure:1326: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1343,7 +1356,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1347: checking for $ac_word" >&5 +echo "configure:1360: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1389,7 +1402,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1393: checking for --with-global-oz" >&5 +echo "configure:1406: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1423,7 +1436,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1427: checking for $ac_word" >&5 +echo "configure:1440: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1469,7 +1482,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1473: checking for --with-global-oz" >&5 +echo "configure:1486: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1503,7 +1516,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1507: checking for $ac_word" >&5 +echo "configure:1520: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1565,7 +1578,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1569: checking for $ac_word" >&5 +echo "configure:1582: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1597,7 +1610,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1601: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1614: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1608,12 +1621,12 @@ cat > conftest.$ac_ext << EOF -#line 1612 "configure" +#line 1625 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1639,12 +1652,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1643: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1656: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1648: checking whether we are using GNU C++" >&5 +echo "configure:1661: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1653,7 +1666,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1672,7 +1685,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1676: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1689: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1710,7 +1723,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1714: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1727: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1843,7 +1856,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1847: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1860: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1874,7 +1887,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1878: checking how to run the C++ preprocessor" >&5 +echo "configure:1891: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1887,12 +1900,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1924,23 +1937,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1928: checking for C++ compiler" >&5 +echo "configure:1941: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1933: checking whether we are using GNU C++" >&5 +echo "configure:1946: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1938: checking for C++ preprocessor" >&5 +echo "configure:1951: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1944: checking for default CXXFLAGS" >&5 +echo "configure:1957: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1958,7 +1971,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1962: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1975: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2149,6 +2162,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/compat/Makefile.in +++ mozart-1.4.0/contrib/compat/Makefile.in @@ -38,6 +38,9 @@ install: $(BIN_DIR) $(BIN_TARGETS) $(CACHEDIR) $(CACHE_TARGETS) +$(BIN_TARGETS): $(BIN_DIR) +$(CACHE_TARGETS): $(CACHEDIR) + $(BIN_DIR) $(CACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/reflect/configure +++ mozart-1.4.0/contrib/reflect/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3650,6 +3663,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/reflect/reflect.cc +++ mozart-1.4.0/contrib/reflect/reflect.cc @@ -34,7 +34,7 @@ //============================================================================= // auxiliary functions -OZ_Term prop_name(char * name) +OZ_Term prop_name(const char * name) { static struct prop_names_tab_t { char * internal_name; --- mozart-1.4.0.orig/contrib/reflect/Makefile.in +++ mozart-1.4.0/contrib/reflect/Makefile.in @@ -64,6 +64,8 @@ all: $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/investigator/configure +++ mozart-1.4.0/contrib/investigator/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3650,6 +3663,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/investigator/Makefile.in +++ mozart-1.4.0/contrib/investigator/Makefile.in @@ -64,6 +64,8 @@ install: $(LIB_DIR) $(LIB_TARGETS) new: clean all +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/directory/configure +++ mozart-1.4.0/contrib/directory/configure @@ -590,7 +590,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1244,9 +1244,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1249: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1250: checking for OZLOADSEP" >&5 +echo "configure:1263: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1266,7 +1279,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1270: checking for OZLOADWIN" >&5 +echo "configure:1283: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1319,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1310: checking for --with-global-oz" >&5 +echo "configure:1323: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1340,7 +1353,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,7 +1399,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1390: checking for --with-global-oz" >&5 +echo "configure:1403: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1420,7 +1433,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1424: checking for $ac_word" >&5 +echo "configure:1437: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1466,7 +1479,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1470: checking for --with-global-oz" >&5 +echo "configure:1483: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1500,7 +1513,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1504: checking for $ac_word" >&5 +echo "configure:1517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1708,6 +1721,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/directory/Makefile.in +++ mozart-1.4.0/contrib/directory/Makefile.in @@ -56,6 +56,8 @@ all: $(TARGETS) install: $(NEWCACHEDIR) $(NEW_TARGETS) +$(NEW_TARGETS): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/maple/configure +++ mozart-1.4.0/contrib/maple/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3650,6 +3663,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/maple/Makefile.in +++ mozart-1.4.0/contrib/maple/Makefile.in @@ -90,6 +90,8 @@ all: first $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/regex/configure +++ mozart-1.4.0/contrib/regex/configure @@ -600,7 +600,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1254,9 +1254,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1259: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1260: checking for OZLOADSEP" >&5 +echo "configure:1273: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1276,7 +1289,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1280: checking for OZLOADWIN" >&5 +echo "configure:1293: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1316,7 +1329,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1320: checking for --with-global-oz" >&5 +echo "configure:1333: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1350,7 +1363,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1354: checking for $ac_word" >&5 +echo "configure:1367: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1396,7 +1409,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1400: checking for --with-global-oz" >&5 +echo "configure:1413: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1430,7 +1443,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1434: checking for $ac_word" >&5 +echo "configure:1447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1476,7 +1489,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1480: checking for --with-global-oz" >&5 +echo "configure:1493: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1510,7 +1523,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1514: checking for $ac_word" >&5 +echo "configure:1527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1572,7 +1585,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1576: checking for $ac_word" >&5 +echo "configure:1589: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1604,7 +1617,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1608: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1621: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1615,12 +1628,12 @@ cat > conftest.$ac_ext << EOF -#line 1619 "configure" +#line 1632 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1646,12 +1659,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1650: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1663: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1655: checking whether we are using GNU C++" >&5 +echo "configure:1668: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1660,7 +1673,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1679,7 +1692,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1683: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1696: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1717,7 +1730,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1721: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1734: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1850,7 +1863,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1854: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1867: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1881,7 +1894,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1885: checking how to run the C++ preprocessor" >&5 +echo "configure:1898: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1894,12 +1907,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1931,23 +1944,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1935: checking for C++ compiler" >&5 +echo "configure:1948: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1940: checking whether we are using GNU C++" >&5 +echo "configure:1953: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1945: checking for C++ preprocessor" >&5 +echo "configure:1958: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1951: checking for default CXXFLAGS" >&5 +echo "configure:1964: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1966,7 +1979,7 @@ echo $ac_n "checking for --with-regex-inc""... $ac_c" 1>&6 -echo "configure:1970: checking for --with-regex-inc" >&5 +echo "configure:1983: checking for --with-regex-inc" >&5 # Check whether --with-regex-inc or --without-regex-inc was given. if test "${with_regex_inc+set}" = set; then withval="$with_regex_inc" @@ -1979,7 +1992,7 @@ echo "$ac_t""$oz_cv_with_regex_inc" 1>&6 echo $ac_n "checking for --with-regex-lib""... $ac_c" 1>&6 -echo "configure:1983: checking for --with-regex-lib" >&5 +echo "configure:1996: checking for --with-regex-lib" >&5 # Check whether --with-regex-lib or --without-regex-lib was given. if test "${with_regex_lib+set}" = set; then withval="$with_regex_lib" @@ -1992,7 +2005,7 @@ echo "$ac_t""$oz_cv_with_regex_lib" 1>&6 echo $ac_n "checking for --with-regex-ldflags""... $ac_c" 1>&6 -echo "configure:1996: checking for --with-regex-ldflags" >&5 +echo "configure:2009: checking for --with-regex-ldflags" >&5 # Check whether --with-regex-ldflags or --without-regex-ldflags was given. if test "${with_regex_ldflags+set}" = set; then withval="$with_regex_ldflags" @@ -2024,7 +2037,7 @@ fi echo $ac_n "checking for regex.h""... $ac_c" 1>&6 -echo "configure:2028: checking for regex.h" >&5 +echo "configure:2041: checking for regex.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_regex_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2035,12 +2048,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2057,12 +2070,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2107,13 +2120,13 @@ echo $ac_n "checking for regex_t and regmatch_t""... $ac_c" 1>&6 -echo "configure:2111: checking for regex_t and regmatch_t" >&5 +echo "configure:2124: checking for regex_t and regmatch_t" >&5 if eval "test \"`echo '$''{'oz_cv_regex_header_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2129,7 +2142,7 @@ ; return 0; } EOF -if { (eval echo configure:2133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* oz_cv_regex_header_ok=yes else @@ -2179,12 +2192,12 @@ for ac_func in strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2183: checking for $ac_func" >&5 +echo "configure:2196: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2237,7 +2250,7 @@ if test -n "$oz_cv_lib_path_ldflags_regex_regcomp"; then echo $ac_n "checking for library regex""... $ac_c" 1>&6 -echo "configure:2241: checking for library regex" >&5 +echo "configure:2254: checking for library regex" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_regex_regcomp oz_add_libs=$oz_cv_lib_path_libs_regex_regcomp if test "$oz_add_ldflags" = no; then @@ -2261,12 +2274,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for regcomp in -lregex (default)""... $ac_c" 1>&6 -echo "configure:2265: checking for regcomp in -lregex (default)" >&5 +echo "configure:2278: checking for regcomp in -lregex (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2315,7 +2328,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2341,12 +2354,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for regcomp in -L$p -lregex""... $ac_c" 1>&6 -echo "configure:2345: checking for regcomp in -L$p -lregex" >&5 +echo "configure:2358: checking for regcomp in -L$p -lregex" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2371,7 +2384,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2395,7 +2408,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2427,7 +2440,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2491,12 +2504,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for regcomp in -L$p -lregex""... $ac_c" 1>&6 -echo "configure:2495: checking for regcomp in -L$p -lregex" >&5 +echo "configure:2508: checking for regcomp in -L$p -lregex" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2521,7 +2534,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2545,7 +2558,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2577,7 +2590,7 @@ oz_add_libs="-lregex" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2803,6 +2816,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/regex/Makefile.in +++ mozart-1.4.0/contrib/regex/Makefile.in @@ -35,6 +35,8 @@ all: $(TARGETS) install: $(NEWCACHEDIR) $(NEW_TARGETS) +$(NEW_TARGETS): $(NEWCACHEDIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/gdbm/configure +++ mozart-1.4.0/contrib/gdbm/configure @@ -601,7 +601,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1255,9 +1255,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1260: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1261: checking for OZLOADSEP" >&5 +echo "configure:1274: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1277,7 +1290,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1281: checking for OZLOADWIN" >&5 +echo "configure:1294: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1317,7 +1330,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1321: checking for --with-global-oz" >&5 +echo "configure:1334: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1351,7 +1364,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1355: checking for $ac_word" >&5 +echo "configure:1368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1397,7 +1410,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1401: checking for --with-global-oz" >&5 +echo "configure:1414: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1431,7 +1444,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1435: checking for $ac_word" >&5 +echo "configure:1448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1477,7 +1490,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1481: checking for --with-global-oz" >&5 +echo "configure:1494: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1511,7 +1524,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1515: checking for $ac_word" >&5 +echo "configure:1528: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1573,7 +1586,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1577: checking for $ac_word" >&5 +echo "configure:1590: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1605,7 +1618,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1609: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1622: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1616,12 +1629,12 @@ cat > conftest.$ac_ext << EOF -#line 1620 "configure" +#line 1633 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1647,12 +1660,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1651: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1664: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1656: checking whether we are using GNU C++" >&5 +echo "configure:1669: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1661,7 +1674,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1680,7 +1693,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1684: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1697: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1718,7 +1731,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1722: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1735: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1851,7 +1864,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1855: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1868: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1882,7 +1895,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1886: checking how to run the C++ preprocessor" >&5 +echo "configure:1899: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1895,12 +1908,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1932,23 +1945,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1936: checking for C++ compiler" >&5 +echo "configure:1949: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1941: checking whether we are using GNU C++" >&5 +echo "configure:1954: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1946: checking for C++ preprocessor" >&5 +echo "configure:1959: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1952: checking for default CXXFLAGS" >&5 +echo "configure:1965: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1967,7 +1980,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1971: checking for --with-gmp" >&5 +echo "configure:1984: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1996,7 +2009,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2000: checking for gmp.h" >&5 +echo "configure:2013: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2007,12 +2020,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2029,12 +2042,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2077,7 +2090,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2081: checking for gmp.h" >&5 +echo "configure:2094: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2088,12 +2101,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2110,12 +2123,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2163,7 +2176,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2167: checking for library gmp" >&5 +echo "configure:2180: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2187,12 +2200,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2191: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2204: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2217,7 +2230,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2241,7 +2254,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2267,12 +2280,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2271: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2284: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2297,7 +2310,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2321,7 +2334,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2353,7 +2366,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2391,7 +2404,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2417,12 +2430,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2421: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2434: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2447,7 +2460,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2471,7 +2484,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2503,7 +2516,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2546,7 +2559,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2550: checking for library gmp" >&5 +echo "configure:2563: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2570,12 +2583,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2574: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2587: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2600,7 +2613,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2624,7 +2637,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2650,12 +2663,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2654: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2667: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2680,7 +2693,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2704,7 +2717,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2736,7 +2749,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2774,7 +2787,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2800,12 +2813,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2804: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2817: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2830,7 +2843,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2854,7 +2867,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2886,7 +2899,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2929,7 +2942,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2933: checking for library gmp2" >&5 +echo "configure:2946: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2953,12 +2966,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2957: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2970: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2983,7 +2996,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3007,7 +3020,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3033,12 +3046,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3037: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3050: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3063,7 +3076,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3087,7 +3100,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3119,7 +3132,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3157,7 +3170,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3183,12 +3196,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3187: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3200: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3213,7 +3226,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3237,7 +3250,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3269,7 +3282,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3371,7 +3384,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3375: checking gmp version is at least 2" >&5 +echo "configure:3388: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3492,7 +3505,7 @@ fi echo $ac_n "checking for --with-gdbm-inc""... $ac_c" 1>&6 -echo "configure:3496: checking for --with-gdbm-inc" >&5 +echo "configure:3509: checking for --with-gdbm-inc" >&5 # Check whether --with-gdbm-inc or --without-gdbm-inc was given. if test "${with_gdbm_inc+set}" = set; then withval="$with_gdbm_inc" @@ -3505,7 +3518,7 @@ echo "$ac_t""$oz_cv_with_gdbm_inc" 1>&6 echo $ac_n "checking for --with-gdbm-lib""... $ac_c" 1>&6 -echo "configure:3509: checking for --with-gdbm-lib" >&5 +echo "configure:3522: checking for --with-gdbm-lib" >&5 # Check whether --with-gdbm-lib or --without-gdbm-lib was given. if test "${with_gdbm_lib+set}" = set; then withval="$with_gdbm_lib" @@ -3528,7 +3541,7 @@ fi echo $ac_n "checking for gdbm.h""... $ac_c" 1>&6 -echo "configure:3532: checking for gdbm.h" >&5 +echo "configure:3545: checking for gdbm.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gdbm_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3539,12 +3552,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3561,12 +3574,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3619,7 +3632,7 @@ if test -n "$oz_cv_lib_path_ldflags_gdbm_gdbm_open"; then echo $ac_n "checking for library gdbm""... $ac_c" 1>&6 -echo "configure:3623: checking for library gdbm" >&5 +echo "configure:3636: checking for library gdbm" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gdbm_gdbm_open oz_add_libs=$oz_cv_lib_path_libs_gdbm_gdbm_open if test "$oz_add_ldflags" = no; then @@ -3643,12 +3656,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for gdbm_open in -lgdbm (default)""... $ac_c" 1>&6 -echo "configure:3647: checking for gdbm_open in -lgdbm (default)" >&5 +echo "configure:3660: checking for gdbm_open in -lgdbm (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3673,7 +3686,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3697,7 +3710,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3723,12 +3736,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for gdbm_open in -L$p -lgdbm""... $ac_c" 1>&6 -echo "configure:3727: checking for gdbm_open in -L$p -lgdbm" >&5 +echo "configure:3740: checking for gdbm_open in -L$p -lgdbm" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3753,7 +3766,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3777,7 +3790,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3809,7 +3822,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3847,7 +3860,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3873,12 +3886,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for gdbm_open in -L$p -lgdbm""... $ac_c" 1>&6 -echo "configure:3877: checking for gdbm_open in -L$p -lgdbm" >&5 +echo "configure:3890: checking for gdbm_open in -L$p -lgdbm" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3903,7 +3916,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3927,7 +3940,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3959,7 +3972,7 @@ oz_add_libs="-lgdbm" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -4055,7 +4068,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:4059: checking for --with-global-oz" >&5 +echo "configure:4072: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -4089,7 +4102,7 @@ # Extract the first word of "ozplatform", so it can be a program name with args. set dummy ozplatform; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4093: checking for $ac_word" >&5 +echo "configure:4106: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PLATFORMSCRIPT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4300,6 +4313,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/gdbm/Makefile.in +++ mozart-1.4.0/contrib/gdbm/Makefile.in @@ -36,6 +36,8 @@ all: $(TARGETS) install: $(NEWCACHEDIR) $(NEW_TARGETS) +$(NEW_TARGETS): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/tk/configure +++ mozart-1.4.0/contrib/tk/configure @@ -590,7 +590,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1244,9 +1244,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1249: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1250: checking for OZLOADSEP" >&5 +echo "configure:1263: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1266,7 +1279,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1270: checking for OZLOADWIN" >&5 +echo "configure:1283: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1319,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1310: checking for --with-global-oz" >&5 +echo "configure:1323: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1340,7 +1353,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,7 +1399,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1390: checking for --with-global-oz" >&5 +echo "configure:1403: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1420,7 +1433,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1424: checking for $ac_word" >&5 +echo "configure:1437: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1466,7 +1479,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1470: checking for --with-global-oz" >&5 +echo "configure:1483: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1500,7 +1513,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1504: checking for $ac_word" >&5 +echo "configure:1517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1708,6 +1721,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/tk/Makefile.in +++ mozart-1.4.0/contrib/tk/Makefile.in @@ -11,6 +11,7 @@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_LIB = $(INSTALL) -m 444 FUNCTORS = CheckBox.ozf ScrollFrame.ozf +NEW_FUNCTORS = $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) NEWCACHEDIR = $(PREFIX)/cache/x-oz/contrib/tk PLATFORM = @PLATFORM@ CYGPATH = $(SRCTOP)/share/lib/cygpath.sh @@ -18,7 +19,10 @@ all: $(FUNCTORS) %.ozf: %.oz $(OZC) -c $(shell $(CYGPATH) "$<") -o $@ -install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) +install: $(NEWCACHEDIR) $(NEW_FUNCTORS) + +$(NEW_FUNCTORS): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ $(LIB_DIR)/%.ozf: %.ozf --- mozart-1.4.0.orig/contrib/os/io.cc +++ mozart-1.4.0/contrib/os/io.cc @@ -97,7 +97,7 @@ OZ_RETURN_BOOL(OZ_isFileDescriptor(t)); } OZ_BI_end -extern int raiseUnixError(char *f,int n, char * e, char * g); +extern int raiseUnixError(const char *f,int n, const char * e, const char * g); #define RETURN_UNIX_ERROR(f) \ { return raiseUnixError(f,ossockerrno(), OZ_unixError(ossockerrno()), "os"); } --- mozart-1.4.0.orig/contrib/os/configure +++ mozart-1.4.0/contrib/os/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1965: checking for gmp.h" >&5 +echo "configure:1978: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1972,12 +1985,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1994,12 +2007,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2042,7 +2055,7 @@ fi echo $ac_n "checking for --enable-denys-events""... $ac_c" 1>&6 -echo "configure:2046: checking for --enable-denys-events" >&5 +echo "configure:2059: checking for --enable-denys-events" >&5 # Check whether --enable-denys-events or --disable-denys-events was given. if test "${enable_denys_events+set}" = set; then enableval="$enable_denys_events" @@ -2226,6 +2239,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/os/Makefile.in +++ mozart-1.4.0/contrib/os/Makefile.in @@ -49,6 +49,8 @@ all: $(FUNCTORS) $(NATIVES) install: $(NEWCACHEDIR) $(NEW_FUNCTORS) $(NEW_NATIVES) +$(NEW_FUNCTORS) $(NEW_NATIVES): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/davinci/configure +++ mozart-1.4.0/contrib/davinci/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3651,6 +3664,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/davinci/Makefile.in +++ mozart-1.4.0/contrib/davinci/Makefile.in @@ -53,6 +53,8 @@ all: $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/ap/configure +++ mozart-1.4.0/contrib/ap/configure @@ -590,7 +590,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1244,9 +1244,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1249: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1250: checking for OZLOADSEP" >&5 +echo "configure:1263: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1266,7 +1279,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1270: checking for OZLOADWIN" >&5 +echo "configure:1283: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1319,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1310: checking for --with-global-oz" >&5 +echo "configure:1323: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1340,7 +1353,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,7 +1399,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1390: checking for --with-global-oz" >&5 +echo "configure:1403: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1420,7 +1433,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1424: checking for $ac_word" >&5 +echo "configure:1437: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1466,7 +1479,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1470: checking for --with-global-oz" >&5 +echo "configure:1483: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1500,7 +1513,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1504: checking for $ac_word" >&5 +echo "configure:1517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1708,6 +1721,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/ap/Makefile.in +++ mozart-1.4.0/contrib/ap/Makefile.in @@ -12,13 +12,17 @@ INSTALL_LIB = $(INSTALL) -m 444 FUNCTORS = OptionSheet.ozf NEWCACHEDIR = $(PREFIX)/cache/x-oz/contrib/ap +NEW_FUNCTORS = $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) PLATFORM = @PLATFORM@ CYGPATH = $(SRCTOP)/share/lib/cygpath.sh all: $(FUNCTORS) %.ozf: %.oz $(OZC) -z 9 -c $(shell $(CYGPATH) "$<") -o $@ -install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS)) +install: $(NEWCACHEDIR) $(NEW_FUNCTORS) + +$(NEW_FUNCTORS): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ $(LIB_DIR)/%.ozf: %.ozf --- mozart-1.4.0.orig/contrib/micq/configure +++ mozart-1.4.0/contrib/micq/configure @@ -590,7 +590,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1244,9 +1244,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1249: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1250: checking for OZLOADSEP" >&5 +echo "configure:1263: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1266,7 +1279,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1270: checking for OZLOADWIN" >&5 +echo "configure:1283: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1306,7 +1319,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1310: checking for --with-global-oz" >&5 +echo "configure:1323: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1340,7 +1353,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,7 +1399,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1390: checking for --with-global-oz" >&5 +echo "configure:1403: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1420,7 +1433,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1424: checking for $ac_word" >&5 +echo "configure:1437: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1466,7 +1479,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1470: checking for --with-global-oz" >&5 +echo "configure:1483: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1500,7 +1513,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1504: checking for $ac_word" >&5 +echo "configure:1517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1709,6 +1722,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/micq/Makefile.in +++ mozart-1.4.0/contrib/micq/Makefile.in @@ -17,6 +17,7 @@ INSTALL_DIR = @INSTALL_DIR@ INSTALL_LIB = $(INSTALL) -m 444 APPLETS = server.oza client.oza +NEW_APPLETS = $(addprefix $(NEWCACHEDIR)/,$(APPLETS)) GIFCONV = Gif2Functor.oza ICONDIR = $(SRCDIR)/Icons2 MAKEGIF = $(OZENGINE) $(GIFCONV) @@ -26,7 +27,10 @@ all: $(GIFCONV) $(GIFS) $(APPLETS) install:: $(DEMO_DIR) $(DEMO_DIR)/MIM.oza \ - $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(APPLETS)) + $(NEWCACHEDIR) $(NEW_APPLETS) + +$(DEMO_DIR)/MIM.oza: $(DEMO_DIR) +$(NEW_APPLETS): $(NEWCACHEDIR) $(NEWCACHEDIR)/% : % $(INSTALL_LIB) $< $@ --- mozart-1.4.0.orig/contrib/ri/configure +++ mozart-1.4.0/contrib/ri/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3491,7 +3504,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3495: checking for $ac_word" >&5 +echo "configure:3508: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3613,7 +3626,7 @@ else echo $ac_n "checking for perl""... $ac_c" 1>&6 -echo "configure:3617: checking for perl" >&5 +echo "configure:3630: checking for perl" >&5 PERL=$oz_cv_PERL echo "$ac_t""(cached) $PERL" 1>&6 fi @@ -3784,6 +3797,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/ri/Makefile.in +++ mozart-1.4.0/contrib/ri/Makefile.in @@ -78,6 +78,9 @@ all: first $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(TARGETS): first +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/fcp/configure +++ mozart-1.4.0/contrib/fcp/configure @@ -595,7 +595,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1249,9 +1249,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1254: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1255: checking for OZLOADSEP" >&5 +echo "configure:1268: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1271,7 +1284,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1275: checking for OZLOADWIN" >&5 +echo "configure:1288: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1324,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1315: checking for --with-global-oz" >&5 +echo "configure:1328: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1345,7 +1358,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1349: checking for $ac_word" >&5 +echo "configure:1362: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1391,7 +1404,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1395: checking for --with-global-oz" >&5 +echo "configure:1408: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1425,7 +1438,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1429: checking for $ac_word" >&5 +echo "configure:1442: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1471,7 +1484,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1475: checking for --with-global-oz" >&5 +echo "configure:1488: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1505,7 +1518,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1509: checking for $ac_word" >&5 +echo "configure:1522: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1567,7 +1580,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1571: checking for $ac_word" >&5 +echo "configure:1584: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1599,7 +1612,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1603: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1616: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1610,12 +1623,12 @@ cat > conftest.$ac_ext << EOF -#line 1614 "configure" +#line 1627 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1641,12 +1654,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1645: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1658: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1650: checking whether we are using GNU C++" >&5 +echo "configure:1663: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1655,7 +1668,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1674,7 +1687,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1678: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1691: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1712,7 +1725,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1716: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1729: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1845,7 +1858,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1849: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1862: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1876,7 +1889,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1880: checking how to run the C++ preprocessor" >&5 +echo "configure:1893: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,12 +1902,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1926,23 +1939,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1930: checking for C++ compiler" >&5 +echo "configure:1943: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1935: checking whether we are using GNU C++" >&5 +echo "configure:1948: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1940: checking for C++ preprocessor" >&5 +echo "configure:1953: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1946: checking for default CXXFLAGS" >&5 +echo "configure:1959: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1961,7 +1974,7 @@ echo $ac_n "checking for --with-gmp""... $ac_c" 1>&6 -echo "configure:1965: checking for --with-gmp" >&5 +echo "configure:1978: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -1990,7 +2003,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:1994: checking for gmp.h" >&5 +echo "configure:2007: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2001,12 +2014,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2023: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2023,12 +2036,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2084,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:2075: checking for gmp.h" >&5 +echo "configure:2088: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2082,12 +2095,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2104,12 +2117,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2157,7 +2170,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2161: checking for library gmp" >&5 +echo "configure:2174: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -2181,12 +2194,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2185: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:2198: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2211,7 +2224,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2235,7 +2248,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2261,12 +2274,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2265: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2278: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2291,7 +2304,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2315,7 +2328,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2347,7 +2360,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2385,7 +2398,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2411,12 +2424,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2415: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:2428: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2441,7 +2454,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2465,7 +2478,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2497,7 +2510,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2540,7 +2553,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:2544: checking for library gmp" >&5 +echo "configure:2557: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -2564,12 +2577,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:2568: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:2581: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2594,7 +2607,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2618,7 +2631,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2644,12 +2657,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2648: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2661: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2674,7 +2687,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2698,7 +2711,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2730,7 +2743,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2768,7 +2781,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2794,12 +2807,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:2798: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:2811: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2824,7 +2837,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2848,7 +2861,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2880,7 +2893,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2923,7 +2936,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:2927: checking for library gmp2" >&5 +echo "configure:2940: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -2947,12 +2960,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:2951: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:2964: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2977,7 +2990,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3001,7 +3014,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3027,12 +3040,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3031: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3044: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3057,7 +3070,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3081,7 +3094,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3113,7 +3126,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3151,7 +3164,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -3177,12 +3190,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:3181: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:3194: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3207,7 +3220,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3231,7 +3244,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3263,7 +3276,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -3365,7 +3378,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:3369: checking gmp version is at least 2" >&5 +echo "configure:3382: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -3650,6 +3663,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/fcp/Makefile.in +++ mozart-1.4.0/contrib/fcp/Makefile.in @@ -74,6 +74,8 @@ new: clean all +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/psql/configure +++ mozart-1.4.0/contrib/psql/configure @@ -600,7 +600,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1254,9 +1254,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1259: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1260: checking for OZLOADSEP" >&5 +echo "configure:1273: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1276,7 +1289,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1280: checking for OZLOADWIN" >&5 +echo "configure:1293: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1316,7 +1329,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1320: checking for --with-global-oz" >&5 +echo "configure:1333: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1350,7 +1363,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1354: checking for $ac_word" >&5 +echo "configure:1367: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1396,7 +1409,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1400: checking for --with-global-oz" >&5 +echo "configure:1413: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1430,7 +1443,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1434: checking for $ac_word" >&5 +echo "configure:1447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1476,7 +1489,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1480: checking for --with-global-oz" >&5 +echo "configure:1493: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1510,7 +1523,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1514: checking for $ac_word" >&5 +echo "configure:1527: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1572,7 +1585,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1576: checking for $ac_word" >&5 +echo "configure:1589: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1604,7 +1617,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1608: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1621: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1615,12 +1628,12 @@ cat > conftest.$ac_ext << EOF -#line 1619 "configure" +#line 1632 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1646,12 +1659,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1650: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1663: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1655: checking whether we are using GNU C++" >&5 +echo "configure:1668: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1660,7 +1673,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1679,7 +1692,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1683: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1696: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1717,7 +1730,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1721: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1734: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1850,7 +1863,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1854: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1867: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1881,7 +1894,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1885: checking how to run the C++ preprocessor" >&5 +echo "configure:1898: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1894,12 +1907,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1931,23 +1944,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1935: checking for C++ compiler" >&5 +echo "configure:1948: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1940: checking whether we are using GNU C++" >&5 +echo "configure:1953: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1945: checking for C++ preprocessor" >&5 +echo "configure:1958: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1951: checking for default CXXFLAGS" >&5 +echo "configure:1964: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1965,7 +1978,7 @@ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1969: checking for gethostbyname in -lnsl" >&5 +echo "configure:1982: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1973,7 +1986,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2015,7 +2028,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:2019: checking for socket in -lsocket" >&5 +echo "configure:2032: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2023,7 +2036,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2066,7 +2079,7 @@ echo $ac_n "checking for --with-psql-inc""... $ac_c" 1>&6 -echo "configure:2070: checking for --with-psql-inc" >&5 +echo "configure:2083: checking for --with-psql-inc" >&5 # Check whether --with-psql-inc or --without-psql-inc was given. if test "${with_psql_inc+set}" = set; then withval="$with_psql_inc" @@ -2079,7 +2092,7 @@ echo "$ac_t""$oz_cv_with_psql_inc" 1>&6 echo $ac_n "checking for --with-psql-lib""... $ac_c" 1>&6 -echo "configure:2083: checking for --with-psql-lib" >&5 +echo "configure:2096: checking for --with-psql-lib" >&5 # Check whether --with-psql-lib or --without-psql-lib was given. if test "${with_psql_lib+set}" = set; then withval="$with_psql_lib" @@ -2092,7 +2105,7 @@ echo "$ac_t""$oz_cv_with_psql_lib" 1>&6 echo $ac_n "checking for --with-psql-ldflags""... $ac_c" 1>&6 -echo "configure:2096: checking for --with-psql-ldflags" >&5 +echo "configure:2109: checking for --with-psql-ldflags" >&5 # Check whether --with-psql-ldflags or --without-psql-ldflags was given. if test "${with_psql_ldflags+set}" = set; then withval="$with_psql_ldflags" @@ -2121,7 +2134,7 @@ fi echo $ac_n "checking for libpq-fe.h""... $ac_c" 1>&6 -echo "configure:2125: checking for libpq-fe.h" >&5 +echo "configure:2138: checking for libpq-fe.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_libpq_fe_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2132,12 +2145,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2154,12 +2167,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2210,7 +2223,7 @@ if test -n "$oz_cv_lib_path_ldflags_pq_PQerrorMessage"; then echo $ac_n "checking for library pq""... $ac_c" 1>&6 -echo "configure:2214: checking for library pq" >&5 +echo "configure:2227: checking for library pq" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_pq_PQerrorMessage oz_add_libs=$oz_cv_lib_path_libs_pq_PQerrorMessage if test "$oz_add_ldflags" = no; then @@ -2234,12 +2247,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for PQerrorMessage in -lpq (default)""... $ac_c" 1>&6 -echo "configure:2238: checking for PQerrorMessage in -lpq (default)" >&5 +echo "configure:2251: checking for PQerrorMessage in -lpq (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2264,7 +2277,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2288,7 +2301,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2314,12 +2327,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for PQerrorMessage in -L$p -lpq""... $ac_c" 1>&6 -echo "configure:2318: checking for PQerrorMessage in -L$p -lpq" >&5 +echo "configure:2331: checking for PQerrorMessage in -L$p -lpq" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2344,7 +2357,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2368,7 +2381,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2400,7 +2413,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2438,7 +2451,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2464,12 +2477,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for PQerrorMessage in -L$p -lpq""... $ac_c" 1>&6 -echo "configure:2468: checking for PQerrorMessage in -L$p -lpq" >&5 +echo "configure:2481: checking for PQerrorMessage in -L$p -lpq" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2494,7 +2507,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2518,7 +2531,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2550,7 +2563,7 @@ oz_add_libs="-lpq" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2777,6 +2790,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/psql/Makefile.in +++ mozart-1.4.0/contrib/psql/Makefile.in @@ -31,6 +31,8 @@ all: $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/lp/configure +++ mozart-1.4.0/contrib/lp/configure @@ -597,7 +597,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1251,9 +1251,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1256: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1257: checking for OZLOADSEP" >&5 +echo "configure:1270: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1273,7 +1286,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1277: checking for OZLOADWIN" >&5 +echo "configure:1290: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1313,7 +1326,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1317: checking for --with-global-oz" >&5 +echo "configure:1330: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1347,7 +1360,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1351: checking for $ac_word" >&5 +echo "configure:1364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1393,7 +1406,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1397: checking for --with-global-oz" >&5 +echo "configure:1410: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1427,7 +1440,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1431: checking for $ac_word" >&5 +echo "configure:1444: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1473,7 +1486,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1477: checking for --with-global-oz" >&5 +echo "configure:1490: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1507,7 +1520,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1511: checking for $ac_word" >&5 +echo "configure:1524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1569,7 +1582,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1573: checking for $ac_word" >&5 +echo "configure:1586: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1601,7 +1614,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1618: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1612,12 +1625,12 @@ cat > conftest.$ac_ext << EOF -#line 1616 "configure" +#line 1629 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1643,12 +1656,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1660: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1652: checking whether we are using GNU C++" >&5 +echo "configure:1665: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1657,7 +1670,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1676,7 +1689,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1680: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1693: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1714,7 +1727,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1718: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1731: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1847,7 +1860,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1851: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1864: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1878,7 +1891,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1882: checking how to run the C++ preprocessor" >&5 +echo "configure:1895: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1891,12 +1904,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1928,23 +1941,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1932: checking for C++ compiler" >&5 +echo "configure:1945: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1937: checking whether we are using GNU C++" >&5 +echo "configure:1950: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1942: checking for C++ preprocessor" >&5 +echo "configure:1955: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1948: checking for default CXXFLAGS" >&5 +echo "configure:1961: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1963,7 +1976,7 @@ echo $ac_n "checking for --with-lpk-inc""... $ac_c" 1>&6 -echo "configure:1967: checking for --with-lpk-inc" >&5 +echo "configure:1980: checking for --with-lpk-inc" >&5 # Check whether --with-lpk-inc or --without-lpk-inc was given. if test "${with_lpk_inc+set}" = set; then withval="$with_lpk_inc" @@ -1976,7 +1989,7 @@ echo "$ac_t""$oz_cv_with_lpk_inc" 1>&6 echo $ac_n "checking for --with-lpk-lib""... $ac_c" 1>&6 -echo "configure:1980: checking for --with-lpk-lib" >&5 +echo "configure:1993: checking for --with-lpk-lib" >&5 # Check whether --with-lpk-lib or --without-lpk-lib was given. if test "${with_lpk_lib+set}" = set; then withval="$with_lpk_lib" @@ -1999,7 +2012,7 @@ fi echo $ac_n "checking for lpkit.h""... $ac_c" 1>&6 -echo "configure:2003: checking for lpkit.h" >&5 +echo "configure:2016: checking for lpkit.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_lpkit_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2010,12 +2023,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2032,12 +2045,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2090,7 +2103,7 @@ if test -n "$oz_cv_lib_path_ldflags_lpk_make_lp"; then echo $ac_n "checking for library lpk""... $ac_c" 1>&6 -echo "configure:2094: checking for library lpk" >&5 +echo "configure:2107: checking for library lpk" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_lpk_make_lp oz_add_libs=$oz_cv_lib_path_libs_lpk_make_lp if test "$oz_add_ldflags" = no; then @@ -2114,12 +2127,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for make_lp in -llpk (default)""... $ac_c" 1>&6 -echo "configure:2118: checking for make_lp in -llpk (default)" >&5 +echo "configure:2131: checking for make_lp in -llpk (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2144,7 +2157,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2168,7 +2181,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2194,12 +2207,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for make_lp in -L$p -llpk""... $ac_c" 1>&6 -echo "configure:2198: checking for make_lp in -L$p -llpk" >&5 +echo "configure:2211: checking for make_lp in -L$p -llpk" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2224,7 +2237,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2248,7 +2261,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2280,7 +2293,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2318,7 +2331,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -2344,12 +2357,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for make_lp in -L$p -llpk""... $ac_c" 1>&6 -echo "configure:2348: checking for make_lp in -L$p -llpk" >&5 +echo "configure:2361: checking for make_lp in -L$p -llpk" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2374,7 +2387,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2398,7 +2411,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2430,7 +2443,7 @@ oz_add_libs="-llpk" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -2681,6 +2694,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/lp/Makefile.in +++ mozart-1.4.0/contrib/lp/Makefile.in @@ -75,6 +75,8 @@ all: $(TARGETS) install: $(LIB_DIR) $(LIB_TARGETS) +$(LIB_TARGETS): $(LIB_DIR) + $(LIB_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/gtk/configure +++ mozart-1.4.0/contrib/gtk/configure @@ -597,7 +597,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1251,9 +1251,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1256: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1257: checking for OZLOADSEP" >&5 +echo "configure:1270: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1273,7 +1286,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1277: checking for OZLOADWIN" >&5 +echo "configure:1290: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1313,7 +1326,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1317: checking for --with-global-oz" >&5 +echo "configure:1330: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1347,7 +1360,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1351: checking for $ac_word" >&5 +echo "configure:1364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1393,7 +1406,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1397: checking for --with-global-oz" >&5 +echo "configure:1410: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1427,7 +1440,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1431: checking for $ac_word" >&5 +echo "configure:1444: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1473,7 +1486,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1477: checking for --with-global-oz" >&5 +echo "configure:1490: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1507,7 +1520,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1511: checking for $ac_word" >&5 +echo "configure:1524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1569,7 +1582,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1573: checking for $ac_word" >&5 +echo "configure:1586: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1601,7 +1614,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1605: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1618: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1612,12 +1625,12 @@ cat > conftest.$ac_ext << EOF -#line 1616 "configure" +#line 1629 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1643,12 +1656,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1647: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1660: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1652: checking whether we are using GNU C++" >&5 +echo "configure:1665: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1657,7 +1670,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1676,7 +1689,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1680: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1693: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1714,7 +1727,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1718: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1731: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1847,7 +1860,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1851: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1864: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1878,7 +1891,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1882: checking how to run the C++ preprocessor" >&5 +echo "configure:1895: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1891,12 +1904,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1928,23 +1941,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1932: checking for C++ compiler" >&5 +echo "configure:1945: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1937: checking whether we are using GNU C++" >&5 +echo "configure:1950: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1942: checking for C++ preprocessor" >&5 +echo "configure:1955: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1948: checking for default CXXFLAGS" >&5 +echo "configure:1961: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1965,7 +1978,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1969: checking for --with-global-oz" >&5 +echo "configure:1982: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1999,7 +2012,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2003: checking for $ac_word" >&5 +echo "configure:2016: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZENGINE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2047,7 +2060,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2051: checking for $ac_word" >&5 +echo "configure:2064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2081,7 +2094,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2085: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2098: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2089,7 +2102,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2137,7 +2150,7 @@ else echo $ac_n "checking $LEX version is at least 2.5.3""... $ac_c" 1>&6 -echo "configure:2141: checking $LEX version is at least 2.5.3" >&5 +echo "configure:2154: checking $LEX version is at least 2.5.3" >&5 oz_tmp_ok=no if oz_tmp_version1=`$LEX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2265,7 +2278,7 @@ else echo $ac_n "checking for GNU flex""... $ac_c" 1>&6 -echo "configure:2269: checking for GNU flex" >&5 +echo "configure:2282: checking for GNU flex" >&5 LEX=$oz_cv_LEX echo "$ac_t""(cached) $LEX" 1>&6 fi @@ -2279,7 +2292,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2283: checking for $ac_word" >&5 +echo "configure:2296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2322,7 +2335,7 @@ else echo $ac_n "checking $YACC version is at least 1.25""... $ac_c" 1>&6 -echo "configure:2326: checking $YACC version is at least 1.25" >&5 +echo "configure:2339: checking $YACC version is at least 1.25" >&5 oz_tmp_ok=no if oz_tmp_version1=`$YACC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2446,7 +2459,7 @@ else echo $ac_n "checking for GNU bison""... $ac_c" 1>&6 -echo "configure:2450: checking for GNU bison" >&5 +echo "configure:2463: checking for GNU bison" >&5 YACC=$oz_cv_YACC echo "$ac_t""(cached) $YACC" 1>&6 fi @@ -2457,7 +2470,7 @@ # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2461: checking for $ac_word" >&5 +echo "configure:2474: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2498,7 +2511,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2502: checking for $ac_word" >&5 +echo "configure:2515: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTKCONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2535,7 +2548,7 @@ fi echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6 -echo "configure:2539: checking for GTK+ version" >&5 +echo "configure:2552: checking for GTK+ version" >&5 GTKVERSION=`$GTKCONFIG --version` case $GTKVERSION in 1.2.*) @@ -2548,7 +2561,7 @@ esac echo $ac_n "checking for --with-gtk-canvas-dir""... $ac_c" 1>&6 -echo "configure:2552: checking for --with-gtk-canvas-dir" >&5 +echo "configure:2565: checking for --with-gtk-canvas-dir" >&5 # Check whether --with-gtk_canvas_dir or --without-gtk_canvas_dir was given. if test "${with_gtk_canvas_dir+set}" = set; then withval="$with_gtk_canvas_dir" @@ -2734,6 +2747,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/gtk/Makefile.in +++ mozart-1.4.0/contrib/gtk/Makefile.in @@ -212,7 +212,7 @@ all: $(TARGETS) binding install: $(LIB_DIR) $(LIB_TARGETS) $(EXAMPLES_DIR) $(EXAMPLES_TARGETS) \ install_names -install_names: +install_names: $(LIB_DIR) cp ClassNames.ozp $(LIB_DIR)/ClassNames.ozp #--------------------------------------------------------------------- @@ -259,6 +259,9 @@ # Installing #--------------------------------------------------------------------- +$(LIB_TARGETS): $(LIB_DIR) +$(EXAMPLES_TARGETS): $(EXAMPLES_DIR) + $(LIB_DIR) $(EXAMPLES_DIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/doc/configure +++ mozart-1.4.0/contrib/doc/configure @@ -619,7 +619,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1273,9 +1273,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1278: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1279: checking for OZLOADSEP" >&5 +echo "configure:1292: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1295,7 +1308,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1299: checking for OZLOADWIN" >&5 +echo "configure:1312: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1335,7 +1348,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1339: checking for --with-global-oz" >&5 +echo "configure:1352: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1369,7 +1382,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1373: checking for $ac_word" >&5 +echo "configure:1386: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1415,7 +1428,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1419: checking for --with-global-oz" >&5 +echo "configure:1432: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1449,7 +1462,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1453: checking for $ac_word" >&5 +echo "configure:1466: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1495,7 +1508,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1499: checking for --with-global-oz" >&5 +echo "configure:1512: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1529,7 +1542,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1533: checking for $ac_word" >&5 +echo "configure:1546: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1574,7 +1587,7 @@ echo $ac_n "checking for --enable-compile-elisp""... $ac_c" 1>&6 -echo "configure:1578: checking for --enable-compile-elisp" >&5 +echo "configure:1591: checking for --enable-compile-elisp" >&5 # Check whether --enable-compile-elisp or --disable-compile-elisp was given. if test "${enable_compile_elisp+set}" = set; then enableval="$enable_compile_elisp" @@ -1599,7 +1612,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1603: checking for $ac_word" >&5 +echo "configure:1616: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_THEEMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1800,6 +1813,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/contrib/doc/sgml/Makefile.in +++ mozart-1.4.0/contrib/doc/sgml/Makefile.in @@ -22,6 +22,8 @@ all: $(TARGETS) install: $(NEWCACHEDIR) $(NEW_TARGETS) +$(NEW_TARGETS): $(NEWCACHEDIR) + $(LIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/contrib/doc/code/Fontifier.oz +++ mozart-1.4.0/contrib/doc/code/Fontifier.oz @@ -42,8 +42,6 @@ %%% {Fontifier.loadpath.push DIR} %%% %%% LOADPATH is a list of directories to add to emacs load-path. -%%% The default adds $OZHOME/share/elisp to search for oz specific -%%% elisp libraries. %%% %%% {Fontifier.requires.get FILES} %%% {Fontifier.requires.set FILES} @@ -142,7 +140,8 @@ ProcessRequest define EMACS = {NewCell 'emacs'} - EPATH = {NewCell [{Property.get 'oz.home'}#'/share/elisp']} + %% Changed for Debian/GNU: elisp files will be found on default path + EPATH = {NewCell nil} ELOAD = {NewCell ['oz' 'Fontifier']} ApiEmacs = o(get :proc {$ X} {Access EMACS X} end --- mozart-1.4.0.orig/contrib/doc/code/Makefile.in +++ mozart-1.4.0/contrib/doc/code/Makefile.in @@ -54,6 +54,9 @@ install: $(ELIB_DIR) $(ELIB_TARGETS) \ $(NEWCACHEDIR) $(NEW_TARGETS) +$(ELIB_TARGETS): $(ELIB_DIR) +$(NEW_TARGETS): $(NEWCACHEDIR) + $(LIB_DIR) $(ELIB_DIR) $(NEWCACHEDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/platform/configure +++ mozart-1.4.0/platform/configure @@ -586,7 +586,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1240,9 +1240,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1245: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1246: checking for OZLOADSEP" >&5 +echo "configure:1259: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1262,7 +1275,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1266: checking for OZLOADWIN" >&5 +echo "configure:1279: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1304,7 +1317,7 @@ : ${oz_enable_wish=yes} echo $ac_n "checking for --enable-wish""... $ac_c" 1>&6 -echo "configure:1308: checking for --enable-wish" >&5 +echo "configure:1321: checking for --enable-wish" >&5 # Check whether --enable-wish or --disable-wish was given. if test "${enable_wish+set}" = set; then enableval="$enable_wish" @@ -1509,6 +1522,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/emulator/vprops.cc +++ mozart-1.4.0/platform/emulator/vprops.cc @@ -46,10 +46,10 @@ #include -extern char *AMVersion, *AMDate; +extern const char *AMVersion, *AMDate; // "ozplatform" (defined in version.cc) has the form , -extern char *ozplatform; +extern const char *ozplatform; enum EmulatorPropertyIndex { // THREADS --- mozart-1.4.0.orig/platform/emulator/components.cc +++ mozart-1.4.0/platform/emulator/components.cc @@ -69,7 +69,7 @@ class ByteSource { public: virtual OZ_Return getBytes(BYTE*, int, int&) = 0; - virtual char *getHeader() = 0; + virtual const char *getHeader() = 0; virtual Bool checkChecksum(crc_t) = 0; OZ_Return getTerm(OZ_Term, const char *compname, Bool); OZ_Return loadPickleBuffer(PickleBuffer*&, const char*); @@ -81,7 +81,7 @@ crc_t checkSum; char *header; public: - char *getHeader() {return header; } + const char *getHeader() {return header; } virtual ~ByteSourceFD() { free(header); gzclose(fd); } OZ_Return getBytes(BYTE*, int, int&); @@ -136,7 +136,7 @@ OZ_Datum dat; int idx; public: - char *getHeader() {return ""; } + const char *getHeader() {return ""; } ByteSourceDatum(OZ_Datum d):dat(d),idx(0) {} virtual ~ByteSourceDatum() {} OZ_Return getBytes(BYTE*, int, int&); @@ -149,9 +149,9 @@ class ByteSink { public: - OZ_Return putTerm(OZ_Term,char*,char*,unsigned int,Bool,Bool); + OZ_Return putTerm(OZ_Term,const char*,const char*,unsigned int,Bool,Bool); virtual OZ_Return putBytes(BYTE*,int) = 0; - virtual OZ_Return allocateBytes(int,char*,unsigned int,crc_t,Bool) = 0; + virtual OZ_Return allocateBytes(int,const char*,unsigned int,crc_t,Bool) = 0; }; @@ -159,15 +159,15 @@ private: int fd; gzFile zfd; - char *filename; + const char *filename; int compressionlevel; public: - ByteSinkFile(char *s,int lvl): filename(s),fd(-1),zfd(0), compressionlevel(lvl) {} + ByteSinkFile(const char *s,int lvl): filename(s),fd(-1),zfd(0), compressionlevel(lvl) {} virtual ~ByteSinkFile() { if (zfd!=0) { gzclose(zfd); return; } if (fd!=-1) close(fd); } - OZ_Return allocateBytes(int,char*,unsigned int,crc_t,Bool); + OZ_Return allocateBytes(int,const char*,unsigned int,crc_t,Bool); OZ_Return putBytes(BYTE*,int); }; @@ -177,7 +177,7 @@ public: OZ_Datum dat; ByteSinkDatum():idx(0){ dat.size=0; dat.data=0; } - OZ_Return allocateBytes(int,char*,unsigned int,crc_t,Bool); + OZ_Return allocateBytes(int,const char*,unsigned int,crc_t,Bool); OZ_Return putBytes(BYTE*,int); }; @@ -186,13 +186,13 @@ // class ByteSink // =================================================================== -OZ_Term makeGenericExc(char *id,char *msg, OZ_Term arg) +OZ_Term makeGenericExc(const char *id, const char *msg, OZ_Term arg) { return OZ_makeException(E_ERROR,OZ_atom("dp"),"generic", 3,oz_atom(id),oz_atom(msg),arg); } -OZ_Return raiseGeneric(char *id, char *msg, OZ_Term arg) +OZ_Return raiseGeneric(const char *id, const char *msg, OZ_Term arg) { return OZ_raiseDebug(makeGenericExc(id,msg,arg)); } @@ -212,7 +212,7 @@ } OZ_Return -ByteSink::putTerm(OZ_Term in, char *filename, char *header, +ByteSink::putTerm(OZ_Term in, const char *filename, const char *header, unsigned int hlen, Bool textmode, Bool cloneCells) { @@ -306,7 +306,7 @@ // =================================================================== OZ_Return -ByteSinkFile::allocateBytes(int n,char * header, unsigned int hlen, crc_t crc, Bool txtmode) +ByteSinkFile::allocateBytes(int n, const char * header, unsigned int hlen, crc_t crc, Bool txtmode) { fd = strcmp(filename,"-")==0 ? STDOUT_FILENO : open(filename,O_WRONLY|O_CREAT|O_TRUNC,0666); @@ -361,7 +361,7 @@ // =================================================================== OZ_Return -ByteSinkDatum::allocateBytes(int n, char *, unsigned int, crc_t crc_ignored, +ByteSinkDatum::allocateBytes(int n, const char *, unsigned int, crc_t crc_ignored, Bool txtmode_ignored) { dat.size = n; @@ -410,7 +410,7 @@ } static -OZ_Return saveIt(OZ_Term val, char *filename, char *header, +OZ_Return saveIt(OZ_Term val, const char *filename, const char *header, unsigned int hlen, int compressionlevel, Bool textmode, Bool cloneCells) { @@ -819,7 +819,7 @@ static -void doRaise(TaggedRef controlvar, char *msg, const char *url,URLAction act) +void doRaise(TaggedRef controlvar, const char *msg, const char *url,URLAction act) { ControlVarRaise(controlvar, makeGenericExc("URLhandler", --- mozart-1.4.0.orig/platform/emulator/mozart.h +++ mozart-1.4.0/platform/emulator/mozart.h @@ -184,7 +184,7 @@ _FUNDECL(long ,OZ_intToCL,(OZ_Term)); _FUNDECL(unsigned long,OZ_intToCulong,(OZ_Term)); _FUNDECL(int ,OZ_boolToC,(OZ_Term)); -_FUNDECL(OZ_Term ,OZ_CStringToInt,(char *str)); +_FUNDECL(OZ_Term ,OZ_CStringToInt,(const char *str)); _FUNDECL(char * ,OZ_parseInt,(char *s)); _FUNDECL(OZ_Term ,OZ_float,(double)); @@ -204,7 +204,7 @@ _FUNDECL(char* ,OZ_vsToC,(OZ_Term t,int*n)); _FUNDECL(char * ,OZ_virtualStringToC,(OZ_Term t,int*n)); -_FUNDECL(OZ_Term ,OZ_mkByteString,(char*,int)); +_FUNDECL(OZ_Term ,OZ_mkByteString,(const char*,int)); /* tuples */ @@ -213,7 +213,7 @@ _FUNDECL(OZ_Term ,OZ_tuple,(OZ_Term, int)); #define OZ_tupleC(s,n) OZ_tuple(OZ_atom(s),n) _FUNDECL(OZ_Term ,OZ_mkTuple,(OZ_Term label,int arity,...)); -_FUNDECL(OZ_Term ,OZ_mkTupleC,(char *label,int arity,...)); +_FUNDECL(OZ_Term ,OZ_mkTupleC,(const char *label,int arity,...)); _FUNDECL(void ,OZ_putArg,(OZ_Term, int, OZ_Term)); _FUNDECL(OZ_Term ,OZ_getArg,(OZ_Term, int)); @@ -367,13 +367,13 @@ _FUNDECL(void ,OZ_sClone,(OZ_Term *)); /* raise exception */ -_FUNDECL(OZ_Return ,OZ_typeError,(int pos,char *type)); +_FUNDECL(OZ_Return ,OZ_typeError,(int pos,const char *type)); _FUNDECL(OZ_Return ,OZ_raise,(OZ_Term)); _FUNDECL(OZ_Return ,OZ_raiseDebug,(OZ_Term)); -_FUNDECL(OZ_Return ,OZ_raiseC,(char *label,int arity,...)); +_FUNDECL(OZ_Return ,OZ_raiseC,(const char *label,int arity,...)); _FUNDECL(OZ_Return ,OZ_raiseError,(OZ_Term)); -_FUNDECL(OZ_Return ,OZ_raiseErrorC,(char *label,int arity,...)); -_FUNDECL(OZ_Term ,OZ_makeException,(OZ_Term kind,OZ_Term key,char*label,int arity,...)); +_FUNDECL(OZ_Return ,OZ_raiseErrorC,(const char *label,int arity,...)); +_FUNDECL(OZ_Term ,OZ_makeException,(OZ_Term kind,OZ_Term key,const char* label,int arity,...)); /* Suspending builtins */ --- mozart-1.4.0.orig/platform/emulator/modVirtualString.spec +++ mozart-1.4.0/platform/emulator/modVirtualString.spec @@ -38,5 +38,22 @@ '+virtualString'], out => ['+byteString'], bi => BIvsToBs}, + # compute a CRC for a virtual string. This could be used to add a CRC + # to connection tickets, for instance. + 'getCRC' => { in => ['+virtualString'], + out => ['+int'], + BI => BIvsCRC}, + 'encodeBase64' => { + in => ['+virtualString'], + out => ['+string'], + BI => BIvsEncodeB64, + }, + 'decodeBase64' => { + in => ['+virtualString'], + out => ['+string'], + BI => BIvsDecodeB64, + }, + + ); 1;; --- mozart-1.4.0.orig/platform/emulator/foreign.cc +++ mozart-1.4.0/platform/emulator/foreign.cc @@ -454,12 +454,12 @@ return tagged2BigInt(term)->getUnsignedLong(); } -OZ_Term OZ_CStringToInt(char *str) +OZ_Term OZ_CStringToInt(const char *str) { if (!str || str[0] == '\0') return 0; - char *aux = str; + const char *aux = str; int sign = 1; if (aux[0] == '~') { aux++; @@ -1437,7 +1437,7 @@ return makeTaggedSRecord(SRecord::newSRecord(label,width)); } -OZ_Term OZ_mkTupleC(char *label,int arity,...) +OZ_Term OZ_mkTupleC(const char *label,int arity,...) { if (arity == 0) { return OZ_atom(label); @@ -1948,7 +1948,7 @@ return RAISE; } -OZ_Return OZ_raiseC(char *label,int arity,...) +OZ_Return OZ_raiseC(const char *label,int arity,...) { if (arity == 0) { return OZ_raise(OZ_atom(label)); @@ -1976,7 +1976,7 @@ return RAISE; } -OZ_Return OZ_raiseErrorC(char *label,int arity,...) +OZ_Return OZ_raiseErrorC(const char *label,int arity,...) { if (arity == 0) { return OZ_raiseError(OZ_atom(label)); @@ -1994,7 +1994,7 @@ return OZ_raiseError(tt); } -OZ_Term OZ_makeException(OZ_Term cat,OZ_Term key,char*label,int arity,...) +OZ_Term OZ_makeException(OZ_Term cat, OZ_Term key, const char* label, int arity,...) { OZ_Term exc=OZ_tuple(key,arity+1); OZ_putArg(exc,0,OZ_atom(label)); @@ -2151,7 +2151,7 @@ #endif } -OZ_Return OZ_typeError(int pos,char *type) +OZ_Return OZ_typeError(int pos,const char *type) { oz_typeError(pos,type); } --- mozart-1.4.0.orig/platform/emulator/parser.yy +++ mozart-1.4.0/platform/emulator/parser.yy @@ -90,9 +90,9 @@ } void checkDeprecation(OZ_Term coord); -void xyreportWarning(char *kind, char *msg, OZ_Term coord); -void xyreportError(char *kind, char *msg, OZ_Term coord); -void xyreportError(char *kind, char *msg, +void xyreportWarning(const char *kind, const char *msg, OZ_Term coord); +void xyreportError(const char *kind, const char *msg, OZ_Term coord); +void xyreportError(const char *kind, const char *msg, const char *file, int line, int column); @@ -105,7 +105,7 @@ static OZ_Term yyoutput; -static void xyerror(char *); +static void xyerror(const char *); //----------------- // Atom definitions @@ -517,7 +517,7 @@ } inline -OZ_Term makeInt(char * chars, OZ_Term pos) { +OZ_Term makeInt(const char * chars, OZ_Term pos) { SRecord * t = SRecord::newSRecord(PA_fInt, 2); t->setArg(0, OZ_CStringToInt(chars)); t->setArg(1, pos); @@ -1883,7 +1883,7 @@ %% void checkDeprecation(OZ_Term coord) { - char *msg = "use `if' instead of `case' for boolean conditionals"; + const char *msg = "use `if' instead of `case' for boolean conditionals"; if (xy_allowDeprecated) { xyreportWarning("deprecation warning",msg,coord); } else { @@ -1891,7 +1891,7 @@ } } -void xyreportWarning(char *kind, char *msg, OZ_Term coord) { +void xyreportWarning(const char *kind, const char *msg, OZ_Term coord) { OZ_Term args = oz_mklist(oz_pair2(PA_coord, coord), oz_pair2(PA_kind, OZ_atom(kind)), oz_pair2(PA_msg, OZ_atom(msg))); @@ -1899,7 +1899,7 @@ xy_errorMessages); } -void xyreportError(char *kind, char *msg, OZ_Term coord) { +void xyreportError(const char *kind, const char *msg, OZ_Term coord) { OZ_Term args = oz_mklist(oz_pair2(PA_coord, coord), oz_pair2(PA_kind, OZ_atom(kind)), oz_pair2(PA_msg, OZ_atom(msg))); @@ -1907,13 +1907,13 @@ xy_errorMessages); } -void xyreportError(char *kind, char *msg, const char *file, +void xyreportError(const char *kind, const char *msg, const char *file, int line, int column) { xyreportError(kind,msg,OZ_mkTupleC("pos",3,OZ_atom((char*)file), oz_int(line),oz_int(column))); } -static void xyerror(char *s) { +static void xyerror(const char *s) { if (!strncmp(s, "parse error", 11)) { if (strlen(s) > 13) { xyreportError("parse error", s + 13, xyFileName, xylino, xycharno()); --- mozart-1.4.0.orig/platform/emulator/emulate.cc +++ mozart-1.4.0/platform/emulator/emulate.cc @@ -620,7 +620,7 @@ TaggedRef auxTaggedA, auxTaggedB; int auxInt; - char *auxString; + const char *auxString; #ifdef THREADED if (init) { --- mozart-1.4.0.orig/platform/emulator/scanner.ll +++ mozart-1.4.0/platform/emulator/scanner.ll @@ -39,7 +39,7 @@ #include "parser.hh" -void xyreportError(char *kind, char *message, +void xyreportError(const char *kind, const char *message, const char *file, int line, int column); void xy_setScannerPrefix(); void xy_setParserExpect(); @@ -188,7 +188,7 @@ xyFileName[maxFileNameSize - 1] = '\0'; xyFileNameAtom = OZ_atom(fileName); xyin = filep; - BEGIN(INITIAL); + BEGIN(0); /*INITIAL isn't yet defined so we use the synonym 0.*/ xy_switch_to_buffer(xy_create_buffer(xyin, YY_BUF_SIZE)); xylino = 1; conditional_basep = conditional_p; @@ -327,7 +327,7 @@ } // search in OZPATH - char *path = osgetenv("OZPATH"); + const char *path = osgetenv("OZPATH"); if (path == NULL) path = "."; --- mozart-1.4.0.orig/platform/emulator/parser.hh +++ mozart-1.4.0/platform/emulator/parser.hh @@ -1,7 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.0. */ +/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Skeleton interface for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,13 +17,21 @@ 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ /* Tokens. */ #ifndef YYTOKENTYPE @@ -125,6 +135,7 @@ T_DEREFF = 351 }; #endif +/* Tokens. */ #define T_SWITCH 258 #define T_SWITCHNAME 259 #define T_LOCALSWITCHES 260 @@ -223,14 +234,16 @@ -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE -typedef union YYSTYPE { +{ OZ_Term t; int i; -} YYSTYPE; -/* Line 1318 of yacc.c. */ +} +/* Line 1489 of yacc.c. */ + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -238,5 +251,3 @@ extern YYSTYPE xylval; - - --- mozart-1.4.0.orig/platform/emulator/value.hh +++ mozart-1.4.0/platform/emulator/value.hh @@ -284,6 +284,7 @@ // #include #include +#include #ifndef GMP_NEEDS_CPLUSPLUS extern "C" { #endif @@ -2538,7 +2539,7 @@ * Builtin (incl. Builtin) *=================================================================== */ -class Builtin: public ConstTerm { +class Builtin: public ConstTermWithHome { friend void ConstTerm::gCollectConstRecurse(void); friend void ConstTerm::sCloneConstRecurse(void); private: --- mozart-1.4.0.orig/platform/emulator/base.cc +++ mozart-1.4.0/platform/emulator/base.cc @@ -52,7 +52,7 @@ prefixError(); } -extern char *AMVersion, *AMDate, *ozplatform; +extern const char *AMVersion, *AMDate, *ozplatform; void OZ_error(OZ_CONST char *format, ...) { @@ -149,7 +149,7 @@ // kost@ : very quick hack to kill emulators that are lost... Bool isDeadSTDOUT() { - char *buf = "\n"; + const char *buf = "\n"; fflush(stdout); if (write(fileno(stdout), buf, 1) == -1) return (TRUE); --- mozart-1.4.0.orig/platform/emulator/cpi_profile.cc +++ mozart-1.4.0/platform/emulator/cpi_profile.cc @@ -49,7 +49,7 @@ _all_headers = this; } -OZ_PropagatorProfile::OZ_PropagatorProfile(char * propagator_name) +OZ_PropagatorProfile::OZ_PropagatorProfile(const char * propagator_name) : _calls(0), _samples(0), _heap(0), _propagator_name(propagator_name) { @@ -62,7 +62,7 @@ } -void OZ_PropagatorProfile::operator = (char * propagator_name) +void OZ_PropagatorProfile::operator = (const char * propagator_name) { _propagator_name = propagator_name; } --- mozart-1.4.0.orig/platform/emulator/configure.in +++ mozart-1.4.0/platform/emulator/configure.in @@ -238,7 +238,7 @@ ;; esac ;; - *-i486|i486-darwin) + *-i*86|i*86-darwin) case `$CXX -dumpversion` in 2.95.3) oz_opt="-O3 -pipe -fschedule-insns2 -fregmove" @@ -259,6 +259,9 @@ EMULATE_CXXFLAGS=-finline-limit=500 ;; esac + if test "$enable_opt" = native; then + oz_om="-march=native -fomit-frame-pointer" + fi ;; *-sparc) @@ -375,11 +378,17 @@ fi CPPFLAGS="-DWINDOWS_EMULATOR -DDSS_STATIC_LINK $oz_a $CPPFLAGS" ;; - rhapsody* | darwin*) + rhapsody*) AC_DEFINE(RHAPSODY) EMULDFLAGS="-Wl,-keep_private_externs" TOOLLDCMD="$CC -dynamic -bundle -flat_namespace -undefined suppress" : ${oz_enable_modules_static=no} + ;; + darwin*) + AC_DEFINE(DARWIN) + EMULDFLAGS="-Wl,-keep_private_externs" + TOOLLDCMD="$CC -dynamic -bundle -flat_namespace -undefined suppress" + : ${oz_enable_modules_static=no} ;; *) AC_MSG_WARN(Unknown platform "$platform") --- mozart-1.4.0.orig/platform/emulator/statisti.hh +++ mozart-1.4.0/platform/emulator/statisti.hh @@ -124,7 +124,7 @@ extern Statistics ozstat; -void printTime(FILE *fd,char *s,unsigned int t); -void printMem(FILE *fd,char *s,double m); +void printTime(FILE *fd,const char *s,unsigned int t); +void printMem(FILE *fd,const char *s,double m); #endif --- mozart-1.4.0.orig/platform/emulator/cpi_expect.cc +++ mozart-1.4.0/platform/emulator/cpi_expect.cc @@ -33,13 +33,13 @@ #include "var_of.hh" #include "prop_int.hh" -void splitfname(const char * fname, char * &dirname, char * &basename) +void splitfname(const char * fname, const char * &dirname, const char * &basename) { const char delim_char = '/'; const int splitlen = 1024; static char split[splitlen]; - static char * empty = ""; + static const char * empty = ""; if (strlen(fname) > splitlen-1) { @@ -918,7 +918,7 @@ OZ_Term debug_frame = OZ_head(debug_frame_raw); const char * fname = OZ_atomToC(OZ_subtree(debug_frame, AtomFile)); - char * dirname, * basename; + const char * dirname, * basename; splitfname(fname, dirname, basename); --- mozart-1.4.0.orig/platform/emulator/thr_stack.cc +++ mozart-1.4.0/platform/emulator/thr_stack.cc @@ -111,7 +111,7 @@ } } -void splitfname(const char * fname, char * &dirname, char * &basename); +void splitfname(const char * fname, const char * &dirname, const char * &basename); TaggedRef TaskStack::findAbstrRecord(void) { @@ -138,7 +138,7 @@ if (return_value == NameUnit) { // retrieve information for enclosing procedure const char * fname = OZ_atomToC(abstr->getFile()); - char * dirname, * basename; + const char * dirname, * basename; // splitfname(fname, dirname, basename); // --- mozart-1.4.0.orig/platform/emulator/os.hh +++ mozart-1.4.0/platform/emulator/os.hh @@ -226,7 +226,7 @@ /* abstract acess to OS file handles */ int osread(int fd, void *buf, unsigned int len); -int oswrite(int fd, void *buf, unsigned int len); +int oswrite(int fd, const void *buf, unsigned int len); int osclose(int fd); void ossleep(int sec); int osgetpid(); @@ -242,11 +242,11 @@ /* check for EINTR and make sure everything is written */ -int ossafewrite(int fd, char *buf, unsigned int len); +int ossafewrite(int fd, const char *buf, unsigned int len); int ossaferead(int fd, char *buf, unsigned int len); char *ostmpnam(char *s); -char *osgetenv(char *var); +char *osgetenv(const char *var); char *oslocalhostname(); --- mozart-1.4.0.orig/platform/emulator/codearea.cc +++ mozart-1.4.0/platform/emulator/codearea.cc @@ -1481,11 +1481,12 @@ #ifdef RECINSTRFETCH -#define InstrDumpFile "fetchedInstr.dump" - void CodeArea::writeInstr(void){ FILE* ofile; - if((ofile = fopen(InstrDumpFile, "w"))){ + static char filename[1024]; + snprintf(filename,1000, "fetchedInstr%d.dump",getpid()); + if((ofile = fopen(filename, "a"))){ + fprintf(ofile,"DUMP BEGIN\n"); int i = fetchedInstr; // ofile=stdout; do { @@ -1496,13 +1497,14 @@ if(i >= RECINSTRFETCH) i = 0; } while (i != fetchedInstr); + fprintf(ofile,"DUMP END\n\n"); fclose(ofile); fprintf(stderr, "Wrote the %d most recently fetched instructions in file '%s'\n", - RECINSTRFETCH, InstrDumpFile); + RECINSTRFETCH, filename); fflush(stderr); } else - OZ_error("Cannot open file '%s'.", InstrDumpFile); + OZ_error("Cannot open file '%s'.", filename); } // CodeArea::writeInstr #endif --- mozart-1.4.0.orig/platform/emulator/scanner.cc +++ mozart-1.4.0/platform/emulator/scanner.cc @@ -1,8 +1,12 @@ + +#line 3 "/media/disk-1/Mozart-svn/trunk/mozart/platform/emulator/scanner.cc" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + #define yy_create_buffer xy_create_buffer #define yy_delete_buffer xy_delete_buffer -#define yy_scan_buffer xy_scan_buffer -#define yy_scan_string xy_scan_string -#define yy_scan_bytes xy_scan_bytes #define yy_flex_debug xy_flex_debug #define yy_init_buffer xy_init_buffer #define yy_flush_buffer xy_flush_buffer @@ -11,74 +15,118 @@ #define yyin xyin #define yyleng xyleng #define yylex xylex +#define yylineno xylineno #define yyout xyout #define yyrestart xyrestart #define yytext xytext - -/* A lexical scanner generated by flex */ - -/* Scanner skeleton version: - * $Header$ - */ +#define yywrap xywrap +#define yyalloc xyalloc +#define yyrealloc xyrealloc +#define yyfree xyfree #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ +/* begin standard C headers. */ #include -#include +#include +#include +#include +/* end standard C headers. */ -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 #endif +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; -#ifdef __cplusplus +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif -#include +#endif /* ! C99 */ + +#endif /* ! FLEXINT_H */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) -#define YY_USE_PROTOS #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -93,71 +141,70 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE xyrestart(xyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif + +extern int xyleng; -extern int yyleng; -extern FILE *yyin, *yyout; +extern FILE *xyin, *xyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ - /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + /* Undo effects of setting up xytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up xytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int yy_size_t; +#define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -194,12 +241,16 @@ */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -209,102 +260,138 @@ * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. + * (via xyrestart()), so that the user can continue scanning by + * just pointing xyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] -/* yy_hold_char holds the character lost when yytext is formed. */ +/* yy_hold_char holds the character lost when xytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - -int yyleng; +int xyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... +/* Flag which is used to allow xywrap()'s to do buffer switches + * instead of setting up a fresh xyin. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); +void xyrestart (FILE *input_file ); +void xy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE xy_create_buffer (FILE *file,int size ); +void xy_delete_buffer (YY_BUFFER_STATE b ); +void xy_flush_buffer (YY_BUFFER_STATE b ); +void xypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void xypop_buffer_state (void ); + +static void xyensure_buffer_stack (void ); +static void xy_load_buffer_state (void ); +static void xy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER xy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE xy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE xy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE xy_scan_bytes (yyconst char *bytes,int len ); + +void *xyalloc (yy_size_t ); +void *xyrealloc (void *,yy_size_t ); +void xyfree (void * ); -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); - -#define yy_new_buffer yy_create_buffer +#define yy_new_buffer xy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + xyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + xy_create_buffer(xyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + xyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + xy_create_buffer(xyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +/* Begin user sect3 */ -#define yywrap() 1 +#define xywrap(n) 1 #define YY_SKIP_YYWRAP + typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + +FILE *xyin = (FILE *) 0, *xyout = (FILE *) 0; + typedef int yy_state_type; -extern char *yytext; -#define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +extern int xylineno; + +int xylineno = 1; + +extern char *xytext; +#define yytext_ptr xytext + +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 ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. + * corresponding action - sets up xytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + xyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 219 #define YY_END_OF_BUFFER 220 -static yyconst short int yy_accept[664] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[664] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -381,7 +468,7 @@ 217, 20, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, 2, 1, 1, 1, 1, 1, 1, 1, @@ -413,7 +500,7 @@ 76, 76, 76, 76, 76 } ; -static yyconst int yy_meta[78] = +static yyconst flex_int32_t yy_meta[78] = { 0, 1, 1, 2, 1, 1, 3, 1, 1, 1, 4, 5, 6, 1, 7, 1, 1, 8, 8, 9, 10, @@ -425,7 +512,7 @@ 1, 8, 1, 1, 21, 21, 22 } ; -static yyconst short int yy_base[765] = +static yyconst flex_int16_t yy_base[765] = { 0, 0, 0, 75, 76, 78, 80, 82, 84, 103, 0, 180, 0, 257, 0, 333, 407, 481, 555, 629, 703, @@ -513,7 +600,7 @@ 3439, 3450, 3461, 3472 } ; -static yyconst short int yy_def[765] = +static yyconst flex_int16_t yy_def[765] = { 0, 663, 1, 664, 664, 665, 665, 666, 666, 663, 9, 663, 11, 663, 13, 667, 667, 668, 668, 669, 669, @@ -601,7 +688,7 @@ 663, 663, 663, 663 } ; -static yyconst short int yy_nxt[3571] = +static yyconst flex_int16_t yy_nxt[3571] = { 0, 30, 31, 32, 31, 33, 34, 35, 35, 36, 37, 38, 35, 35, 39, 40, 35, 40, 41, 42, 43, @@ -997,7 +1084,7 @@ 663, 663, 663, 663, 663, 663, 663, 663, 663, 663 } ; -static yyconst short int yy_chk[3571] = +static yyconst flex_int16_t yy_chk[3571] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1396,6 +1483,9 @@ static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int xy_flex_debug; +int xy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -1403,8 +1493,7 @@ #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#define INITIAL 0 +char *xytext; /* * Authors: * Martin Henz @@ -1442,7 +1531,7 @@ #include "parser.hh" -void xyreportError(char *kind, char *message, +void xyreportError(const char *kind, const char *message, const char *file, int line, int column); void xy_setScannerPrefix(); void xy_setParserExpect(); @@ -1457,7 +1546,6 @@ static int errorFlag; - //******************* // THE INPUT ROUTINE //******************* @@ -1500,7 +1588,6 @@ } } - //**************** // OUTPUT OF FLEX //**************** @@ -1508,7 +1595,6 @@ #undef YY_DECL #define YY_DECL static int xymylex() - //************************* // CONDITIONAL COMPILATION // uses a stack of flags; @@ -1564,7 +1650,6 @@ return 1; } - //*********************** // STACK OF FILE ENTRIES // for \insert @@ -1591,7 +1676,7 @@ xyFileName[maxFileNameSize - 1] = '\0'; xyFileNameAtom = OZ_atom(fileName); xyin = filep; - BEGIN(INITIAL); + BEGIN(0); /*INITIAL isn't yet defined so we use the synonym 0.*/ xy_switch_to_buffer(xy_create_buffer(xyin, YY_BUF_SIZE)); xylino = 1; conditional_basep = conditional_p; @@ -1620,7 +1705,6 @@ return 1; } - //********** // COMMENTS //********** @@ -1631,7 +1715,6 @@ static int commentoffset; static int commentlastmode; - //********************* // FILE NAME EXPANSION //********************* @@ -1730,7 +1813,7 @@ } // search in OZPATH - char *path = osgetenv("OZPATH"); + const char *path = osgetenv("OZPATH"); if (path == NULL) path = "."; @@ -1753,7 +1836,6 @@ return NULL; } - //*************************** // TREATING STRINGS AND SUCH //*************************** @@ -1883,11 +1965,10 @@ } } +#define INITIAL 0 #define COMMENT 1 - #define IGNOREDIRECTIVE 2 #define DIRECTIVE 3 - #define LINE 4 #define SWITCHDIR 5 #define INSERT 6 @@ -1895,12 +1976,52 @@ #define IFDEF 8 #define IFNDEF 9 #define UNDEF 10 - #define SCANNERPREFIX 11 #define PARSEREXPECT 12 - #define LEX 13 +#ifndef YY_NO_UNISTD_H +/* Special case for "unistd.h", since it is non-ANSI. We include it way + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#include +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int xylex_destroy (void ); + +int xyget_debug (void ); + +void xyset_debug (int debug_flag ); + +YY_EXTRA_TYPE xyget_extra (void ); + +void xyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *xyget_in (void ); + +void xyset_in (FILE * in_str ); + +FILE *xyget_out (void ); + +void xyset_out (FILE * out_str ); + +int xyget_leng (void ); + +char *xyget_text (void ); + +int xyget_lineno (void ); + +void xyset_lineno (int line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1908,65 +2029,30 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int xywrap (void ); #else -extern int yywrap YY_PROTO(( void )); -#endif +extern int xywrap (void ); #endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); #endif + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -1975,12 +2061,11 @@ #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( xytext, xyleng, 1, xyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1988,21 +2073,35 @@ */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + (c = getc( xyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ) \ buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ + if ( c == EOF && ferror( xyin ) ) \ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, xyin))==0 && ferror(xyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(xyin); \ + } \ + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -2023,14 +2122,20 @@ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int xylex (void); + +#define YY_DECL int xylex (void) +#endif /* !YY_DECL */ -/* Code executed at the beginning of each rule, after yytext and yyleng +/* Code executed at the beginning of each rule, after xytext and xyleng * have been set up. */ #ifndef YY_USER_ACTION @@ -2045,60 +2150,61 @@ #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; - register char *yy_cp = NULL, *yy_bp = NULL; + register char *yy_cp, *yy_bp; register int yy_act; - - - - - if ( yy_init ) + + if ( !(yy_init) ) { - yy_init = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ - if ( ! yyin ) - yyin = stdin; + if ( ! xyin ) + xyin = stdin; - if ( ! yyout ) - yyout = stdout; + if ( ! xyout ) + xyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + xyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + xy_create_buffer(xyin,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + xy_load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); - /* Support of yytext. */ - *yy_cp = yy_hold_char; + /* Support of xytext. */ + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register 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; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -2115,24 +2221,22 @@ yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: @@ -2164,6 +2268,7 @@ ; YY_BREAK case 6: +/* rule 6 can match eol */ YY_RULE_SETUP { xylino++; xylastline = xytext + 1; @@ -2255,6 +2360,7 @@ ; YY_BREAK case 24: +/* rule 24 can match eol */ YY_RULE_SETUP { BEGIN(INITIAL); xylino++; @@ -2268,7 +2374,6 @@ } YY_BREAK - case 25: YY_RULE_SETUP ; @@ -2278,6 +2383,7 @@ { errorFlag = 1; } YY_BREAK case 27: +/* rule 27 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2296,7 +2402,6 @@ } YY_BREAK - case 28: YY_RULE_SETUP { xylino = atol(xytext) - 1; } @@ -2324,6 +2429,7 @@ { errorFlag = 1; } YY_BREAK case 32: +/* rule 32 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2346,7 +2452,6 @@ } YY_BREAK - case 33: YY_RULE_SETUP { return '+'; } @@ -2368,6 +2473,7 @@ { errorFlag = 1; } YY_BREAK case 38: +/* rule 38 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2386,7 +2492,6 @@ } YY_BREAK - case 39: YY_RULE_SETUP { if (get_cond()) { @@ -2432,6 +2537,7 @@ { errorFlag = 1; } YY_BREAK case 42: +/* rule 42 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2454,8 +2560,8 @@ } YY_BREAK - case 43: +/* rule 43 can match eol */ YY_RULE_SETUP { if (get_cond()) { trans('`'); @@ -2475,6 +2581,7 @@ { errorFlag = 1; } YY_BREAK case 46: +/* rule 46 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2497,8 +2604,8 @@ } YY_BREAK - case 47: +/* rule 47 can match eol */ YY_RULE_SETUP { if (get_cond()) { trans('`'); @@ -2517,6 +2624,7 @@ { errorFlag = 1; } YY_BREAK case 50: +/* rule 50 can match eol */ YY_RULE_SETUP { if (errorFlag) xyreportError("directive error", @@ -2539,8 +2647,8 @@ } YY_BREAK - case 51: +/* rule 51 can match eol */ YY_RULE_SETUP { trans('`'); OZ_Term key = OZ_atom(xytext); @@ -2557,6 +2665,7 @@ { errorFlag = 1; } YY_BREAK case 54: +/* rule 54 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2579,8 +2688,8 @@ } YY_BREAK - case 55: +/* rule 55 can match eol */ YY_RULE_SETUP { trans('`'); OZ_Term key = OZ_atom(xytext); @@ -2597,6 +2706,7 @@ { errorFlag = 1; } YY_BREAK case 58: +/* rule 58 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2619,8 +2729,8 @@ } YY_BREAK - case 59: +/* rule 59 can match eol */ YY_RULE_SETUP { stripTrans('\''); xy_setScannerPrefix(); @@ -2636,6 +2746,7 @@ { errorFlag = 1; } YY_BREAK case 62: +/* rule 62 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2658,7 +2769,6 @@ } YY_BREAK - case 63: YY_RULE_SETUP { xy_setParserExpect(); @@ -2674,6 +2784,7 @@ { errorFlag = 1; } YY_BREAK case 66: +/* rule 66 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2701,6 +2812,7 @@ { BEGIN(INITIAL); return T_REGEX; } YY_BREAK case 68: +/* rule 68 can match eol */ YY_RULE_SETUP { BEGIN(INITIAL); stripRegex(); return T_REGEX; } YY_BREAK @@ -2753,9 +2865,9 @@ { return T_OTHERMUL; } YY_BREAK case 81: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_OTHERMUL; } YY_BREAK @@ -2784,6 +2896,7 @@ { return T_COLONEQUALS; } YY_BREAK case 88: +/* rule 88 can match eol */ YY_RULE_SETUP { // Hack to avoid strange parsing of X.1.1: // If "." is followed by integer, then @@ -2796,9 +2909,9 @@ stripDot(); return T_DOTINT; } YY_BREAK case 89: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { // Hack to avoid parsing error for a(b:1...): // If int is followed by ..., int is returned. @@ -2812,9 +2925,9 @@ { return T_OZINT; } YY_BREAK case 91: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_OZINT; } YY_BREAK @@ -2823,23 +2936,23 @@ { return T_OZFLOAT; } YY_BREAK case 93: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_UNIT_LABEL; } YY_BREAK case 94: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_TRUE_LABEL; } YY_BREAK case 95: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_FALSE_LABEL; } YY_BREAK @@ -2848,9 +2961,9 @@ { return T_andthen; } YY_BREAK case 97: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_andthen; } YY_BREAK @@ -2859,9 +2972,9 @@ { return T_at; } YY_BREAK case 99: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_at; } YY_BREAK @@ -2870,9 +2983,9 @@ { return T_attr; } YY_BREAK case 101: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_attr; } YY_BREAK @@ -2881,9 +2994,9 @@ { return T_case; } YY_BREAK case 103: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_case; } YY_BREAK @@ -2892,9 +3005,9 @@ { return T_catch; } YY_BREAK case 105: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_catch; } YY_BREAK @@ -2903,9 +3016,9 @@ { return T_choice; } YY_BREAK case 107: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_choice; } YY_BREAK @@ -2914,9 +3027,9 @@ { return T_class; } YY_BREAK case 109: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_class; } YY_BREAK @@ -2925,9 +3038,9 @@ { return T_cond; } YY_BREAK case 111: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_cond; } YY_BREAK @@ -2936,9 +3049,9 @@ { return T_declare; } YY_BREAK case 113: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_declare; } YY_BREAK @@ -2947,9 +3060,9 @@ { return T_define; } YY_BREAK case 115: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_define; } YY_BREAK @@ -2958,9 +3071,9 @@ { return T_dis; } YY_BREAK case 117: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_dis; } YY_BREAK @@ -2969,9 +3082,9 @@ { return T_do; } YY_BREAK case 119: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_do; } YY_BREAK @@ -2980,9 +3093,9 @@ { return T_else; } YY_BREAK case 121: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_else; } YY_BREAK @@ -2991,9 +3104,9 @@ { return T_elsecase; } YY_BREAK case 123: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 8; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 8; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elsecase; } YY_BREAK @@ -3002,9 +3115,9 @@ { return T_elseif; } YY_BREAK case 125: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elseif; } YY_BREAK @@ -3013,9 +3126,9 @@ { return T_elseof; } YY_BREAK case 127: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elseof; } YY_BREAK @@ -3024,9 +3137,9 @@ { return T_end; } YY_BREAK case 129: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_end; } YY_BREAK @@ -3035,9 +3148,9 @@ { return T_export; } YY_BREAK case 131: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_export; } YY_BREAK @@ -3046,9 +3159,9 @@ { return T_fail; } YY_BREAK case 133: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_fail; } YY_BREAK @@ -3061,9 +3174,9 @@ { return T_feat; } YY_BREAK case 136: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_feat; } YY_BREAK @@ -3072,9 +3185,9 @@ { return T_finally; } YY_BREAK case 138: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_finally; } YY_BREAK @@ -3083,9 +3196,9 @@ { return T_FOR; } YY_BREAK case 140: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_FOR; } YY_BREAK @@ -3094,9 +3207,9 @@ { return T_from; } YY_BREAK case 142: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_from; } YY_BREAK @@ -3105,9 +3218,9 @@ { return T_fun; } YY_BREAK case 144: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_fun; } YY_BREAK @@ -3116,9 +3229,9 @@ { return T_functor; } YY_BREAK case 146: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_functor; } YY_BREAK @@ -3127,9 +3240,9 @@ { return T_if; } YY_BREAK case 148: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_if; } YY_BREAK @@ -3138,9 +3251,9 @@ { return T_import; } YY_BREAK case 150: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_import; } YY_BREAK @@ -3149,9 +3262,9 @@ { return T_in; } YY_BREAK case 152: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_in; } YY_BREAK @@ -3160,9 +3273,9 @@ { if (xy_gumpSyntax) { BEGIN(LEX); return T_lex; } else return T_OZATOM; } YY_BREAK case 154: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (xy_gumpSyntax) { BEGIN(LEX); return T_lex; } else return T_ATOM_LABEL; } YY_BREAK @@ -3171,9 +3284,9 @@ { return T_local; } YY_BREAK case 156: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_local; } YY_BREAK @@ -3182,9 +3295,9 @@ { return T_lock; } YY_BREAK case 158: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_lock; } YY_BREAK @@ -3193,9 +3306,9 @@ { return T_meth; } YY_BREAK case 160: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_meth; } YY_BREAK @@ -3204,9 +3317,9 @@ { return xy_gumpSyntax? T_mode: T_OZATOM; } YY_BREAK case 162: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_mode: T_ATOM_LABEL; } YY_BREAK @@ -3215,9 +3328,9 @@ { return T_not; } YY_BREAK case 164: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_not; } YY_BREAK @@ -3226,9 +3339,9 @@ { return T_of; } YY_BREAK case 166: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_of; } YY_BREAK @@ -3237,9 +3350,9 @@ { return T_or; } YY_BREAK case 168: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_or; } YY_BREAK @@ -3248,9 +3361,9 @@ { return T_orelse; } YY_BREAK case 170: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_orelse; } YY_BREAK @@ -3259,9 +3372,9 @@ { return xy_gumpSyntax? T_parser: T_OZATOM; } YY_BREAK case 172: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_parser: T_ATOM_LABEL; } YY_BREAK @@ -3270,9 +3383,9 @@ { return T_prepare; } YY_BREAK case 174: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_prepare; } YY_BREAK @@ -3281,9 +3394,9 @@ { return T_proc; } YY_BREAK case 176: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_proc; } YY_BREAK @@ -3292,9 +3405,9 @@ { return xy_gumpSyntax? T_prod: T_OZATOM; } YY_BREAK case 178: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_prod: T_ATOM_LABEL; } YY_BREAK @@ -3303,9 +3416,9 @@ { return T_prop; } YY_BREAK case 180: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_prop; } YY_BREAK @@ -3314,9 +3427,9 @@ { return T_raise; } YY_BREAK case 182: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_raise; } YY_BREAK @@ -3325,9 +3438,9 @@ { return T_require; } YY_BREAK case 184: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_require; } YY_BREAK @@ -3336,9 +3449,9 @@ { return xy_gumpSyntax? T_scanner: T_OZATOM; } YY_BREAK case 186: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_scanner: T_ATOM_LABEL; } YY_BREAK @@ -3347,9 +3460,9 @@ { return T_self; } YY_BREAK case 188: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_self; } YY_BREAK @@ -3358,9 +3471,9 @@ { return T_skip; } YY_BREAK case 190: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_skip; } YY_BREAK @@ -3369,9 +3482,9 @@ { return xy_gumpSyntax? T_syn: T_OZATOM; } YY_BREAK case 192: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_syn: T_ATOM_LABEL; } YY_BREAK @@ -3380,9 +3493,9 @@ { return T_then; } YY_BREAK case 194: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_then; } YY_BREAK @@ -3391,9 +3504,9 @@ { return xy_gumpSyntax? T_token: T_OZATOM; } YY_BREAK case 196: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_token: T_ATOM_LABEL; } YY_BREAK @@ -3402,9 +3515,9 @@ { return T_thread; } YY_BREAK case 198: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_thread; } YY_BREAK @@ -3417,9 +3530,9 @@ { return T_try; } YY_BREAK case 201: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_try; } YY_BREAK @@ -3428,58 +3541,69 @@ { return T_unit; } YY_BREAK case 203: +/* rule 203 can match eol */ YY_RULE_SETUP { stripTrans('\''); return T_OZATOM; } YY_BREAK case 204: +/* rule 204 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal atom syntax",xyFileName,xylino,xycharno()); return T_OZATOM;} YY_BREAK case 205: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 205 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { stripTrans('\''); return T_ATOM_LABEL; } YY_BREAK case 206: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 206 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal atom syntax",xyFileName,xylino,xycharno()); return T_ATOM_LABEL;} YY_BREAK case 207: +/* rule 207 can match eol */ YY_RULE_SETUP { trans('`'); return T_VARIABLE; } YY_BREAK case 208: +/* rule 208 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal variable syntax",xyFileName,xylino,xycharno()); return T_VARIABLE;} YY_BREAK case 209: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 209 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { trans('`'); return T_VARIABLE_LABEL; } YY_BREAK case 210: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 210 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal variable syntax",xyFileName,xylino,xycharno()); return T_VARIABLE;} YY_BREAK case 211: +/* rule 211 can match eol */ YY_RULE_SETUP { stripTrans('\"'); return T_STRING; } YY_BREAK case 212: +/* rule 212 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal string syntax",xyFileName,xylino,xycharno()); return T_STRING;} YY_BREAK case 213: +/* rule 213 can match eol */ YY_RULE_SETUP { int i = 0; int j = 1; @@ -3498,6 +3622,7 @@ ; YY_BREAK case 216: +/* rule 216 can match eol */ YY_RULE_SETUP { xylino++; xylastline = xytext + 1; @@ -3535,26 +3660,26 @@ case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * just pointed xyin at a new source and called + * xylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = xyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -3564,13 +3689,13 @@ * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -3583,41 +3708,41 @@ yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( xywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up - * yytext, we can now set up + * xytext, we can now set up * yy_c_buf_p so that if some total * hoser (like flex itself) wants to * call the scanner after we return the * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -3625,30 +3750,30 @@ else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -3659,8 +3784,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of xylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -3669,21 +3793,20 @@ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -3703,34 +3826,30 @@ /* 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 = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -3743,8 +3862,7 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + xyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -3754,35 +3872,35 @@ YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), (size_t) num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + xyrestart(xyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -3790,32 +3908,39 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + if ((yy_size_t) ((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); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xyrealloc((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()" ); + } + + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; return ret_val; - } - +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 77); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3827,30 +3952,23 @@ } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 77; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3862,80 +3980,73 @@ yy_is_jam = (yy_current_state == 663); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + /* undo effects of setting up xytext */ + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -3949,16 +4060,16 @@ */ /* Reset buffer status. */ - yyrestart( yyin ); + xyrestart(xyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( xywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -3968,167 +4079,169 @@ } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve xytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void xyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + xyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + xy_create_buffer(xyin,YY_BUF_SIZE ); } + xy_init_buffer(YY_CURRENT_BUFFER,input_file ); + xy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void xy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * xypop_buffer_state(); + * xypush_buffer_state(new_buffer); + */ + xyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + xy_load_buffer_state( ); /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe + * EOF (xywrap()) processing, but the only time this flag + * is looked at is after xywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void xy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + xyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE xy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) xyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_create_buffer()" ); b->yy_buf_size = 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. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) xyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + xy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with xy_create_buffer() + * + */ + void xy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); + xyfree((void *) b->yy_ch_buf ); - yy_flex_free( (void *) b ); - } - - - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif + xyfree((void *) b ); +} +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a xyrestart() or at EOF. + */ + static void xy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + xy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - + /* If b is the current buffer, then xy_init_buffer was _probably_ + * called from xyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void xy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -4145,31 +4258,127 @@ b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + xy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void xypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + xyensure_buffer_stack(); + + /* This block is copied from xy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from xy_switch_to_buffer. */ + xy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void xypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + xy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + xy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void xyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * 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; + (yy_buffer_stack) = (struct yy_buffer_state**)xyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xyensure_buffer_stack()" ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; } + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)xyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) xyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_scan_buffer()" ); b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; @@ -4181,58 +4390,53 @@ b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + xy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to xylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * xy_scan_bytes() instead. + */ +YY_BUFFER_STATE xy_scan_string (yyconst char * yystr ) +{ + + return xy_scan_bytes(yystr,strlen(yystr) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to xylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); + n = _yybytes_len + 2; + buf = (char *) xyalloc(n ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = xy_scan_buffer(buf,n ); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in xy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -4240,148 +4444,196 @@ b->yy_is_our_buffer = 1; return b; - } +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; +/* Redefine yyless() so it works in section 3 code. */ - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up xytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + xytext[xyleng] = (yy_hold_char); \ + (yy_c_buf_p) = xytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + xyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Accessor methods (get/set functions) to struct members. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +/** Get the current line number. + * + */ +int xyget_lineno (void) +{ + + return xylineno; +} - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/** Get the input stream. + * + */ +FILE *xyget_in (void) +{ + return xyin; +} - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the output stream. + * + */ +FILE *xyget_out (void) +{ + return xyout; +} - BEGIN(new_state); - } -#endif +/** Get the length of the current token. + * + */ +int xyget_leng (void) +{ + return xyleng; +} +/** Get the current token. + * + */ -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +char *xyget_text (void) +{ + return xytext; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void xyset_lineno (int line_number ) +{ + + xylineno = line_number; +} +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see xy_switch_to_buffer + */ +void xyset_in (FILE * in_str ) +{ + xyin = in_str ; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +void xyset_out (FILE * out_str ) +{ + xyout = out_str ; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +int xyget_debug (void) +{ + return xy_flex_debug; +} + +void xyset_debug (int bdebug ) +{ + xy_flex_debug = bdebug ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from xylex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + xyin = stdin; + xyout = stdout; #else -static void yy_fatal_error( msg ) -char msg[]; + xyin = (FILE *) 0; + xyout = (FILE *) 0; #endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } - + /* For future reference: Set errno on error, since we are called by + * xylex_init() + */ + return 0; +} -/* Redefine yyless() so it works in section 3 code. */ +/* xylex_destroy is for both reentrant and non-reentrant scanners. */ +int xylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + xy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + xypop_buffer_state(); + } -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) + /* Destroy the stack itself. */ + xyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * xylex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *xyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *xyrealloc (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 @@ -4390,26 +4642,14 @@ * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } - -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } +} -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif +void xyfree (void * ptr ) +{ + free( (char *) ptr ); /* see xyrealloc() for (char *) cast */ +} +#define YYTABLES_NAME "yytables" static void xy_init(OZ_Term defines0) { xylino = 1; @@ -4475,3 +4715,4 @@ else return xylex(); } + --- mozart-1.4.0.orig/platform/emulator/text2pickle.cc +++ mozart-1.4.0/platform/emulator/text2pickle.cc @@ -123,10 +123,12 @@ int textmode() { return mode!=0; } void dump() { while(first->next) { - write(fd,first->text,TBSize); + int ret=write(fd,first->text,TBSize); + if(ret<=0)_exit(1); first = first->next; } - write(fd,first->text,pos); + int ret=write(fd,first->text,pos); + if(ret<=0)_exit(1); } unsigned long crc(); }; @@ -536,7 +538,8 @@ if (!out->textmode()) { int headerSize; char *header = makeHeader(out->crc(),&headerSize); - write(out->fd,header,headerSize); + int ret=write(out->fd,header,headerSize); + if(ret<0)_exit(1); } out->dump(); } --- mozart-1.4.0.orig/platform/emulator/dpInterface.cc +++ mozart-1.4.0/platform/emulator/dpInterface.cc @@ -34,11 +34,6 @@ #include "value.hh" #include "os.hh" -// -Bool dpReadyStub() { - return (NO); -} - // ports OZ_Return distPortSendStub(OzPort *p, TaggedRef msg, TaggedRef) { OZD_error("'distPortSend' called without DP library?"); @@ -149,9 +144,6 @@ // // Link interface function pointers against stubs; -// -Bool (*dpReady)() = dpReadyStub; - // ports OZ_Return (*distPortSend)(OzPort*, TaggedRef, TaggedRef) = distPortSendStub; --- mozart-1.4.0.orig/platform/emulator/configure +++ mozart-1.4.0/platform/emulator/configure @@ -629,7 +629,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1283,9 +1283,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1288: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1289: checking for OZLOADSEP" >&5 +echo "configure:1302: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1305,7 +1318,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1309: checking for OZLOADWIN" >&5 +echo "configure:1322: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1343,7 +1356,7 @@ echo $ac_n "checking for --enable-denys-events""... $ac_c" 1>&6 -echo "configure:1347: checking for --enable-denys-events" >&5 +echo "configure:1360: checking for --enable-denys-events" >&5 # Check whether --enable-denys-events or --disable-denys-events was given. if test "${enable_denys_events+set}" = set; then enableval="$enable_denys_events" @@ -1364,7 +1377,7 @@ echo $ac_n "checking for --enable-site-property""... $ac_c" 1>&6 -echo "configure:1368: checking for --enable-site-property" >&5 +echo "configure:1381: checking for --enable-site-property" >&5 # Check whether --enable-site-property or --disable-site-property was given. if test "${enable_site_property+set}" = set; then enableval="$enable_site_property" @@ -1387,7 +1400,7 @@ echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1391: checking build system type" >&5 +echo "configure:1404: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1413,7 +1426,7 @@ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1417: checking for $ac_word" >&5 +echo "configure:1430: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1445,7 +1458,7 @@ # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1449: checking for $ac_word" >&5 +echo "configure:1462: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1477,7 +1490,7 @@ # Extract the first word of "${ac_tool_prefix}dllwrap", so it can be a program name with args. set dummy ${ac_tool_prefix}dllwrap; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1481: checking for $ac_word" >&5 +echo "configure:1494: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLWRAP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1528,7 +1541,7 @@ echo $ac_n "checking for --with-sunpro""... $ac_c" 1>&6 -echo "configure:1532: checking for --with-sunpro" >&5 +echo "configure:1545: checking for --with-sunpro" >&5 # Check whether --with-sunpro or --without-sunpro was given. if test "${with_sunpro+set}" = set; then withval="$with_sunpro" @@ -1539,7 +1552,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1543: checking for $ac_word" >&5 +echo "configure:1556: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SUNPRO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1607,7 +1620,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1611: checking for $ac_word" >&5 +echo "configure:1624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1639,7 +1652,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1643: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1656: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1650,12 +1663,12 @@ cat > conftest.$ac_ext << EOF -#line 1654 "configure" +#line 1667 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1681,12 +1694,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1685: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1698: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1690: checking whether we are using GNU C++" >&5 +echo "configure:1703: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1695,7 +1708,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1714,7 +1727,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1718: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1731: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1752,7 +1765,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1756: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1769: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1885,7 +1898,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1889: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1902: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1916,7 +1929,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1920: checking how to run the C++ preprocessor" >&5 +echo "configure:1933: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1929,12 +1942,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1966,23 +1979,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1970: checking for C++ compiler" >&5 +echo "configure:1983: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1975: checking whether we are using GNU C++" >&5 +echo "configure:1988: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1980: checking for C++ preprocessor" >&5 +echo "configure:1993: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1986: checking for default CXXFLAGS" >&5 +echo "configure:1999: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1995,7 +2008,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1999: checking for $ac_word" >&5 +echo "configure:2012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2025,7 +2038,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2029: checking for $ac_word" >&5 +echo "configure:2042: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2076,7 +2089,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2080: checking for $ac_word" >&5 +echo "configure:2093: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2108,7 +2121,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2112: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2119,12 +2132,12 @@ cat > conftest.$ac_ext << EOF -#line 2123 "configure" +#line 2136 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2150,12 +2163,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2154: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2159: checking whether we are using GNU C" >&5 +echo "configure:2172: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2164,7 +2177,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2183,7 +2196,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2187: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2200: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2221,7 +2234,7 @@ else echo $ac_n "checking $CC version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:2225: checking $CC version is at least 3.3.2" >&5 +echo "configure:2238: checking $CC version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CC -dumpversion || $CC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2354,7 +2367,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking cc compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:2358: checking cc compiler option $ozm_opt" >&5 +echo "configure:2371: checking cc compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gccopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2385,7 +2398,7 @@ ;; esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2389: checking how to run the C preprocessor" >&5 +echo "configure:2402: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2400,13 +2413,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2417,13 +2430,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2434,13 +2447,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2472,23 +2485,23 @@ else echo $ac_n "checking for C compiler""... $ac_c" 1>&6 -echo "configure:2476: checking for C compiler" >&5 +echo "configure:2489: checking for C compiler" >&5 CC=$oz_cv_CC echo "$ac_t""(cached) $CC" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2481: checking whether we are using GNU C" >&5 +echo "configure:2494: checking whether we are using GNU C" >&5 GCC=$oz_cv_GCC echo "$ac_t""(cached) $GCC" 1>&6 echo $ac_n "checking for C preprocessor""... $ac_c" 1>&6 -echo "configure:2486: checking for C preprocessor" >&5 +echo "configure:2499: checking for C preprocessor" >&5 CPP=$oz_cv_CPP echo "$ac_t""(cached) $CPP" 1>&6 if test "${CFLAGS+set}" != set ; then echo $ac_n "checking for default CFLAGS""... $ac_c" 1>&6 -echo "configure:2492: checking for default CFLAGS" >&5 +echo "configure:2505: checking for default CFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -2507,7 +2520,7 @@ # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2511: checking for $ac_word" >&5 +echo "configure:2524: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2541,7 +2554,7 @@ *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2545: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2558: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2549,7 +2562,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2597,7 +2610,7 @@ else echo $ac_n "checking $LEX version is at least 2.5.3""... $ac_c" 1>&6 -echo "configure:2601: checking $LEX version is at least 2.5.3" >&5 +echo "configure:2614: checking $LEX version is at least 2.5.3" >&5 oz_tmp_ok=no if oz_tmp_version1=`$LEX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2725,7 +2738,7 @@ else echo $ac_n "checking for GNU flex""... $ac_c" 1>&6 -echo "configure:2729: checking for GNU flex" >&5 +echo "configure:2742: checking for GNU flex" >&5 LEX=$oz_cv_LEX echo "$ac_t""(cached) $LEX" 1>&6 fi @@ -2739,7 +2752,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2743: checking for $ac_word" >&5 +echo "configure:2756: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2782,7 +2795,7 @@ else echo $ac_n "checking $YACC version is at least 1.25""... $ac_c" 1>&6 -echo "configure:2786: checking $YACC version is at least 1.25" >&5 +echo "configure:2799: checking $YACC version is at least 1.25" >&5 oz_tmp_ok=no if oz_tmp_version1=`$YACC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2906,7 +2919,7 @@ else echo $ac_n "checking for GNU bison""... $ac_c" 1>&6 -echo "configure:2910: checking for GNU bison" >&5 +echo "configure:2923: checking for GNU bison" >&5 YACC=$oz_cv_YACC echo "$ac_t""(cached) $YACC" 1>&6 fi @@ -2914,7 +2927,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2918: checking whether ln -s works" >&5 +echo "configure:2931: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2941,7 +2954,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2945: checking for $ac_word" >&5 +echo "configure:2958: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3010,13 +3023,13 @@ else echo $ac_n "checking for GNU make""... $ac_c" 1>&6 -echo "configure:3014: checking for GNU make" >&5 +echo "configure:3027: checking for GNU make" >&5 MAKE=$oz_cv_MAKE echo "$ac_t""(cached) $MAKE" 1>&6 fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3020: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3033: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3045,7 +3058,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3049: checking for $ac_word" >&5 +echo "configure:3062: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3078,7 +3091,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3082: checking for $ac_word" >&5 +echo "configure:3095: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3115,7 +3128,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3119: checking for $ac_word" >&5 +echo "configure:3132: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3237,7 +3250,7 @@ else echo $ac_n "checking for perl""... $ac_c" 1>&6 -echo "configure:3241: checking for perl" >&5 +echo "configure:3254: checking for perl" >&5 PERL=$oz_cv_PERL echo "$ac_t""(cached) $PERL" 1>&6 fi @@ -3248,7 +3261,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3252: checking for $ac_word" >&5 +echo "configure:3265: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3284,7 +3297,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3288: checking for $ac_word" >&5 +echo "configure:3301: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3319,7 +3332,7 @@ # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3323: checking for $ac_word" >&5 +echo "configure:3336: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3418,7 +3431,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:3422: checking c++ compiler option $ozm_opt" >&5 +echo "configure:3435: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3453,7 +3466,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:3457: checking c++ compiler option $ozm_opt" >&5 +echo "configure:3470: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3480,7 +3493,7 @@ : ${oz_enable_warnings=no} echo $ac_n "checking for --enable-warnings""... $ac_c" 1>&6 -echo "configure:3484: checking for --enable-warnings" >&5 +echo "configure:3497: checking for --enable-warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then enableval="$enable_warnings" @@ -3492,7 +3505,7 @@ echo "$ac_t""$enable_warnings" 1>&6 : ${oz_enable_errors=no} echo $ac_n "checking for --enable-errors""... $ac_c" 1>&6 -echo "configure:3496: checking for --enable-errors" >&5 +echo "configure:3509: checking for --enable-errors" >&5 # Check whether --enable-errors or --disable-errors was given. if test "${enable_errors+set}" = set; then enableval="$enable_errors" @@ -3546,7 +3559,7 @@ ;; esac ;; - *-i486|i486-darwin) + *-i*86|i*86-darwin) case `$CXX -dumpversion` in 2.95.3) oz_opt="-O3 -pipe -fschedule-insns2 -fregmove" @@ -3567,6 +3580,9 @@ EMULATE_CXXFLAGS=-finline-limit=500 ;; esac + if test "$enable_opt" = native; then + oz_om="-march=native -fomit-frame-pointer" + fi ;; *-sparc) @@ -3707,7 +3723,7 @@ # gcc's '--export-dynamic': if the linker recognizes it, then let's use it: echo $ac_n "checking whether linker understands --export-dynamic""... $ac_c" 1>&6 -echo "configure:3711: checking whether linker understands --export-dynamic" >&5 +echo "configure:3727: checking whether linker understands --export-dynamic" >&5 if eval "test \"`echo '$''{'ac_cv_understand_export_dynamic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3722,14 +3738,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_understand_export_dynamic=yes else @@ -3780,7 +3796,7 @@ then for oz_opt in -E -B10000; do echo $ac_n "checking whether $M4 understands $oz_opt option""... $ac_c" 1>&6 -echo "configure:3784: checking whether $M4 understands $oz_opt option" >&5 +echo "configure:3800: checking whether $M4 understands $oz_opt option" >&5 oz_tmp=`$M4 $oz_opt < /dev/null 2>&1` if test -n "$oz_tmp" then @@ -3802,7 +3818,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:3806: checking c++ compiler option $ozm_opt" >&5 +echo "configure:3822: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3836,7 +3852,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:3840: checking c++ compiler option $ozm_opt" >&5 +echo "configure:3856: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3864,7 +3880,7 @@ echo $ac_n "checking for --enable-link-static""... $ac_c" 1>&6 -echo "configure:3868: checking for --enable-link-static" >&5 +echo "configure:3884: checking for --enable-link-static" >&5 # Check whether --enable-link-static or --disable-link-static was given. if test "${enable_link_static+set}" = set; then enableval="$enable_link_static" @@ -3887,12 +3903,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3891: checking for ANSI C header files" >&5 +echo "configure:3907: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3900,7 +3916,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3917,7 +3933,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3935,7 +3951,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3956,7 +3972,7 @@ : else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3994,12 +4010,12 @@ fi echo $ac_n "checking for key_t""... $ac_c" 1>&6 -echo "configure:3998: checking for key_t" >&5 +echo "configure:4014: checking for key_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_key_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4033,17 +4049,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4037: checking for $ac_hdr" >&5 +echo "configure:4053: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4073,17 +4089,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4077: checking for $ac_hdr" >&5 +echo "configure:4093: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4120,7 +4136,7 @@ ;; win32-i486) echo $ac_n "checking for main in -lkernel32""... $ac_c" 1>&6 -echo "configure:4124: checking for main in -lkernel32" >&5 +echo "configure:4140: checking for main in -lkernel32" >&5 ac_lib_var=`echo kernel32'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4128,14 +4144,14 @@ ac_save_LIBS="$LIBS" LIBS="-lkernel32 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4163,7 +4179,7 @@ fi echo $ac_n "checking for main in -lwsock32""... $ac_c" 1>&6 -echo "configure:4167: checking for main in -lwsock32" >&5 +echo "configure:4183: checking for main in -lwsock32" >&5 ac_lib_var=`echo wsock32'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4171,14 +4187,14 @@ ac_save_LIBS="$LIBS" LIBS="-lwsock32 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4206,7 +4222,7 @@ fi echo $ac_n "checking for opendir in -ldirent""... $ac_c" 1>&6 -echo "configure:4210: checking for opendir in -ldirent" >&5 +echo "configure:4226: checking for opendir in -ldirent" >&5 ac_lib_var=`echo dirent'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4214,7 +4230,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldirent $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4256,7 +4272,7 @@ fi echo $ac_n "checking for opendir in -lmingwex""... $ac_c" 1>&6 -echo "configure:4260: checking for opendir in -lmingwex" >&5 +echo "configure:4276: checking for opendir in -lmingwex" >&5 ac_lib_var=`echo mingwex'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4264,7 +4280,7 @@ ac_save_LIBS="$LIBS" LIBS="-lmingwex $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4308,7 +4324,7 @@ ;; irix6*) echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:4312: checking for fabs in -lm" >&5 +echo "configure:4328: checking for fabs in -lm" >&5 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4316,7 +4332,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4358,7 +4374,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4362: checking for dlopen in -ldl" >&5 +echo "configure:4378: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4366,7 +4382,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4410,7 +4426,7 @@ ;; *) echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 -echo "configure:4414: checking for gethostbyaddr in -lnsl" >&5 +echo "configure:4430: checking for gethostbyaddr in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4418,7 +4434,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4459,7 +4475,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyaddr in -lc""... $ac_c" 1>&6 -echo "configure:4463: checking for gethostbyaddr in -lc" >&5 +echo "configure:4479: checking for gethostbyaddr in -lc" >&5 ac_lib_var=`echo c'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4467,7 +4483,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4512,12 +4528,12 @@ echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 -echo "configure:4516: checking for gethostbyaddr" >&5 +echo "configure:4532: checking for gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyaddr=yes" else @@ -4569,7 +4585,7 @@ " 1>&2; exit 1; } fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:4573: checking for socket in -lsocket" >&5 +echo "configure:4589: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4577,7 +4593,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4620,12 +4636,12 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4624: checking for socket" >&5 +echo "configure:4640: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4677,7 +4693,7 @@ " 1>&2; exit 1; } fi echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 -echo "configure:4681: checking for fabs in -lm" >&5 +echo "configure:4697: checking for fabs in -lm" >&5 ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4685,7 +4701,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4728,12 +4744,12 @@ echo $ac_n "checking for fabs""... $ac_c" 1>&6 -echo "configure:4732: checking for fabs" >&5 +echo "configure:4748: checking for fabs" >&5 if eval "test \"`echo '$''{'ac_cv_func_fabs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_fabs=yes" else @@ -4785,7 +4801,7 @@ " 1>&2; exit 1; } fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4789: checking for dlopen in -ldl" >&5 +echo "configure:4805: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4793,7 +4809,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4840,12 +4856,12 @@ echo $ac_n "checking for setpgid""... $ac_c" 1>&6 -echo "configure:4844: checking for setpgid" >&5 +echo "configure:4860: checking for setpgid" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgid'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setpgid=yes" else @@ -4905,12 +4921,12 @@ for ac_func in dlopen do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4909: checking for $ac_func" >&5 +echo "configure:4925: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4962,7 +4978,7 @@ echo "checking whether we could allocate Oz heap with malloc ..." 1>&6 -echo "configure:4966: checking whether we could allocate Oz heap with malloc ..." >&5 +echo "configure:4982: checking whether we could allocate Oz heap with malloc ..." >&5 if eval "test \"`echo '$''{'ac_cv_can_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4973,14 +4989,14 @@ #introduce a conflicting prototype for malloc on MacOS X #so we need to check differently cat > conftest.$ac_ext < int main() { malloc(100); ; return 0; } EOF -if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <&6 -echo "configure:5002: checking for $ac_func" >&5 +echo "configure:5018: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5058,7 +5074,7 @@ esac if test $can_malloc = yes; then echo $ac_n "checking ... with a test program""... $ac_c" 1>&6 -echo "configure:5062: checking ... with a test program" >&5 +echo "configure:5078: checking ... with a test program" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5072,7 +5088,7 @@ can_malloc=no else cat > conftest.$ac_ext < @@ -5173,7 +5189,7 @@ } EOF -if { (eval echo configure:5177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""succeeded" 1>&6 else @@ -5204,7 +5220,7 @@ fi echo "checking whether we can allocate Oz heap via mmap..." 1>&6 -echo "configure:5208: checking whether we can allocate Oz heap via mmap..." >&5 +echo "configure:5224: checking whether we can allocate Oz heap via mmap..." >&5 if eval "test \"`echo '$''{'ac_cv_can_mmap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5212,12 +5228,12 @@ for ac_func in mmap do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5216: checking for $ac_func" >&5 +echo "configure:5232: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5270,7 +5286,7 @@ if test $can_mmap = yes; then echo $ac_n "checking ... with a test program""... $ac_c" 1>&6 -echo "configure:5274: checking ... with a test program" >&5 +echo "configure:5290: checking ... with a test program" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5284,7 +5300,7 @@ can_mmap=no else cat > conftest.$ac_ext < @@ -5366,7 +5382,7 @@ } EOF -if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""succeeded" 1>&6 else @@ -5397,7 +5413,7 @@ fi echo "checking whether we could allocate Oz heap via sbrk ..." 1>&6 -echo "configure:5401: checking whether we could allocate Oz heap via sbrk ..." >&5 +echo "configure:5417: checking whether we could allocate Oz heap via sbrk ..." >&5 if eval "test \"`echo '$''{'ac_cv_can_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5405,12 +5421,12 @@ for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5409: checking for $ac_func" >&5 +echo "configure:5425: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5463,7 +5479,7 @@ if test $can_sbrk = yes; then echo $ac_n "checking ... with a test program""... $ac_c" 1>&6 -echo "configure:5467: checking ... with a test program" >&5 +echo "configure:5483: checking ... with a test program" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -5477,7 +5493,7 @@ can_sbrk=no else cat > conftest.$ac_ext < @@ -5579,7 +5595,7 @@ } EOF -if { (eval echo configure:5583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""succeeded" 1>&6 else @@ -5611,7 +5627,7 @@ alloc_scheme=default echo $ac_n "checking for --enable-malloc-heap""... $ac_c" 1>&6 -echo "configure:5615: checking for --enable-malloc-heap" >&5 +echo "configure:5631: checking for --enable-malloc-heap" >&5 # Check whether --enable-malloc-heap or --disable-malloc-heap was given. if test "${enable_malloc_heap+set}" = set; then enableval="$enable_malloc_heap" @@ -5625,7 +5641,7 @@ fi echo $ac_n "checking for --enable-mmap-heap""... $ac_c" 1>&6 -echo "configure:5629: checking for --enable-mmap-heap" >&5 +echo "configure:5645: checking for --enable-mmap-heap" >&5 # Check whether --enable-mmap-heap or --disable-mmap-heap was given. if test "${enable_mmap_heap+set}" = set; then enableval="$enable_mmap_heap" @@ -5643,7 +5659,7 @@ fi echo $ac_n "checking for --enable-sbrk-heap""... $ac_c" 1>&6 -echo "configure:5647: checking for --enable-sbrk-heap" >&5 +echo "configure:5663: checking for --enable-sbrk-heap" >&5 # Check whether --enable-sbrk-heap or --disable-sbrk-heap was given. if test "${enable_sbrk_heap+set}" = set; then enableval="$enable_sbrk_heap" @@ -5705,12 +5721,12 @@ esac echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:5709: checking for strdup" >&5 +echo "configure:5725: checking for strdup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -5766,7 +5782,7 @@ if test "$ac_cv_lib_dl_dlopen" = yes || \ test "$ac_cv_func_dlopen" = yes; then echo $ac_n "checking whether dlopen needs leading underscore""... $ac_c" 1>&6 -echo "configure:5770: checking whether dlopen needs leading underscore" >&5 +echo "configure:5786: checking whether dlopen needs leading underscore" >&5 if eval "test \"`echo '$''{'oz_cv_dlopen_underscore'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5841,7 +5857,7 @@ extern "C" int foo() { return 1; } EOF - if { (eval echo configure:5845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then oz_tmp=`(strings -a conftest.o | grep foo) 2>/dev/null` ## on some platforms strings -a does not do the job ## but nm works fine (e.g. Darwin). So, in case we did @@ -5880,7 +5896,7 @@ # AC_C_BIGENDIAN echo $ac_n "checking for little-endianness""... $ac_c" 1>&6 -echo "configure:5884: checking for little-endianness" >&5 +echo "configure:5900: checking for little-endianness" >&5 if eval "test \"`echo '$''{'oz_cv_little_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5888,7 +5904,7 @@ { echo "configure: error: cannot determine endianness when cross-compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then oz_cv_little_endian=yes else @@ -5934,7 +5950,7 @@ if test "$oz_cv_little_endian" = yes; then echo $ac_n "checking for big-wordianness""... $ac_c" 1>&6 -echo "configure:5938: checking for big-wordianness" >&5 +echo "configure:5954: checking for big-wordianness" >&5 if eval "test \"`echo '$''{'oz_cv_big_wordian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5942,7 +5958,7 @@ { echo "configure: error: cannot determine wordianness when cross-compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then oz_cv_big_wordian=yes else @@ -6002,7 +6018,7 @@ win32*);; *) echo $ac_n "checking whether the times/sysconf(_SC_CLK_TCK) bug is present""... $ac_c" 1>&6 -echo "configure:6006: checking whether the times/sysconf(_SC_CLK_TCK) bug is present" >&5 +echo "configure:6022: checking whether the times/sysconf(_SC_CLK_TCK) bug is present" >&5 if eval "test \"`echo '$''{'oz_cv_times_sysconf_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6085,7 +6101,7 @@ if test "$oz_cv_times_sysconf_bug" = yes; then echo $ac_n "checking for times/sysconf(_SC_CLK_TCK) fix ratio""... $ac_c" 1>&6 -echo "configure:6089: checking for times/sysconf(_SC_CLK_TCK) fix ratio" >&5 +echo "configure:6105: checking for times/sysconf(_SC_CLK_TCK) fix ratio" >&5 echo "$ac_t""$oz_cv_CLKFIX" 1>&6 cat >> confdefs.h <&6 -echo "configure:6105: checking for --with-gmp" >&5 +echo "configure:6121: checking for --with-gmp" >&5 # Check whether --with-gmp or --without-gmp was given. if test "${with_gmp+set}" = set; then withval="$with_gmp" @@ -6130,7 +6146,7 @@ echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:6134: checking for gmp.h" >&5 +echo "configure:6150: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6141,12 +6157,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6163,12 +6179,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6211,7 +6227,7 @@ oz_inc_path="$oz_inc_path /usr/include/gmp2" echo $ac_n "checking for gmp.h""... $ac_c" 1>&6 -echo "configure:6215: checking for gmp.h" >&5 +echo "configure:6231: checking for gmp.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_gmp_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6222,12 +6238,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6244,12 +6260,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6297,7 +6313,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp___gmpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:6301: checking for library gmp" >&5 +echo "configure:6317: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp___gmpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp___gmpz_init if test "$oz_add_ldflags" = no; then @@ -6321,12 +6337,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for __gmpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:6325: checking for __gmpz_init in -lgmp (default)" >&5 +echo "configure:6341: checking for __gmpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6351,7 +6367,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6375,7 +6391,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6401,12 +6417,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:6405: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:6421: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6431,7 +6447,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6455,7 +6471,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6487,7 +6503,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6525,7 +6541,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6551,12 +6567,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for __gmpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:6555: checking for __gmpz_init in -L$p -lgmp" >&5 +echo "configure:6571: checking for __gmpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6581,7 +6597,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6605,7 +6621,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6637,7 +6653,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6680,7 +6696,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp_mpz_init"; then echo $ac_n "checking for library gmp""... $ac_c" 1>&6 -echo "configure:6684: checking for library gmp" >&5 +echo "configure:6700: checking for library gmp" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp_mpz_init if test "$oz_add_ldflags" = no; then @@ -6704,12 +6720,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp (default)""... $ac_c" 1>&6 -echo "configure:6708: checking for mpz_init in -lgmp (default)" >&5 +echo "configure:6724: checking for mpz_init in -lgmp (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6734,7 +6750,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6758,7 +6774,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6784,12 +6800,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:6788: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:6804: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6814,7 +6830,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6838,7 +6854,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6870,7 +6886,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6908,7 +6924,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -6934,12 +6950,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp""... $ac_c" 1>&6 -echo "configure:6938: checking for mpz_init in -L$p -lgmp" >&5 +echo "configure:6954: checking for mpz_init in -L$p -lgmp" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6964,7 +6980,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -6988,7 +7004,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7020,7 +7036,7 @@ oz_add_libs="-lgmp" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7063,7 +7079,7 @@ if test -n "$oz_cv_lib_path_ldflags_gmp2_mpz_init"; then echo $ac_n "checking for library gmp2""... $ac_c" 1>&6 -echo "configure:7067: checking for library gmp2" >&5 +echo "configure:7083: checking for library gmp2" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gmp2_mpz_init oz_add_libs=$oz_cv_lib_path_libs_gmp2_mpz_init if test "$oz_add_ldflags" = no; then @@ -7087,12 +7103,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for mpz_init in -lgmp2 (default)""... $ac_c" 1>&6 -echo "configure:7091: checking for mpz_init in -lgmp2 (default)" >&5 +echo "configure:7107: checking for mpz_init in -lgmp2 (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7117,7 +7133,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7141,7 +7157,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7167,12 +7183,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:7171: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:7187: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7197,7 +7213,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7221,7 +7237,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7253,7 +7269,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7291,7 +7307,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7317,12 +7333,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for mpz_init in -L$p -lgmp2""... $ac_c" 1>&6 -echo "configure:7321: checking for mpz_init in -L$p -lgmp2" >&5 +echo "configure:7337: checking for mpz_init in -L$p -lgmp2" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7347,7 +7363,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7371,7 +7387,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7403,7 +7419,7 @@ oz_add_libs="-lgmp2" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7505,7 +7521,7 @@ if test "$oz_gmp_lib_found" != no; then echo $ac_n "checking gmp version is at least 2""... $ac_c" 1>&6 -echo "configure:7509: checking gmp version is at least 2" >&5 +echo "configure:7525: checking gmp version is at least 2" >&5 if test -z "$oz_cv_gmp_version_ok"; then cat > conftest.$ac_ext < @@ -7635,7 +7651,7 @@ echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6 -echo "configure:7639: checking for --with-zlib" >&5 +echo "configure:7655: checking for --with-zlib" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" @@ -7663,7 +7679,7 @@ echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -echo "configure:7667: checking for zlib.h" >&5 +echo "configure:7683: checking for zlib.h" >&5 if eval "test \"`echo '$''{'oz_cv_header_zlib_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7674,12 +7690,12 @@ for oz_tmp in $oz_inc_path; do CPPFLAGS="$oz_tmp_cppflags -I$oz_tmp" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7696,12 +7712,12 @@ CPPFLAGS="$oz_tmp_cppflags" if test "$oz_tmp_ok" = no; then cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7747,7 +7763,7 @@ if test -n "$oz_cv_lib_path_ldflags_z_zlibVersion"; then echo $ac_n "checking for library z""... $ac_c" 1>&6 -echo "configure:7751: checking for library z" >&5 +echo "configure:7767: checking for library z" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_z_zlibVersion oz_add_libs=$oz_cv_lib_path_libs_z_zlibVersion if test "$oz_add_ldflags" = no; then @@ -7771,12 +7787,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for zlibVersion in -lz (default)""... $ac_c" 1>&6 -echo "configure:7775: checking for zlibVersion in -lz (default)" >&5 +echo "configure:7791: checking for zlibVersion in -lz (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7801,7 +7817,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7825,7 +7841,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -7851,12 +7867,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for zlibVersion in -L$p -lz""... $ac_c" 1>&6 -echo "configure:7855: checking for zlibVersion in -L$p -lz" >&5 +echo "configure:7871: checking for zlibVersion in -L$p -lz" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7881,7 +7897,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7905,7 +7921,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7937,7 +7953,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -7975,7 +7991,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -8001,12 +8017,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for zlibVersion in -L$p -lz""... $ac_c" 1>&6 -echo "configure:8005: checking for zlibVersion in -L$p -lz" >&5 +echo "configure:8021: checking for zlibVersion in -L$p -lz" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8031,7 +8047,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8055,7 +8071,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8087,7 +8103,7 @@ oz_add_libs="-lz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8130,7 +8146,7 @@ if test -n "$oz_cv_lib_path_ldflags_gz_zlibVersion"; then echo $ac_n "checking for library gz""... $ac_c" 1>&6 -echo "configure:8134: checking for library gz" >&5 +echo "configure:8150: checking for library gz" >&5 oz_add_ldflags=$oz_cv_lib_path_ldflags_gz_zlibVersion oz_add_libs=$oz_cv_lib_path_libs_gz_zlibVersion if test "$oz_add_ldflags" = no; then @@ -8154,12 +8170,12 @@ oz_add_ldflags=no oz_add_libs=no echo $ac_n "checking for zlibVersion in -lgz (default)""... $ac_c" 1>&6 -echo "configure:8158: checking for zlibVersion in -lgz (default)" >&5 +echo "configure:8174: checking for zlibVersion in -lgz (default)" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -8184,7 +8200,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -8208,7 +8224,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -8234,12 +8250,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for zlibVersion in -L$p -lgz""... $ac_c" 1>&6 -echo "configure:8238: checking for zlibVersion in -L$p -lgz" >&5 +echo "configure:8254: checking for zlibVersion in -L$p -lgz" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8264,7 +8280,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8288,7 +8304,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8320,7 +8336,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8358,7 +8374,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags=yes @@ -8384,12 +8400,12 @@ for p in $oz_lib_path; do LDFLAGS="-L$p $oz_tmp_ldflags" echo $ac_n "checking for zlibVersion in -L$p -lgz""... $ac_c" 1>&6 -echo "configure:8388: checking for zlibVersion in -L$p -lgz" >&5 +echo "configure:8404: checking for zlibVersion in -L$p -lgz" >&5 oz_saved_LIBS=$LIBS cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8414,7 +8430,7 @@ LIBS="$oz_add_libs${oz_saved_LIBS:+ }$oz_saved_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8438,7 +8454,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8470,7 +8486,7 @@ oz_add_libs="-lgz" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 oz_add_ldflags="-L$p" @@ -8571,7 +8587,7 @@ echo $ac_n "checking for --with-ccmalloc""... $ac_c" 1>&6 -echo "configure:8575: checking for --with-ccmalloc" >&5 +echo "configure:8591: checking for --with-ccmalloc" >&5 # Check whether --with-ccmalloc or --without-ccmalloc was given. if test "${with_ccmalloc+set}" = set; then withval="$with_ccmalloc" @@ -8583,7 +8599,7 @@ then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for main in -lccmalloc""... $ac_c" 1>&6 -echo "configure:8587: checking for main in -lccmalloc" >&5 +echo "configure:8603: checking for main in -lccmalloc" >&5 ac_lib_var=`echo ccmalloc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8591,14 +8607,14 @@ ac_save_LIBS="$LIBS" LIBS="-lccmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8636,7 +8652,7 @@ echo $ac_n "checking for --enable-opt""... $ac_c" 1>&6 -echo "configure:8640: checking for --enable-opt" >&5 +echo "configure:8656: checking for --enable-opt" >&5 # Check whether --enable-opt or --disable-opt was given. if test "${enable_opt+set}" = set; then enableval="$enable_opt" @@ -8659,7 +8675,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:8663: checking c++ compiler option $ozm_opt" >&5 +echo "configure:8679: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8701,7 +8717,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:8705: checking c++ compiler option $ozm_opt" >&5 +echo "configure:8721: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8741,7 +8757,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:8745: checking c++ compiler option $ozm_opt" >&5 +echo "configure:8761: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8782,7 +8798,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:8786: checking c++ compiler option $ozm_opt" >&5 +echo "configure:8802: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8813,7 +8829,7 @@ echo $ac_n "checking for --enable-threaded""... $ac_c" 1>&6 -echo "configure:8817: checking for --enable-threaded" >&5 +echo "configure:8833: checking for --enable-threaded" >&5 # Check whether --enable-threaded or --disable-threaded was given. if test "${enable_threaded+set}" = set; then enableval="$enable_threaded" @@ -8838,7 +8854,7 @@ echo $ac_n "checking for --enable-fastreg""... $ac_c" 1>&6 -echo "configure:8842: checking for --enable-fastreg" >&5 +echo "configure:8858: checking for --enable-fastreg" >&5 # Check whether --enable-fastreg or --disable-fastreg was given. if test "${enable_fastreg+set}" = set; then enableval="$enable_fastreg" @@ -8863,7 +8879,7 @@ echo $ac_n "checking for --enable-fasterreg""... $ac_c" 1>&6 -echo "configure:8867: checking for --enable-fasterreg" >&5 +echo "configure:8883: checking for --enable-fasterreg" >&5 # Check whether --enable-fasterreg or --disable-fasterreg was given. if test "${enable_fasterreg+set}" = set; then enableval="$enable_fasterreg" @@ -8888,7 +8904,7 @@ echo $ac_n "checking for --enable-fastarith""... $ac_c" 1>&6 -echo "configure:8892: checking for --enable-fastarith" >&5 +echo "configure:8908: checking for --enable-fastarith" >&5 # Check whether --enable-fastarith or --disable-fastarith was given. if test "${enable_fastarith+set}" = set; then enableval="$enable_fastarith" @@ -8913,7 +8929,7 @@ echo $ac_n "checking for --enable-modules-static""... $ac_c" 1>&6 -echo "configure:8917: checking for --enable-modules-static" >&5 +echo "configure:8933: checking for --enable-modules-static" >&5 # Check whether --enable-modules-static or --disable-modules-static was given. if test "${enable_modules_static+set}" = set; then enableval="$enable_modules_static" @@ -8968,7 +8984,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:8972: checking c++ compiler option $ozm_opt" >&5 +echo "configure:8988: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9003,7 +9019,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:9007: checking c++ compiler option $ozm_opt" >&5 +echo "configure:9023: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9055,7 +9071,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking cc compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:9059: checking cc compiler option $ozm_opt" >&5 +echo "configure:9075: checking cc compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gccopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9090,7 +9106,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking cc compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:9094: checking cc compiler option $ozm_opt" >&5 +echo "configure:9110: checking cc compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gccopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9129,7 +9145,7 @@ if test -z "$with_ccmalloc" then echo $ac_n "checking for --with-malloc""... $ac_c" 1>&6 -echo "configure:9133: checking for --with-malloc" >&5 +echo "configure:9149: checking for --with-malloc" >&5 # Check whether --with-malloc or --without-malloc was given. if test "${with_malloc+set}" = set; then withval="$with_malloc" @@ -9153,14 +9169,14 @@ echo $ac_n "checking whether socklen_t is declared...""... $ac_c" 1>&6 -echo "configure:9157: checking whether socklen_t is declared..." >&5 +echo "configure:9173: checking whether socklen_t is declared..." >&5 if eval "test \"`echo '$''{'oz_cv_have_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -9171,7 +9187,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -9201,24 +9217,24 @@ fi echo "checking whether we can do virtual sites..." 1>&6 -echo "configure:9205: checking whether we can do virtual sites..." >&5 +echo "configure:9221: checking whether we can do virtual sites..." >&5 if eval "test \"`echo '$''{'ac_cv_can_vs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else can_vs=yes ac_safe=`echo "sys/types.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/types.h""... $ac_c" 1>&6 -echo "configure:9212: checking for sys/types.h" >&5 +echo "configure:9228: checking for sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9222: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9242,17 +9258,17 @@ ac_safe=`echo "unistd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unistd.h""... $ac_c" 1>&6 -echo "configure:9246: checking for unistd.h" >&5 +echo "configure:9262: checking for unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9276,17 +9292,17 @@ ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:9280: checking for sys/ipc.h" >&5 +echo "configure:9296: checking for sys/ipc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9310,17 +9326,17 @@ ac_safe=`echo "sys/shm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/shm.h""... $ac_c" 1>&6 -echo "configure:9314: checking for sys/shm.h" >&5 +echo "configure:9330: checking for sys/shm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9345,12 +9361,12 @@ for ac_func in shmget do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9349: checking for $ac_func" >&5 +echo "configure:9365: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9404,12 +9420,12 @@ for ac_func in shmat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9408: checking for $ac_func" >&5 +echo "configure:9424: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9463,12 +9479,12 @@ for ac_func in shmdt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9467: checking for $ac_func" >&5 +echo "configure:9483: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9522,12 +9538,12 @@ for ac_func in shmctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9526: checking for $ac_func" >&5 +echo "configure:9542: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9580,13 +9596,13 @@ if test $can_vs = yes; then echo $ac_n "checking shared memory with a test program""... $ac_c" 1>&6 -echo "configure:9584: checking shared memory with a test program" >&5 +echo "configure:9600: checking shared memory with a test program" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""dunno (no)" 1>&6 can_vs=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""succeeded" 1>&6 else @@ -9733,7 +9749,7 @@ echo $ac_n "checking for --enable-virtualsites""... $ac_c" 1>&6 -echo "configure:9737: checking for --enable-virtualsites" >&5 +echo "configure:9753: checking for --enable-virtualsites" >&5 # Check whether --enable-virtualsites or --disable-virtualsites was given. if test "${enable_virtualsites+set}" = set; then enableval="$enable_virtualsites" @@ -9759,7 +9775,7 @@ echo $ac_n "checking for --enable-miscbuiltins""... $ac_c" 1>&6 -echo "configure:9763: checking for --enable-miscbuiltins" >&5 +echo "configure:9779: checking for --enable-miscbuiltins" >&5 # Check whether --enable-miscbuiltins or --disable-miscbuiltins was given. if test "${enable_miscbuiltins+set}" = set; then enableval="$enable_miscbuiltins" @@ -9784,12 +9800,12 @@ echo $ac_n "checking whether .align is multiple""... $ac_c" 1>&6 -echo "configure:9788: checking whether .align is multiple" >&5 +echo "configure:9804: checking whether .align is multiple" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -9866,12 +9882,12 @@ echo $ac_n "checking whether .align is power of 2""... $ac_c" 1>&6 -echo "configure:9870: checking whether .align is power of 2" >&5 +echo "configure:9886: checking whether .align is power of 2" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""no" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -9948,12 +9964,12 @@ echo $ac_n "checking alignment of secondary tag for const terms""... $ac_c" 1>&6 -echo "configure:9952: checking alignment of secondary tag for const terms" >&5 +echo "configure:9968: checking alignment of secondary tag for const terms" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assume optimistic ok for cross compilation" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""ok" 1>&6 else @@ -9988,13 +10004,13 @@ echo $ac_n "checking if alignment of secondary tags for extensions needs padding""... $ac_c" 1>&6 -echo "configure:9992: checking if alignment of secondary tags for extensions needs padding" >&5 +echo "configure:10008: checking if alignment of secondary tags for extensions needs padding" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assume optimistic no for cross compilation" 1>&6 needs_padding=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""no" 1>&6 needs_padding=no @@ -10040,12 +10056,12 @@ if test "$needs_padding" = "yes"; then echo $ac_n "checking if padding works""... $ac_c" 1>&6 -echo "configure:10044: checking if padding works" >&5 +echo "configure:10060: checking if padding works" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: we should not get here when cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 NEEDS_PADDING=1 @@ -10247,6 +10263,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/emulator/winscanner.cc +++ mozart-1.4.0/platform/emulator/winscanner.cc @@ -1,8 +1,12 @@ + +#line 3 "/media/disk-1/Mozart-svn/trunk/mozart/platform/emulator/scanner.cc" + +#define YY_INT_ALIGNED short int + +/* A lexical scanner generated by flex */ + #define yy_create_buffer xy_create_buffer #define yy_delete_buffer xy_delete_buffer -#define yy_scan_buffer xy_scan_buffer -#define yy_scan_string xy_scan_string -#define yy_scan_bytes xy_scan_bytes #define yy_flex_debug xy_flex_debug #define yy_init_buffer xy_init_buffer #define yy_flush_buffer xy_flush_buffer @@ -11,73 +15,118 @@ #define yyin xyin #define yyleng xyleng #define yylex xylex +#define yylineno xylineno #define yyout xyout #define yyrestart xyrestart #define yytext xytext - -/* A lexical scanner generated by flex */ - -/* Scanner skeleton version: - * $Header$ - */ +#define yywrap xywrap +#define yyalloc xyalloc +#define yyrealloc xyrealloc +#define yyfree xyfree #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 +#define YY_FLEX_SUBMINOR_VERSION 35 +#if YY_FLEX_SUBMINOR_VERSION > 0 +#define FLEX_BETA +#endif + +/* First, we deal with platform-specific or compiler-specific issues. */ +/* begin standard C headers. */ #include +#include +#include +#include +/* end standard C headers. */ -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif +/* flex integer type definitions */ + +#ifndef FLEXINT_H +#define FLEXINT_H + +/* C99 systems have . Non-C99 systems may or may not. */ + +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + +/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, + * if you want the limit (max/min) macros for int types. + */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS 1 #endif +#include +typedef int8_t flex_int8_t; +typedef uint8_t flex_uint8_t; +typedef int16_t flex_int16_t; +typedef uint16_t flex_uint16_t; +typedef int32_t flex_int32_t; +typedef uint32_t flex_uint32_t; +#else +typedef signed char flex_int8_t; +typedef short int flex_int16_t; +typedef int flex_int32_t; +typedef unsigned char flex_uint8_t; +typedef unsigned short int flex_uint16_t; +typedef unsigned int flex_uint32_t; -#ifdef __cplusplus +/* Limits of integral types. */ +#ifndef INT8_MIN +#define INT8_MIN (-128) +#endif +#ifndef INT16_MIN +#define INT16_MIN (-32767-1) +#endif +#ifndef INT32_MIN +#define INT32_MIN (-2147483647-1) +#endif +#ifndef INT8_MAX +#define INT8_MAX (127) +#endif +#ifndef INT16_MAX +#define INT16_MAX (32767) +#endif +#ifndef INT32_MAX +#define INT32_MAX (2147483647) +#endif +#ifndef UINT8_MAX +#define UINT8_MAX (255U) +#endif +#ifndef UINT16_MAX +#define UINT16_MAX (65535U) +#endif +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif -#include +#endif /* ! C99 */ -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS +#endif /* ! FLEXINT_H */ + +#ifdef __cplusplus /* The "const" storage-class-modifier is valid. */ #define YY_USE_CONST #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) -#define YY_USE_PROTOS #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else #define yyconst #endif - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - /* Returned upon end-of-file. */ #define YY_NULL 0 @@ -92,71 +141,70 @@ * but we do it the disgusting crufty way forced on us by the ()-less * definition of BEGIN. */ -#define BEGIN yy_start = 1 + 2 * +#define BEGIN (yy_start) = 1 + 2 * /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ -#define YY_START ((yy_start - 1) / 2) +#define YY_START (((yy_start) - 1) / 2) #define YYSTATE YY_START /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) +#define YY_NEW_FILE xyrestart(xyin ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ +#ifndef YY_BUF_SIZE #define YY_BUF_SIZE 16384 +#endif + +/* The state buf must be large enough to hold one state per character in the main buffer. + */ +#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) +#ifndef YY_TYPEDEF_YY_BUFFER_STATE +#define YY_TYPEDEF_YY_BUFFER_STATE typedef struct yy_buffer_state *YY_BUFFER_STATE; +#endif -extern int yyleng; -extern FILE *yyin, *yyout; +extern int xyleng; + +extern FILE *xyin, *xyout; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - + #define YY_LESS_LINENO(n) + +/* Return all but the first "n" matched characters back to the input stream. */ #define yyless(n) \ do \ { \ - /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ + /* Undo effects of setting up xytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + *yy_cp = (yy_hold_char); \ YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up xytext again */ \ } \ while ( 0 ) -#define unput(c) yyunput( c, yytext_ptr ) - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int yy_size_t; +#define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif +#ifndef YY_STRUCT_YY_BUFFER_STATE +#define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state { FILE *yy_input_file; @@ -193,12 +241,16 @@ */ int yy_at_bol; + int yy_bs_lineno; /**< The line count. */ + int yy_bs_column; /**< The column count. */ + /* Whether to try to fill the input buffer when we reach the * end of it. */ int yy_fill_buffer; int yy_buffer_status; + #define YY_BUFFER_NEW 0 #define YY_BUFFER_NORMAL 1 /* When an EOF's been seen but there's still some text to process @@ -208,102 +260,138 @@ * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. + * (via xyrestart()), so that the user can continue scanning by + * just pointing xyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 + }; +#endif /* !YY_STRUCT_YY_BUFFER_STATE */ -static YY_BUFFER_STATE yy_current_buffer = 0; +/* Stack of input buffers. */ +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */ +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */ +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* We provide macros for accessing buffer states in case in the * future we want to put the buffer states in a more general * "scanner state". + * + * Returns the top of the stack, or NULL. */ -#define YY_CURRENT_BUFFER yy_current_buffer +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \ + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \ + : NULL) +/* Same as previous macro, but useful when we know that the buffer stack is not + * NULL or when we need an lvalue. For internal use only. + */ +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)] -/* yy_hold_char holds the character lost when yytext is formed. */ +/* yy_hold_char holds the character lost when xytext is formed. */ static char yy_hold_char; - static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - -int yyleng; +int xyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ +static int yy_init = 0; /* whether we need to initialize */ static int yy_start = 0; /* start state number */ -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... +/* Flag which is used to allow xywrap()'s to do buffer switches + * instead of setting up a fresh xyin. A bit of a hack ... */ static int yy_did_buffer_switch_on_eof; -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); +void xyrestart (FILE *input_file ); +void xy_switch_to_buffer (YY_BUFFER_STATE new_buffer ); +YY_BUFFER_STATE xy_create_buffer (FILE *file,int size ); +void xy_delete_buffer (YY_BUFFER_STATE b ); +void xy_flush_buffer (YY_BUFFER_STATE b ); +void xypush_buffer_state (YY_BUFFER_STATE new_buffer ); +void xypop_buffer_state (void ); + +static void xyensure_buffer_stack (void ); +static void xy_load_buffer_state (void ); +static void xy_init_buffer (YY_BUFFER_STATE b,FILE *file ); + +#define YY_FLUSH_BUFFER xy_flush_buffer(YY_CURRENT_BUFFER ) + +YY_BUFFER_STATE xy_scan_buffer (char *base,yy_size_t size ); +YY_BUFFER_STATE xy_scan_string (yyconst char *yy_str ); +YY_BUFFER_STATE xy_scan_bytes (yyconst char *bytes,int len ); + +void *xyalloc (yy_size_t ); +void *xyrealloc (void *,yy_size_t ); +void xyfree (void * ); -#define yy_new_buffer yy_create_buffer +#define yy_new_buffer xy_create_buffer #define yy_set_interactive(is_interactive) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ + if ( ! YY_CURRENT_BUFFER ){ \ + xyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + xy_create_buffer(xyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } #define yy_set_bol(at_bol) \ { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ + if ( ! YY_CURRENT_BUFFER ){\ + xyensure_buffer_stack (); \ + YY_CURRENT_BUFFER_LVALUE = \ + xy_create_buffer(xyin,YY_BUF_SIZE ); \ + } \ + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) +/* Begin user sect3 */ -#define yywrap() 1 +#define xywrap(n) 1 #define YY_SKIP_YYWRAP + typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; + +FILE *xyin = (FILE *) 0, *xyout = (FILE *) 0; + typedef int yy_state_type; -extern char *yytext; -#define yytext_ptr yytext -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); +extern int xylineno; + +int xylineno = 1; + +extern char *xytext; +#define yytext_ptr xytext + +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 ); +static void yy_fatal_error (yyconst char msg[] ); /* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. + * corresponding action - sets up xytext. */ #define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ + (yytext_ptr) = yy_bp; \ + xyleng = (size_t) (yy_cp - yy_bp); \ + (yy_hold_char) = *yy_cp; \ *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; + (yy_c_buf_p) = yy_cp; #define YY_NUM_RULES 219 #define YY_END_OF_BUFFER 220 -static yyconst short int yy_accept[664] = +/* This struct is not used in this scanner, + but its presence is necessary. */ +struct yy_trans_info + { + flex_int32_t yy_verify; + flex_int32_t yy_nxt; + }; +static yyconst flex_int16_t yy_accept[664] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -380,7 +468,7 @@ 217, 20, 0 } ; -static yyconst int yy_ec[256] = +static yyconst flex_int32_t yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 4, 2, 1, 1, 1, 1, 1, 1, 1, @@ -412,7 +500,7 @@ 76, 76, 76, 76, 76 } ; -static yyconst int yy_meta[78] = +static yyconst flex_int32_t yy_meta[78] = { 0, 1, 1, 2, 1, 1, 3, 1, 1, 1, 4, 5, 6, 1, 7, 1, 1, 8, 8, 9, 10, @@ -424,7 +512,7 @@ 1, 8, 1, 1, 21, 21, 22 } ; -static yyconst short int yy_base[765] = +static yyconst flex_int16_t yy_base[765] = { 0, 0, 0, 75, 76, 78, 80, 82, 84, 103, 0, 180, 0, 257, 0, 333, 407, 481, 555, 629, 703, @@ -512,7 +600,7 @@ 3439, 3450, 3461, 3472 } ; -static yyconst short int yy_def[765] = +static yyconst flex_int16_t yy_def[765] = { 0, 663, 1, 664, 664, 665, 665, 666, 666, 663, 9, 663, 11, 663, 13, 667, 667, 668, 668, 669, 669, @@ -600,7 +688,7 @@ 663, 663, 663, 663 } ; -static yyconst short int yy_nxt[3571] = +static yyconst flex_int16_t yy_nxt[3571] = { 0, 30, 31, 32, 31, 33, 34, 35, 35, 36, 37, 38, 35, 35, 39, 40, 35, 40, 41, 42, 43, @@ -996,7 +1084,7 @@ 663, 663, 663, 663, 663, 663, 663, 663, 663, 663 } ; -static yyconst short int yy_chk[3571] = +static yyconst flex_int16_t yy_chk[3571] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1395,6 +1483,9 @@ static yy_state_type yy_last_accepting_state; static char *yy_last_accepting_cpos; +extern int xy_flex_debug; +int xy_flex_debug = 0; + /* The intent behind this definition is that it'll catch * any uses of REJECT which flex missed. */ @@ -1402,8 +1493,7 @@ #define yymore() yymore_used_but_not_detected #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#define INITIAL 0 +char *xytext; /* * Authors: * Martin Henz @@ -1441,7 +1531,7 @@ #include "parser.hh" -void xyreportError(char *kind, char *message, +void xyreportError(const char *kind, const char *message, const char *file, int line, int column); void xy_setScannerPrefix(); void xy_setParserExpect(); @@ -1456,7 +1546,6 @@ static int errorFlag; - //******************* // THE INPUT ROUTINE //******************* @@ -1499,7 +1588,6 @@ } } - //**************** // OUTPUT OF FLEX //**************** @@ -1507,7 +1595,6 @@ #undef YY_DECL #define YY_DECL static int xymylex() - //************************* // CONDITIONAL COMPILATION // uses a stack of flags; @@ -1563,7 +1650,6 @@ return 1; } - //*********************** // STACK OF FILE ENTRIES // for \insert @@ -1590,7 +1676,7 @@ xyFileName[maxFileNameSize - 1] = '\0'; xyFileNameAtom = OZ_atom(fileName); xyin = filep; - BEGIN(INITIAL); + BEGIN(0); /*INITIAL isn't yet defined so we use the synonym 0.*/ xy_switch_to_buffer(xy_create_buffer(xyin, YY_BUF_SIZE)); xylino = 1; conditional_basep = conditional_p; @@ -1619,7 +1705,6 @@ return 1; } - //********** // COMMENTS //********** @@ -1630,7 +1715,6 @@ static int commentoffset; static int commentlastmode; - //********************* // FILE NAME EXPANSION //********************* @@ -1729,7 +1813,7 @@ } // search in OZPATH - char *path = osgetenv("OZPATH"); + const char *path = osgetenv("OZPATH"); if (path == NULL) path = "."; @@ -1752,7 +1836,6 @@ return NULL; } - //*************************** // TREATING STRINGS AND SUCH //*************************** @@ -1882,11 +1965,10 @@ } } +#define INITIAL 0 #define COMMENT 1 - #define IGNOREDIRECTIVE 2 #define DIRECTIVE 3 - #define LINE 4 #define SWITCHDIR 5 #define INSERT 6 @@ -1894,12 +1976,50 @@ #define IFDEF 8 #define IFNDEF 9 #define UNDEF 10 - #define SCANNERPREFIX 11 #define PARSEREXPECT 12 - #define LEX 13 +#ifndef YY_NO_UNISTD_H + * down here because we want the user's section 1 to have been scanned first. + * The user has a chance to override it with an option. + */ +#endif + +#ifndef YY_EXTRA_TYPE +#define YY_EXTRA_TYPE void * +#endif + +static int yy_init_globals (void ); + +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int xylex_destroy (void ); + +int xyget_debug (void ); + +void xyset_debug (int debug_flag ); + +YY_EXTRA_TYPE xyget_extra (void ); + +void xyset_extra (YY_EXTRA_TYPE user_defined ); + +FILE *xyget_in (void ); + +void xyset_in (FILE * in_str ); + +FILE *xyget_out (void ); + +void xyset_out (FILE * out_str ); + +int xyget_leng (void ); + +char *xyget_text (void ); + +int xyget_lineno (void ); + +void xyset_lineno (int line_number ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1907,65 +2027,30 @@ #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); +extern "C" int xywrap (void ); #else -extern int yywrap YY_PROTO(( void )); +extern int xywrap (void ); #endif #endif -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); -#endif - + static void yyunput (int c,char *buf_ptr ); + #ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +static void yy_flex_strncpy (char *,yyconst char *,int ); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); +static int yy_flex_strlen (yyconst char * ); #endif #ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif +#ifdef __cplusplus +static int yyinput (void ); #else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 +static int input (void ); #endif -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif #endif /* Amount of stuff to slurp up with each read. */ @@ -1974,12 +2059,11 @@ #endif /* Copy whatever the last rule matched to the standard output. */ - #ifndef ECHO /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( xytext, xyleng, 1, xyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1987,21 +2071,35 @@ */ #ifndef YY_INPUT #define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ - int c = '*', n; \ + int c = '*'; \ + size_t n; \ for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + (c = getc( xyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ) \ buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ + if ( c == EOF && ferror( xyin ) ) \ YY_FATAL_ERROR( "input in flex scanner failed" ); \ result = n; \ } \ - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ - && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); + else \ + { \ + errno=0; \ + while ( (result = fread(buf, 1, max_size, xyin))==0 && ferror(xyin)) \ + { \ + if( errno != EINTR) \ + { \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + break; \ + } \ + errno=0; \ + clearerr(xyin); \ + } \ + }\ +\ + #endif /* No semi-colon after return; correct usage is to write "yyterminate();" - @@ -2022,14 +2120,20 @@ #define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) #endif +/* end tables serialization structures and prototypes */ + /* Default declaration of generated scanner - a define so the user can * easily add parameters. */ #ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif +#define YY_DECL_IS_OURS 1 + +extern int xylex (void); -/* Code executed at the beginning of each rule, after yytext and yyleng +#define YY_DECL int xylex (void) +#endif /* !YY_DECL */ + +/* Code executed at the beginning of each rule, after xytext and xyleng * have been set up. */ #ifndef YY_USER_ACTION @@ -2044,60 +2148,61 @@ #define YY_RULE_SETUP \ YY_USER_ACTION +/** The main scanner function which does all the work. + */ YY_DECL - { +{ register yy_state_type yy_current_state; - register char *yy_cp = NULL, *yy_bp = NULL; + register char *yy_cp, *yy_bp; register int yy_act; - - - - - if ( yy_init ) + + if ( !(yy_init) ) { - yy_init = 0; + (yy_init) = 1; #ifdef YY_USER_INIT YY_USER_INIT; #endif - if ( ! yy_start ) - yy_start = 1; /* first start state */ + if ( ! (yy_start) ) + (yy_start) = 1; /* first start state */ - if ( ! yyin ) - yyin = stdin; + if ( ! xyin ) + xyin = stdin; - if ( ! yyout ) - yyout = stdout; + if ( ! xyout ) + xyout = stdout; - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); + if ( ! YY_CURRENT_BUFFER ) { + xyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + xy_create_buffer(xyin,YY_BUF_SIZE ); + } - yy_load_buffer_state(); + xy_load_buffer_state( ); } while ( 1 ) /* loops until end-of-file is reached */ { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); - /* Support of yytext. */ - *yy_cp = yy_hold_char; + /* Support of xytext. */ + *yy_cp = (yy_hold_char); /* yy_bp points to the position in yy_ch_buf of the start of * the current run. */ yy_bp = yy_cp; - yy_current_state = yy_start; + yy_current_state = (yy_start); yy_match: do { register 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; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -2114,24 +2219,22 @@ yy_act = yy_accept[yy_current_state]; if ( yy_act == 0 ) { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); yy_act = yy_accept[yy_current_state]; } YY_DO_BEFORE_ACTION; - do_action: /* This label is used only to access EOF actions. */ - switch ( yy_act ) { /* beginning of action switch */ case 0: /* must back up */ /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; + *yy_cp = (yy_hold_char); + yy_cp = (yy_last_accepting_cpos); + yy_current_state = (yy_last_accepting_state); goto yy_find_action; case 1: @@ -2163,6 +2266,7 @@ ; YY_BREAK case 6: +/* rule 6 can match eol */ YY_RULE_SETUP { xylino++; xylastline = xytext + 1; @@ -2254,6 +2358,7 @@ ; YY_BREAK case 24: +/* rule 24 can match eol */ YY_RULE_SETUP { BEGIN(INITIAL); xylino++; @@ -2267,7 +2372,6 @@ } YY_BREAK - case 25: YY_RULE_SETUP ; @@ -2277,6 +2381,7 @@ { errorFlag = 1; } YY_BREAK case 27: +/* rule 27 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2295,7 +2400,6 @@ } YY_BREAK - case 28: YY_RULE_SETUP { xylino = atol(xytext) - 1; } @@ -2323,6 +2427,7 @@ { errorFlag = 1; } YY_BREAK case 32: +/* rule 32 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2345,7 +2450,6 @@ } YY_BREAK - case 33: YY_RULE_SETUP { return '+'; } @@ -2367,6 +2471,7 @@ { errorFlag = 1; } YY_BREAK case 38: +/* rule 38 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2385,7 +2490,6 @@ } YY_BREAK - case 39: YY_RULE_SETUP { if (get_cond()) { @@ -2431,6 +2535,7 @@ { errorFlag = 1; } YY_BREAK case 42: +/* rule 42 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2453,8 +2558,8 @@ } YY_BREAK - case 43: +/* rule 43 can match eol */ YY_RULE_SETUP { if (get_cond()) { trans('`'); @@ -2474,6 +2579,7 @@ { errorFlag = 1; } YY_BREAK case 46: +/* rule 46 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2496,8 +2602,8 @@ } YY_BREAK - case 47: +/* rule 47 can match eol */ YY_RULE_SETUP { if (get_cond()) { trans('`'); @@ -2516,6 +2622,7 @@ { errorFlag = 1; } YY_BREAK case 50: +/* rule 50 can match eol */ YY_RULE_SETUP { if (errorFlag) xyreportError("directive error", @@ -2538,8 +2645,8 @@ } YY_BREAK - case 51: +/* rule 51 can match eol */ YY_RULE_SETUP { trans('`'); OZ_Term key = OZ_atom(xytext); @@ -2556,6 +2663,7 @@ { errorFlag = 1; } YY_BREAK case 54: +/* rule 54 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2578,8 +2686,8 @@ } YY_BREAK - case 55: +/* rule 55 can match eol */ YY_RULE_SETUP { trans('`'); OZ_Term key = OZ_atom(xytext); @@ -2596,6 +2704,7 @@ { errorFlag = 1; } YY_BREAK case 58: +/* rule 58 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2618,8 +2727,8 @@ } YY_BREAK - case 59: +/* rule 59 can match eol */ YY_RULE_SETUP { stripTrans('\''); xy_setScannerPrefix(); @@ -2635,6 +2744,7 @@ { errorFlag = 1; } YY_BREAK case 62: +/* rule 62 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2657,7 +2767,6 @@ } YY_BREAK - case 63: YY_RULE_SETUP { xy_setParserExpect(); @@ -2673,6 +2782,7 @@ { errorFlag = 1; } YY_BREAK case 66: +/* rule 66 can match eol */ YY_RULE_SETUP { if (errorFlag && get_cond()) xyreportError("directive error", @@ -2700,6 +2810,7 @@ { BEGIN(INITIAL); return T_REGEX; } YY_BREAK case 68: +/* rule 68 can match eol */ YY_RULE_SETUP { BEGIN(INITIAL); stripRegex(); return T_REGEX; } YY_BREAK @@ -2752,9 +2863,9 @@ { return T_OTHERMUL; } YY_BREAK case 81: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_OTHERMUL; } YY_BREAK @@ -2783,6 +2894,7 @@ { return T_COLONEQUALS; } YY_BREAK case 88: +/* rule 88 can match eol */ YY_RULE_SETUP { // Hack to avoid strange parsing of X.1.1: // If "." is followed by integer, then @@ -2795,9 +2907,9 @@ stripDot(); return T_DOTINT; } YY_BREAK case 89: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { // Hack to avoid parsing error for a(b:1...): // If int is followed by ..., int is returned. @@ -2811,9 +2923,9 @@ { return T_OZINT; } YY_BREAK case 91: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_OZINT; } YY_BREAK @@ -2822,23 +2934,23 @@ { return T_OZFLOAT; } YY_BREAK case 93: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_UNIT_LABEL; } YY_BREAK case 94: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_TRUE_LABEL; } YY_BREAK case 95: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_FALSE_LABEL; } YY_BREAK @@ -2847,9 +2959,9 @@ { return T_andthen; } YY_BREAK case 97: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_andthen; } YY_BREAK @@ -2858,9 +2970,9 @@ { return T_at; } YY_BREAK case 99: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_at; } YY_BREAK @@ -2869,9 +2981,9 @@ { return T_attr; } YY_BREAK case 101: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_attr; } YY_BREAK @@ -2880,9 +2992,9 @@ { return T_case; } YY_BREAK case 103: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_case; } YY_BREAK @@ -2891,9 +3003,9 @@ { return T_catch; } YY_BREAK case 105: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_catch; } YY_BREAK @@ -2902,9 +3014,9 @@ { return T_choice; } YY_BREAK case 107: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_choice; } YY_BREAK @@ -2913,9 +3025,9 @@ { return T_class; } YY_BREAK case 109: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_class; } YY_BREAK @@ -2924,9 +3036,9 @@ { return T_cond; } YY_BREAK case 111: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_cond; } YY_BREAK @@ -2935,9 +3047,9 @@ { return T_declare; } YY_BREAK case 113: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_declare; } YY_BREAK @@ -2946,9 +3058,9 @@ { return T_define; } YY_BREAK case 115: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_define; } YY_BREAK @@ -2957,9 +3069,9 @@ { return T_dis; } YY_BREAK case 117: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_dis; } YY_BREAK @@ -2968,9 +3080,9 @@ { return T_do; } YY_BREAK case 119: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_do; } YY_BREAK @@ -2979,9 +3091,9 @@ { return T_else; } YY_BREAK case 121: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_else; } YY_BREAK @@ -2990,9 +3102,9 @@ { return T_elsecase; } YY_BREAK case 123: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 8; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 8; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elsecase; } YY_BREAK @@ -3001,9 +3113,9 @@ { return T_elseif; } YY_BREAK case 125: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elseif; } YY_BREAK @@ -3012,9 +3124,9 @@ { return T_elseof; } YY_BREAK case 127: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_elseof; } YY_BREAK @@ -3023,9 +3135,9 @@ { return T_end; } YY_BREAK case 129: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_end; } YY_BREAK @@ -3034,9 +3146,9 @@ { return T_export; } YY_BREAK case 131: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_export; } YY_BREAK @@ -3045,9 +3157,9 @@ { return T_fail; } YY_BREAK case 133: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_fail; } YY_BREAK @@ -3060,9 +3172,9 @@ { return T_feat; } YY_BREAK case 136: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_feat; } YY_BREAK @@ -3071,9 +3183,9 @@ { return T_finally; } YY_BREAK case 138: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_finally; } YY_BREAK @@ -3082,9 +3194,9 @@ { return T_FOR; } YY_BREAK case 140: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_FOR; } YY_BREAK @@ -3093,9 +3205,9 @@ { return T_from; } YY_BREAK case 142: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_from; } YY_BREAK @@ -3104,9 +3216,9 @@ { return T_fun; } YY_BREAK case 144: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_fun; } YY_BREAK @@ -3115,9 +3227,9 @@ { return T_functor; } YY_BREAK case 146: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_functor; } YY_BREAK @@ -3126,9 +3238,9 @@ { return T_if; } YY_BREAK case 148: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_if; } YY_BREAK @@ -3137,9 +3249,9 @@ { return T_import; } YY_BREAK case 150: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_import; } YY_BREAK @@ -3148,9 +3260,9 @@ { return T_in; } YY_BREAK case 152: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_in; } YY_BREAK @@ -3159,9 +3271,9 @@ { if (xy_gumpSyntax) { BEGIN(LEX); return T_lex; } else return T_OZATOM; } YY_BREAK case 154: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (xy_gumpSyntax) { BEGIN(LEX); return T_lex; } else return T_ATOM_LABEL; } YY_BREAK @@ -3170,9 +3282,9 @@ { return T_local; } YY_BREAK case 156: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_local; } YY_BREAK @@ -3181,9 +3293,9 @@ { return T_lock; } YY_BREAK case 158: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_lock; } YY_BREAK @@ -3192,9 +3304,9 @@ { return T_meth; } YY_BREAK case 160: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_meth; } YY_BREAK @@ -3203,9 +3315,9 @@ { return xy_gumpSyntax? T_mode: T_OZATOM; } YY_BREAK case 162: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_mode: T_ATOM_LABEL; } YY_BREAK @@ -3214,9 +3326,9 @@ { return T_not; } YY_BREAK case 164: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_not; } YY_BREAK @@ -3225,9 +3337,9 @@ { return T_of; } YY_BREAK case 166: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_of; } YY_BREAK @@ -3236,9 +3348,9 @@ { return T_or; } YY_BREAK case 168: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 2; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 2; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_or; } YY_BREAK @@ -3247,9 +3359,9 @@ { return T_orelse; } YY_BREAK case 170: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_orelse; } YY_BREAK @@ -3258,9 +3370,9 @@ { return xy_gumpSyntax? T_parser: T_OZATOM; } YY_BREAK case 172: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_parser: T_ATOM_LABEL; } YY_BREAK @@ -3269,9 +3381,9 @@ { return T_prepare; } YY_BREAK case 174: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_prepare; } YY_BREAK @@ -3280,9 +3392,9 @@ { return T_proc; } YY_BREAK case 176: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_proc; } YY_BREAK @@ -3291,9 +3403,9 @@ { return xy_gumpSyntax? T_prod: T_OZATOM; } YY_BREAK case 178: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_prod: T_ATOM_LABEL; } YY_BREAK @@ -3302,9 +3414,9 @@ { return T_prop; } YY_BREAK case 180: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_prop; } YY_BREAK @@ -3313,9 +3425,9 @@ { return T_raise; } YY_BREAK case 182: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_raise; } YY_BREAK @@ -3324,9 +3436,9 @@ { return T_require; } YY_BREAK case 184: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_require; } YY_BREAK @@ -3335,9 +3447,9 @@ { return xy_gumpSyntax? T_scanner: T_OZATOM; } YY_BREAK case 186: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 7; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 7; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_scanner: T_ATOM_LABEL; } YY_BREAK @@ -3346,9 +3458,9 @@ { return T_self; } YY_BREAK case 188: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_self; } YY_BREAK @@ -3357,9 +3469,9 @@ { return T_skip; } YY_BREAK case 190: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_skip; } YY_BREAK @@ -3368,9 +3480,9 @@ { return xy_gumpSyntax? T_syn: T_OZATOM; } YY_BREAK case 192: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_syn: T_ATOM_LABEL; } YY_BREAK @@ -3379,9 +3491,9 @@ { return T_then; } YY_BREAK case 194: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 4; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 4; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_then; } YY_BREAK @@ -3390,9 +3502,9 @@ { return xy_gumpSyntax? T_token: T_OZATOM; } YY_BREAK case 196: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 5; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 5; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return xy_gumpSyntax? T_token: T_ATOM_LABEL; } YY_BREAK @@ -3401,9 +3513,9 @@ { return T_thread; } YY_BREAK case 198: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 6; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 6; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_thread; } YY_BREAK @@ -3416,9 +3528,9 @@ { return T_try; } YY_BREAK case 201: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp = yy_bp + 3; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp = yy_bp + 3; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { return T_try; } YY_BREAK @@ -3427,58 +3539,69 @@ { return T_unit; } YY_BREAK case 203: +/* rule 203 can match eol */ YY_RULE_SETUP { stripTrans('\''); return T_OZATOM; } YY_BREAK case 204: +/* rule 204 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal atom syntax",xyFileName,xylino,xycharno()); return T_OZATOM;} YY_BREAK case 205: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 205 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { stripTrans('\''); return T_ATOM_LABEL; } YY_BREAK case 206: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 206 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal atom syntax",xyFileName,xylino,xycharno()); return T_ATOM_LABEL;} YY_BREAK case 207: +/* rule 207 can match eol */ YY_RULE_SETUP { trans('`'); return T_VARIABLE; } YY_BREAK case 208: +/* rule 208 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal variable syntax",xyFileName,xylino,xycharno()); return T_VARIABLE;} YY_BREAK case 209: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 209 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { trans('`'); return T_VARIABLE_LABEL; } YY_BREAK case 210: -*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ -yy_c_buf_p = yy_cp -= 1; -YY_DO_BEFORE_ACTION; /* set up yytext again */ +/* rule 210 can match eol */ +*yy_cp = (yy_hold_char); /* undo effects of setting up xytext */ +(yy_c_buf_p) = yy_cp -= 1; +YY_DO_BEFORE_ACTION; /* set up xytext again */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal variable syntax",xyFileName,xylino,xycharno()); return T_VARIABLE;} YY_BREAK case 211: +/* rule 211 can match eol */ YY_RULE_SETUP { stripTrans('\"'); return T_STRING; } YY_BREAK case 212: +/* rule 212 can match eol */ YY_RULE_SETUP { if (get_cond()) xyreportError("lexical error","illegal string syntax",xyFileName,xylino,xycharno()); return T_STRING;} YY_BREAK case 213: +/* rule 213 can match eol */ YY_RULE_SETUP { int i = 0; int j = 1; @@ -3497,6 +3620,7 @@ ; YY_BREAK case 216: +/* rule 216 can match eol */ YY_RULE_SETUP { xylino++; xylastline = xytext + 1; @@ -3534,26 +3658,26 @@ case YY_END_OF_BUFFER: { /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1; /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; + *yy_cp = (yy_hold_char); YY_RESTORE_YY_MORE_OFFSET - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) { /* We're scanning a new file or input source. It's * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our + * just pointed xyin at a new source and called + * xylex(). If so, then we have to assure + * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a * back-up) that will match for the new input source. */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_input_file = xyin; + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; } /* Note that here we test for yy_c_buf_p "<=" to the position @@ -3563,13 +3687,13 @@ * end-of-buffer state). Contrast this with the test * in input(). */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) { /* This was really a NUL. */ yy_state_type yy_next_state; - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); /* Okay, we're now positioned to make the NUL * transition. We couldn't have @@ -3582,41 +3706,41 @@ yy_next_state = yy_try_NUL_trans( yy_current_state ); - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_bp = (yytext_ptr) + YY_MORE_ADJ; if ( yy_next_state ) { /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; + yy_cp = ++(yy_c_buf_p); yy_current_state = yy_next_state; goto yy_match; } else { - yy_cp = yy_c_buf_p; + yy_cp = (yy_c_buf_p); goto yy_find_action; } } - else switch ( yy_get_next_buffer() ) + else switch ( yy_get_next_buffer( ) ) { case EOB_ACT_END_OF_FILE: { - yy_did_buffer_switch_on_eof = 0; + (yy_did_buffer_switch_on_eof) = 0; - if ( yywrap() ) + if ( xywrap( ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up - * yytext, we can now set up + * xytext, we can now set up * yy_c_buf_p so that if some total * hoser (like flex itself) wants to * call the scanner after we return the * YY_NULL, it'll still work - another * YY_NULL will get returned. */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ; yy_act = YY_STATE_EOF(YY_START); goto do_action; @@ -3624,30 +3748,30 @@ else { - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; } break; } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; + (yy_c_buf_p) = + (yytext_ptr) + yy_amount_of_matched_text; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_match; case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; + (yy_c_buf_p) = + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)]; - yy_current_state = yy_get_previous_state(); + yy_current_state = yy_get_previous_state( ); - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; + yy_cp = (yy_c_buf_p); + yy_bp = (yytext_ptr) + YY_MORE_ADJ; goto yy_find_action; } break; @@ -3658,8 +3782,7 @@ "fatal flex scanner internal error--no action found" ); } /* end of action switch */ } /* end of scanning one token */ - } /* end of yylex */ - +} /* end of xylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -3668,21 +3791,20 @@ * EOB_ACT_CONTINUE_SCAN - continue scanning from current position * EOB_ACT_END_OF_FILE - end of file */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; +static int yy_get_next_buffer (void) +{ + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + register char *source = (yytext_ptr); register int number_to_move, i; int ret_val; - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] ) YY_FATAL_ERROR( "fatal flex scanner internal error--end of buffer missed" ); - if ( yy_current_buffer->yy_fill_buffer == 0 ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 ) { /* We matched a single character, the EOB, so * treat this as a final EOF. @@ -3702,34 +3824,30 @@ /* 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 = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1; for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) /* don't do the read, it's not guaranteed to return an EOF, * just force an EOF */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0; else { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; + int num_to_read = + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; + YY_BUFFER_STATE b = YY_CURRENT_BUFFER; int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); + (int) ((yy_c_buf_p) - b->yy_ch_buf); if ( b->yy_is_our_buffer ) { @@ -3742,8 +3860,7 @@ b->yy_ch_buf = (char *) /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); + xyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 ); } else /* Can't grow it, we don't own it. */ @@ -3753,35 +3870,35 @@ YY_FATAL_ERROR( "fatal error - scanner input buffer overflow" ); - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset]; - num_to_read = yy_current_buffer->yy_buf_size - + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; -#endif + } if ( num_to_read > YY_READ_BUF_SIZE ) num_to_read = YY_READ_BUF_SIZE; /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), + (yy_n_chars), (size_t) num_to_read ); - yy_current_buffer->yy_n_chars = yy_n_chars; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - if ( yy_n_chars == 0 ) + if ( (yy_n_chars) == 0 ) { if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); + xyrestart(xyin ); } else { ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_EOF_PENDING; } } @@ -3789,32 +3906,39 @@ else ret_val = EOB_ACT_CONTINUE_SCAN; - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + if ((yy_size_t) ((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); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xyrealloc((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()" ); + } - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + (yy_n_chars) += number_to_move; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; - return ret_val; - } + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; + return ret_val; +} /* yy_get_previous_state - get the state just before the EOB char was reached */ -static yy_state_type yy_get_previous_state() - { + static yy_state_type yy_get_previous_state (void) +{ register yy_state_type yy_current_state; register char *yy_cp; + + yy_current_state = (yy_start); - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) { register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 77); if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3826,30 +3950,23 @@ } return yy_current_state; - } - +} /* yy_try_NUL_trans - try to make a transition on the NUL character * * synopsis * next_state = yy_try_NUL_trans( current_state ); */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) +{ register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; + register char *yy_cp = (yy_c_buf_p); register YY_CHAR yy_c = 77; if ( yy_accept[yy_current_state] ) { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; + (yy_last_accepting_state) = yy_current_state; + (yy_last_accepting_cpos) = yy_cp; } while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { @@ -3861,80 +3978,73 @@ yy_is_jam = (yy_current_state == 663); return yy_is_jam ? 0 : yy_current_state; - } - +} -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; + static void yyunput (int c, register char * yy_bp ) +{ + register char *yy_cp; + + yy_cp = (yy_c_buf_p); - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; + /* undo effects of setting up xytext */ + *yy_cp = (yy_hold_char); - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) { /* need to shift things up to make room */ /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; + register int number_to_move = (yy_n_chars) + 2; + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - while ( source > yy_current_buffer->yy_ch_buf ) + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) *--dest = *--source; yy_cp += (int) (dest - source); yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) YY_FATAL_ERROR( "flex scanner push-back overflow" ); } *--yy_cp = (char) c; + (yytext_ptr) = yy_bp; + (yy_hold_char) = *yy_cp; + (yy_c_buf_p) = yy_cp; +} - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - +#ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput() + static int yyinput (void) #else -static int input() + static int input (void) #endif - { - int c; - *yy_c_buf_p = yy_hold_char; +{ + int c; + + *(yy_c_buf_p) = (yy_hold_char); - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) { /* yy_c_buf_p now points to the character we want to return. * If this occurs *before* the EOB characters, then it's a * valid NUL; if not, then we've hit the end of the buffer. */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] ) /* This was really a NUL. */ - *yy_c_buf_p = '\0'; + *(yy_c_buf_p) = '\0'; else { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; + int offset = (yy_c_buf_p) - (yytext_ptr); + ++(yy_c_buf_p); - switch ( yy_get_next_buffer() ) + switch ( yy_get_next_buffer( ) ) { case EOB_ACT_LAST_MATCH: /* This happens because yy_g_n_b() @@ -3948,16 +4058,16 @@ */ /* Reset buffer status. */ - yyrestart( yyin ); + xyrestart(xyin ); - /* fall through */ + /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( yywrap() ) + if ( xywrap( ) ) return EOF; - if ( ! yy_did_buffer_switch_on_eof ) + if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; #ifdef __cplusplus return yyinput(); @@ -3967,167 +4077,169 @@ } case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; + (yy_c_buf_p) = (yytext_ptr) + offset; break; } } } - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */ + *(yy_c_buf_p) = '\0'; /* preserve xytext */ + (yy_hold_char) = *++(yy_c_buf_p); return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); +} +#endif /* ifndef YY_NO_INPUT */ - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); +/** Immediately switch to a different input stream. + * @param input_file A readable stream. + * + * @note This function does not reset the start condition to @c INITIAL . + */ + void xyrestart (FILE * input_file ) +{ + + if ( ! YY_CURRENT_BUFFER ){ + xyensure_buffer_stack (); + YY_CURRENT_BUFFER_LVALUE = + xy_create_buffer(xyin,YY_BUF_SIZE ); } + xy_init_buffer(YY_CURRENT_BUFFER,input_file ); + xy_load_buffer_state( ); +} -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) +/** Switch to a different input buffer. + * @param new_buffer The new input buffer. + * + */ + void xy_switch_to_buffer (YY_BUFFER_STATE new_buffer ) +{ + + /* TODO. We should be able to replace this entire function body + * with + * xypop_buffer_state(); + * xypush_buffer_state(new_buffer); + */ + xyensure_buffer_stack (); + if ( YY_CURRENT_BUFFER == new_buffer ) return; - if ( yy_current_buffer ) + if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } - yy_current_buffer = new_buffer; - yy_load_buffer_state(); + YY_CURRENT_BUFFER_LVALUE = new_buffer; + xy_load_buffer_state( ); /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe + * EOF (xywrap()) processing, but the only time this flag + * is looked at is after xywrap() is called, so it's safe * to go ahead and always set it. */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } + (yy_did_buffer_switch_on_eof) = 1; +} +static void xy_load_buffer_state (void) +{ + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; + xyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; + (yy_hold_char) = *(yy_c_buf_p); +} -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { +/** Allocate and initialize an input buffer state. + * @param file A readable stream. + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. + * + * @return the allocated buffer state. + */ + YY_BUFFER_STATE xy_create_buffer (FILE * file, int size ) +{ YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + + b = (YY_BUFFER_STATE) xyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_create_buffer()" ); b->yy_buf_size = 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. */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + b->yy_ch_buf = (char *) xyalloc(b->yy_buf_size + 2 ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_create_buffer()" ); b->yy_is_our_buffer = 1; - yy_init_buffer( b, file ); + xy_init_buffer(b,file ); return b; - } - +} -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { +/** Destroy the buffer. + * @param b a buffer created with xy_create_buffer() + * + */ + void xy_delete_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } - + xyfree((void *) b->yy_ch_buf ); + xyfree((void *) b ); +} -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif - +#ifndef __cplusplus +extern int isatty (int ); +#endif /* __cplusplus */ + +/* Initializes or reinitializes a buffer. + * This function is sometimes called more than once on the same buffer, + * such as during a xyrestart() or at EOF. + */ + static void xy_init_buffer (YY_BUFFER_STATE b, FILE * file ) - { - yy_flush_buffer( b ); +{ + int oerrno = errno; + + xy_flush_buffer(b ); b->yy_input_file = file; b->yy_fill_buffer = 1; -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - + /* If b is the current buffer, then xy_init_buffer was _probably_ + * called from xyrestart() or through yy_get_next_buffer. + * In that case, we don't want to reset the lineno or column. + */ + if (b != YY_CURRENT_BUFFER){ + b->yy_bs_lineno = 1; + b->yy_bs_column = 0; + } -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; + + errno = oerrno; +} - { - if ( ! b ) +/** Discard all buffered characters. On the next scan, YY_INPUT will be called. + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. + * + */ + void xy_flush_buffer (YY_BUFFER_STATE b ) +{ + if ( ! b ) return; b->yy_n_chars = 0; @@ -4144,31 +4256,127 @@ b->yy_at_bol = 1; b->yy_buffer_status = YY_BUFFER_NEW; - if ( b == yy_current_buffer ) - yy_load_buffer_state(); + if ( b == YY_CURRENT_BUFFER ) + xy_load_buffer_state( ); +} + +/** Pushes the new state onto the stack. The new state becomes + * the current state. This function will allocate the stack + * if necessary. + * @param new_buffer The new state. + * + */ +void xypush_buffer_state (YY_BUFFER_STATE new_buffer ) +{ + if (new_buffer == NULL) + return; + + xyensure_buffer_stack(); + + /* This block is copied from xy_switch_to_buffer. */ + if ( YY_CURRENT_BUFFER ) + { + /* Flush out information for old buffer. */ + *(yy_c_buf_p) = (yy_hold_char); + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p); + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); + } + + /* Only push if top exists. Otherwise, replace top. */ + if (YY_CURRENT_BUFFER) + (yy_buffer_stack_top)++; + YY_CURRENT_BUFFER_LVALUE = new_buffer; + + /* copied from xy_switch_to_buffer. */ + xy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; +} + +/** Removes and deletes the top of the stack, if present. + * The next element becomes the new top. + * + */ +void xypop_buffer_state (void) +{ + if (!YY_CURRENT_BUFFER) + return; + + xy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + if ((yy_buffer_stack_top) > 0) + --(yy_buffer_stack_top); + + if (YY_CURRENT_BUFFER) { + xy_load_buffer_state( ); + (yy_did_buffer_switch_on_eof) = 1; + } +} + +/* Allocates the stack if it does not exist. + * Guarantees space for at least one push. + */ +static void xyensure_buffer_stack (void) +{ + int num_to_alloc; + + if (!(yy_buffer_stack)) { + + /* First allocation is just for 2 elements, since we don't know if this + * 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; + (yy_buffer_stack) = (struct yy_buffer_state**)xyalloc + (num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xyensure_buffer_stack()" ); + + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); + + (yy_buffer_stack_max) = num_to_alloc; + (yy_buffer_stack_top) = 0; + return; } + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){ -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; + /* Increase the buffer to prepare for a possible push. */ + int grow_size = 8 /* arbitrary grow size */; + + num_to_alloc = (yy_buffer_stack_max) + grow_size; + (yy_buffer_stack) = (struct yy_buffer_state**)xyrealloc + ((yy_buffer_stack), + num_to_alloc * sizeof(struct yy_buffer_state*) + ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in xyensure_buffer_stack()" ); + + /* zero only the new slots.*/ + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); + (yy_buffer_stack_max) = num_to_alloc; + } +} +/** Setup the input buffer state to scan directly from a user-specified character buffer. + * @param base the character buffer + * @param size the size in bytes of the character buffer + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xy_scan_buffer (char * base, yy_size_t size ) +{ + YY_BUFFER_STATE b; + if ( size < 2 || base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ return 0; - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + b = (YY_BUFFER_STATE) xyalloc(sizeof( struct yy_buffer_state ) ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_scan_buffer()" ); b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; @@ -4180,58 +4388,53 @@ b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - yy_switch_to_buffer( b ); + xy_switch_to_buffer(b ); return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif +} +/** Setup the input buffer state to scan a string. The next call to xylex() will + * scan from a @e copy of @a str. + * @param yystr a NUL-terminated string to scan + * + * @return the newly allocated buffer state object. + * @note If you want to scan bytes that may contain NUL values, then use + * xy_scan_bytes() instead. + */ +YY_BUFFER_STATE xy_scan_string (yyconst char * yystr ) +{ + + return xy_scan_bytes(yystr,strlen(yystr) ); +} -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { +/** Setup the input buffer state to scan the given bytes. The next call to xylex() will + * scan from a @e copy of @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. + * + * @return the newly allocated buffer state object. + */ +YY_BUFFER_STATE xy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +{ YY_BUFFER_STATE b; char *buf; yy_size_t n; int i; - + /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); + n = _yybytes_len + 2; + buf = (char *) xyalloc(n ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in xy_scan_bytes()" ); - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; + for ( i = 0; i < _yybytes_len; ++i ) + buf[i] = yybytes[i]; - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = yy_scan_buffer( buf, n ); + b = xy_scan_buffer(buf,n ); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in xy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -4239,148 +4442,196 @@ b->yy_is_our_buffer = 1; return b; - } +} + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 #endif +static void yy_fatal_error (yyconst char* msg ) +{ + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); +} -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; +/* Redefine yyless() so it works in section 3 code. */ - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up xytext. */ \ + int yyless_macro_arg = (n); \ + YY_LESS_LINENO(yyless_macro_arg);\ + xytext[xyleng] = (yy_hold_char); \ + (yy_c_buf_p) = xytext + yyless_macro_arg; \ + (yy_hold_char) = *(yy_c_buf_p); \ + *(yy_c_buf_p) = '\0'; \ + xyleng = yyless_macro_arg; \ + } \ + while ( 0 ) - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); +/* Accessor methods (get/set functions) to struct members. */ - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); +/** Get the current line number. + * + */ +int xyget_lineno (void) +{ + + return xylineno; +} - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } +/** Get the input stream. + * + */ +FILE *xyget_in (void) +{ + return xyin; +} - yy_start_stack[yy_start_stack_ptr++] = YY_START; +/** Get the output stream. + * + */ +FILE *xyget_out (void) +{ + return xyout; +} - BEGIN(new_state); - } -#endif +/** Get the length of the current token. + * + */ +int xyget_leng (void) +{ + return xyleng; +} +/** Get the current token. + * + */ -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); +char *xyget_text (void) +{ + return xytext; +} - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif +/** Set the current line number. + * @param line_number + * + */ +void xyset_lineno (int line_number ) +{ + + xylineno = line_number; +} +/** Set the input stream. This does not discard the current + * input buffer. + * @param in_str A readable stream. + * + * @see xy_switch_to_buffer + */ +void xyset_in (FILE * in_str ) +{ + xyin = in_str ; +} -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif +void xyset_out (FILE * out_str ) +{ + xyout = out_str ; +} -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif +int xyget_debug (void) +{ + return xy_flex_debug; +} + +void xyset_debug (int bdebug ) +{ + xy_flex_debug = bdebug ; +} -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) +static int yy_init_globals (void) +{ + /* Initialization is the same as for the non-reentrant scanner. + * This function is called from xylex_destroy(), so don't allocate here. + */ + + (yy_buffer_stack) = 0; + (yy_buffer_stack_top) = 0; + (yy_buffer_stack_max) = 0; + (yy_c_buf_p) = (char *) 0; + (yy_init) = 0; + (yy_start) = 0; + +/* Defined in main.c */ +#ifdef YY_STDINIT + xyin = stdin; + xyout = stdout; #else -static void yy_fatal_error( msg ) -char msg[]; + xyin = (FILE *) 0; + xyout = (FILE *) 0; #endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } - + /* For future reference: Set errno on error, since we are called by + * xylex_init() + */ + return 0; +} -/* Redefine yyless() so it works in section 3 code. */ +/* xylex_destroy is for both reentrant and non-reentrant scanners. */ +int xylex_destroy (void) +{ + + /* Pop the buffer stack, destroying each element. */ + while(YY_CURRENT_BUFFER){ + xy_delete_buffer(YY_CURRENT_BUFFER ); + YY_CURRENT_BUFFER_LVALUE = NULL; + xypop_buffer_state(); + } -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) + /* Destroy the stack itself. */ + xyfree((yy_buffer_stack) ); + (yy_buffer_stack) = NULL; + + /* Reset the globals. This is important in a non-reentrant scanner so the next time + * xylex() is called, initialization will occur. */ + yy_init_globals( ); + return 0; +} -/* Internal utility routines. */ +/* + * Internal utility routines. + */ #ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n ) +{ register int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; - } +} #endif #ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { +static int yy_flex_strlen (yyconst char * s ) +{ register int n; for ( n = 0; s[n]; ++n ) ; return n; - } +} #endif - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { +void *xyalloc (yy_size_t size ) +{ return (void *) malloc( size ); - } +} -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { +void *xyrealloc (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 @@ -4389,26 +4640,14 @@ * as though doing an assignment. */ return (void *) realloc( (char *) ptr, size ); - } - -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } +} -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif +void xyfree (void * ptr ) +{ + free( (char *) ptr ); /* see xyrealloc() for (char *) cast */ +} +#define YYTABLES_NAME "yytables" static void xy_init(OZ_Term defines0) { xylino = 1; @@ -4474,3 +4713,4 @@ else return xylex(); } + --- mozart-1.4.0.orig/platform/emulator/os.cc +++ mozart-1.4.0/platform/emulator/os.cc @@ -359,7 +359,7 @@ typedef struct { int signo; - char *name; + const char *name; Bool pending; OsSigFun *chandler; OZ_Term ozhandler; @@ -766,10 +766,10 @@ static -int rawwrite(int fd, void *buf, int sz) +int rawwrite(int fd, const void *buf, int sz) { if (isSocket(fd)) - return send(fd, (char *)buf, sz, 0); + return send(fd, (const char *)buf, sz, 0); return write(fd,buf,sz); } @@ -1025,11 +1025,7 @@ /* socket numbers may grow very large on Windows */ return 100000; #else - int ret = sysconf(_SC_OPEN_MAX); - if (ret == -1) { - ret = _POSIX_OPEN_MAX; - } - return ret; + return FD_SETSIZE; #endif } @@ -1100,7 +1096,7 @@ return fd; } -char *osgetenv(char *var) +char *osgetenv(const char *var) { char *env = static_cast(GetEnvironmentStrings()); char *p = env; @@ -1135,7 +1131,7 @@ int osdup(int fd) { return dup(fd); } -char *osgetenv(char *var) { return getenv(var); } +char *osgetenv(const char *var) { return getenv(var); } #endif @@ -1540,12 +1536,12 @@ /* currently no wrapping for write */ -int oswrite(int fd, void *buf, unsigned int len) +int oswrite(int fd, const void *buf, unsigned int len) { return rawwrite(fd, buf, len); } -int ossafewrite(int fd, char *buf, unsigned int len) +int ossafewrite(int fd, const char *buf, unsigned int len) { int origLen = len; --- mozart-1.4.0.orig/platform/emulator/base64.hh +++ mozart-1.4.0/platform/emulator/base64.hh @@ -0,0 +1,47 @@ +/* + * Authors: + * Erik Klintskog, 2002 + * Zacharias El Banna, 2002 + * + * Contributors: + * optional, Contributor's name (Contributor's email address) + * + * Copyright: + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ + +#ifndef __BASE64H +#define __BASE64H + +//------------------------- Base 64 encoding -------------------------- + +//********************************************************************* +//* C_Base64 - a simple base64 encoder and decoder. +//* +//* Copyright (c) 1999, Bob Withers - bwit@pobox.com +//* +//* This code may be freely used for any purpose, either personal +//* or commercial, provided the authors copyright notice remains +//* intact. +//********************************************************************* + +char* encodeB64(char*,int); +char* decodeB64(char*, int); + +#endif + + --- mozart-1.4.0.orig/platform/emulator/gentraverser.hh +++ mozart-1.4.0/platform/emulator/gentraverser.hh @@ -831,7 +831,7 @@ // // -static char* builderTaskNames[] = { +static const char* builderTaskNames[] = { "spointer", "spointer_iterate", "buildValue", @@ -926,7 +926,7 @@ // int maybetask = (int32) buf[index+1]; if (maybetask >= 0 && maybetask < BT_NOTASK) { - char *name = builderTaskNames[maybetask]; + const char *name = builderTaskNames[maybetask]; fprintf(stdout, " frame(%p) e0=%p (%s?), e1=%p, e2=%p\n", buf[index], buf[index+1], name, buf[index+2], buf[index+3]); } else { @@ -1269,7 +1269,7 @@ StackEntry e2 = *(--se); int maybetask = (int32) e0; if (maybetask >= 0 && maybetask < BT_NOTASK) { - char *name = builderTaskNames[maybetask]; + const char *name = builderTaskNames[maybetask]; fprintf(stdout, " frame(%p) e0=%p (%s?), e1=%p, e2=%p\n", sse, e0, name, e1, e2); } else { --- mozart-1.4.0.orig/platform/emulator/ozconfig.hh +++ mozart-1.4.0/platform/emulator/ozconfig.hh @@ -127,7 +127,7 @@ int runningUnderEmacs; - char *ozHome; + const char *ozHome; char *osname, *cpu; char *emuexe; @@ -138,7 +138,7 @@ int argC; // root functor's url - char *url; + const char *url; int gui; public: --- mozart-1.4.0.orig/platform/emulator/modGlue.spec +++ mozart-1.4.0/platform/emulator/modGlue.spec @@ -26,23 +26,6 @@ %builtins_all = ( - # compute a CRC for a virtual string. This is used to add a CRC - # to connection tickets, for instance. - 'getCRC' => { in => ['+virtualString'], - out => ['+int'], - BI => BIgetCRC}, - - # marshal a port into a base-64-encoded string (may be used for - # tickets) - 'marshalPort' => { in => ['+port'], - out => ['+string'], - BI => BIportToMS}, - - # unmarshal a port from a base-64-encoded string (see above) - 'unmarshalPort' => { in => ['+string'], - out => ['+port'], - BI => BImsToPort}, - # initialize the DP module. The port in argument is used by the # Glue to request connections, etc. 'initDP' => { in => ['+port'], @@ -153,7 +136,7 @@ BI => BIprintDssMemoryAllocation}, # set the DSS log level (0: nothing, 1: normal, 2: important, 3: - # behavior, 4: debug, 5: all); see the internals of the DSS for + # behavior, 4: debug, 5: most, 6:too_much); see the internals of the DSS for # the exact meaning of these levels 'setDssLogLevel' => { in => ['+int'], out => [], @@ -206,23 +189,6 @@ out => ['+value'], BI => BIgetChannelStatus}, - # to be removed - related to former Fault module - 'getEntityCond' => { in => ['value'], - out => ['value'], - BI => BIgetEntityCond}, - - 'installFaultPort' => { in => ['+port'], - out => [], - BI => BIinstallFaultPort}, - - 'distHandlerInstall' => { in => ['value','+int','value'], - out => ['+bool'], - BI => BIdistHandlerInstall}, - - 'distHandlerDeInstall' => { in => ['value','+int','value'], - out => ['+bool'], - BI => BIdistHandlerDeInstall}, - # return a list of broadcast addresses available (used in module # Discovery) 'getBroadcastAddresses' => { in => [], --- mozart-1.4.0.orig/platform/emulator/base64.cc +++ mozart-1.4.0/platform/emulator/base64.cc @@ -0,0 +1,143 @@ +/* + * Authors: + * Erik Klintskog, 2002 + * Zacharias El Banna, 2002 + * + * Contributors: + * optional, Contributor's name (Contributor's email address) + * + * Copyright: + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ + +#if defined(INTERFACE) +#pragma implementation "base64.hh" +#endif + +#include "base64.hh" +#include + +//********************************************************************* +//* Base64 - a simple base64 encoder and decoder. +//* +//* Copyright (c) 1999, Bob Withers - bwit@pobox.com +//* +//* This code may be freely used for any purpose, either personal +//* or commercial, provided the authors copyright notice remains +//* intact. +//********************************************************************* + +const char fillchar = '='; + +const char* cvt = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-"; + + +int find(char c) +{ + int ans = 0; + for( const char *ptr = cvt; *ptr!=c;ptr++) + ans ++; + return ans; +} + +char* encodeB64(char* data, int len) +{ + int i; + int c; + char *ret = (char*) malloc(len * 2); + char *ptr = ret; + + for (i = 0; i < len; ++i) + { + c = (data[i] >> 2) & 0x3f; + *ret++ = cvt[c]; + c = (data[i] << 4) & 0x3f; + if (++i < len) + c |= (data[i] >> 4) & 0x0f; + + *ret++ = cvt[c]; + if (i < len) + { + c = (data[i] << 2) & 0x3f; + if (++i < len) + c |= (data[i] >> 6) & 0x03; + + *ret++ = cvt[c]; + } + else + { + ++i; + *ret++ = fillchar; + } + + if (i < len) + { + c = data[i] & 0x3f; + *ret++=cvt[c]; + } + else + { + *ret++ = fillchar; + } + } + *ret = 0; + + return(ptr); +} + +char* decodeB64(char* data, int len) +{ + int i; + char c; + char c1; + char* ret = (char*)malloc(len); + char* ptr = ret; + for (i = 0; i < len; ++i) + { + c = (char) find(data[i]); + ++i; + c1 = (char) find(data[i]); + c = (c << 2) | ((c1 >> 4) & 0x3); + *ret++= c; + if (++i < len) + { + c = data[i]; + if (fillchar == c) break; + + c = (char) find(c); + c1 = ((c1 << 4) & 0xf0) | ((c >> 2) & 0xf); + *ret++ = c1; + } + + if (++i < len) + { + c1 = data[i]; + if (fillchar == c1) + break; + + c1 = (char)find(c1); + c = ((c << 6) & 0xc0) | c1; + *ret++ = c; + } + } + + return(ptr); +} + + + + --- mozart-1.4.0.orig/platform/emulator/urlc.hh +++ mozart-1.4.0/platform/emulator/urlc.hh @@ -68,7 +68,7 @@ inline -char *urlcStrerror(int err) +const char *urlcStrerror(int err) { switch (err) { case URLC_EALLOC: return "allocation error"; --- mozart-1.4.0.orig/platform/emulator/bytedata.cc +++ mozart-1.4.0/platform/emulator/bytedata.cc @@ -842,9 +842,9 @@ OZ_RETURN(list); } OZ_BI_end -OZ_Term OZ_mkByteString(char*s,int n) { +OZ_Term OZ_mkByteString(const char*s,int n) { ByteString* bs = new ByteString(n); - memcpy((void*)bs->getData(),(void*)s,n); + memcpy((void*)bs->getData(),(const void*)s,n); return makeTaggedExtension(bs); } --- mozart-1.4.0.orig/platform/emulator/mozart_cpi.hh +++ mozart-1.4.0/platform/emulator/mozart_cpi.hh @@ -48,7 +48,7 @@ #define OZ_FAIL OZ_FAILED #define OZ_ENTAIL OZ_ENTAILED -#define OZ_EXPECTED_TYPE(S) char * expectedType = S +#define OZ_EXPECTED_TYPE(S) const char * expectedType = S #define __OZ_EXPECT(O, V, T, F) \ @@ -657,17 +657,17 @@ private: OZ_PropagatorProfile * _next; static OZ_PropagatorProfile * _all_headers; - char * _propagator_name; + const char * _propagator_name; unsigned _calls, _samples, _heap; public: OZ_PropagatorProfile(void); - OZ_PropagatorProfile(char * propagator_name); + OZ_PropagatorProfile(const char * propagator_name); - void operator = (char * propagator_name); + void operator = (const char * propagator_name); - char * getPropagatorName(void); + const char * getPropagatorName(void); void incSamples(void); void incCalls(void); unsigned getSamples(void); @@ -682,7 +682,7 @@ }; inline -char * OZ_PropagatorProfile::getPropagatorName() { +const char * OZ_PropagatorProfile::getPropagatorName() { return _propagator_name; } inline @@ -1096,7 +1096,7 @@ #undef __OZ_CPI_hasStag #undef __OZ_CPI_isVar -_FUNDECL(OZ_Return,OZ_typeErrorCPI,(char *, int, char *)); +_FUNDECL(OZ_Return,OZ_typeErrorCPI,(const char *, int, const char *)); #define OZ_getFDInf() (0) #define OZ_getFDSup() (134217727-1) --- mozart-1.4.0.orig/platform/emulator/boot-manager.cc +++ mozart-1.4.0/platform/emulator/boot-manager.cc @@ -462,7 +462,7 @@ return oz_raise(E_ERROR,AtomForeign,"dlOpen",2,oz_atom(filename),res); } else { // osDlopen succeeded - static char * if_identifier = USC "oz_init_module"; + static const char * if_identifier = USC "oz_init_module"; init_fun_t init_function = (init_fun_t) osDlsym(handle,if_identifier); if (init_function == 0) return oz_raise(E_ERROR,AtomForeign, "cannotFindOzInitModule", 1, --- mozart-1.4.0.orig/platform/emulator/prop_int.hh +++ mozart-1.4.0/platform/emulator/prop_int.hh @@ -114,7 +114,7 @@ OZ_PropagatorProfile * profile = prop; Assert(profile); // - char * pn = profile->getPropagatorName(); + const char * pn = profile->getPropagatorName(); printf("<%s[%p]", pn, ozprop); fflush(stdout); #endif @@ -137,7 +137,7 @@ OZ_Term params = ozprop->getParameters(); Assert(profile); // - char * pn = profile->getPropagatorName(); + const char * pn = profile->getPropagatorName(); printf("<%s[%p] %s", pn, ozprop, OZ_toC(params, ozconf.errorPrintDepth, ozconf.errorPrintWidth)); fflush(stdout); // --- mozart-1.4.0.orig/platform/emulator/oztool.in +++ mozart-1.4.0/platform/emulator/oztool.in @@ -34,18 +34,9 @@ # oztool version echoes the oz version # determine oztool includes +# Changed for Debian/GNU: Look for includes in /usr/include/mozart --> if test "${OZTOOL_INCLUDES-NONE}" = NONE; then - if test -n "$OZHOME" && test -r "$OZHOME/include/mozart.h"; then - OZTOOL_INCLUDES="-I$OZHOME/include" - else - oz_tmp=`dirname $0` - oz_tmp=`cd $oz_tmp/.. & pwd` - if test -r "$oz_tmp/include/mozart.h"; then - OZTOOL_INCLUDES="-I$oz_tmp/include" - else - OZTOOL_INCLUDES="-I@prefix@/include"; - fi - fi + OZTOOL_INCLUDES="-I/usr/include/mozart" fi : ${oztool_cxx="@OZTOOL_CXX@ @OZTOOLDYNOPT@ $OZTOOL_INCLUDES"} --- mozart-1.4.0.orig/platform/emulator/value.cc +++ mozart-1.4.0/platform/emulator/value.cc @@ -1288,7 +1288,7 @@ : bi_name(bn), inArity(inArity), outArity(outArity), fun(fn), sited(nat), - ConstTerm(Co_Builtin) { + ConstTermWithHome(NULL, Co_Builtin) { Assert(bn); mod_name = mn ? mn : "`missing module name`"; #ifdef PROFILE_BI @@ -1365,7 +1365,8 @@ OZ_unifyInThread(p->controlvar, oz_unit()); // maybe not useful... p->dispose(); return; - } + } + pt=&((*pt)->next); } } --- mozart-1.4.0.orig/platform/emulator/Makefile.in +++ mozart-1.4.0/platform/emulator/Makefile.in @@ -94,7 +94,7 @@ print.cc base.cc ozconfig.cc \ foreign.cc dpInterface.cc boot-manager.cc \ builtins.cc vprops.cc debug.cc interFault.cc \ - system.cc alice.cc + system.cc alice.cc base64.cc SUPPORTSRCS=\ stack.cc ozostream.cc hashtbl.cc \ @@ -229,10 +229,15 @@ .PHONY: all first install install-bin install-inc \ install-dir depend tags clean cleaner distclean veryclean -all: $(TARGETS) $(DYNAMIC_MODULETARGETS) +all: $(TARGETS) dynamic_modules bootstrap:: all +dynamic_modules: $(TARGETS) + for dynamic_module in $(DYNAMIC_MODULETARGETS); do \ + $(MAKE) $$dynamic_module; \ + done + $(MODINTERS): bidecl.perl .PHONY: libDSS.a libDSS.a: @@ -390,6 +395,8 @@ if test -s libDSS.so; then mkdir -p $(BINDIR)/lib; fi; if test -s libDSS.so; then cp libDSS.so $(BINDIR)/lib/libDSS.so; fi; +$(NEWTARGETS): $(NEWCACHEDIR) + $(NEWCACHEDIR): $(INSTALL_DIR) $@ @@ -407,7 +414,7 @@ $(INSTALL_DIR) $@ version.cc: version.sed $(filter-out version.cc,$(ALLSRCS)) - sed -e "s/HEREGOESDATE/@OZBUILDDATE@/" \ + sed -e "s/HEREGOESDATE/@OZBUILDDATE@@OZBUILDTIME@/" \ -e "s/OZPLATFORM/$(PLATFORM)/" \ $(SRCDIR)/version.sed > version.cc @@ -429,7 +436,7 @@ for d in $(SUBDIRS); do (cd $$d; $(MAKE) tags); done clean:: - -rm -f gmon.out fetchedInstr.dump verb_out.txt + -rm -f gmon.out fetchedInstr*.dump verb_out.txt new-scanner: --- mozart-1.4.0.orig/platform/emulator/cpi_misc.cc +++ mozart-1.4.0/platform/emulator/cpi_misc.cc @@ -219,7 +219,7 @@ return sgl; } -OZ_Return OZ_typeErrorCPI(char * typeString, int pos, char * comment) +OZ_Return OZ_typeErrorCPI(const char * typeString, int pos, const char * comment) { return typeError(pos, comment, typeString); } --- mozart-1.4.0.orig/platform/emulator/ozconfig.cc +++ mozart-1.4.0/platform/emulator/ozconfig.cc @@ -37,7 +37,7 @@ ConfigData ozconf; -Bool getDefaultPropertyBool(char *p,Bool def) +Bool getDefaultPropertyBool(const char *p,Bool def) { char *str=osgetenv(p); if (!str) return def; @@ -138,7 +138,7 @@ /* set osname and cpu */ /* "ozplatform" (defined in version.cc) has the form , * so split it up */ - extern char *ozplatform; + extern const char *ozplatform; osname = strdup(ozplatform); cpu = osname; @@ -149,7 +149,7 @@ break; } if (*cpu=='\0') { - cpu = "unknown"; /* should never happen */ + cpu = strdup("unknown"); /* should never happen */ break; } cpu++; --- mozart-1.4.0.orig/platform/emulator/builtins.cc +++ mozart-1.4.0/platform/emulator/builtins.cc @@ -51,6 +51,9 @@ #include "var_of.hh" #include "var_readonly.hh" #include "mozart_cpi.hh" +#include "mozart.h" +#include "base64.hh" +#include "pickleBase.hh" #include "dictionary.hh" #include "dpInterface.hh" #include "bytedata.hh" @@ -1361,6 +1364,36 @@ } } OZ_BI_end +OZ_BI_define(BIvsCRC,1,1) +{ + oz_declareVirtualStringIN(0,s); + + crc_t crc = update_crc(init_crc(),(unsigned char *) s, strlen(s)); + + OZ_RETURN(OZ_unsignedInt(crc)); +} OZ_BI_end + +OZ_BI_define(BIvsEncodeB64,1,1) +{ + oz_declareVirtualStringIN(0,s); + //This is probably a bad idea. + //Since we want to encode to B64, + //we might have \0's inside. + int len = strlen(s); + char *str = encodeB64((char*) s, len); + //We probably leak the memory too! + OZ_RETURN(OZ_string(str)); +} OZ_BI_end + +OZ_BI_define(BIvsDecodeB64,1,1) +{ + oz_declareVirtualStringIN(0,s); + int len = strlen(s); + char* str = (char*) decodeB64((char*)s, len); + //Here also, we are leaking memory! + OZ_RETURN(OZ_string(str)); +} OZ_BI_end + // --------------------------------------------------------------------- // Chunk // --------------------------------------------------------------------- @@ -2376,7 +2409,7 @@ Numbers ----------------------------------------------------------------------- */ -static OZ_Return bombArith(char *type) +static OZ_Return bombArith(const char *type) { oz_typeError(-1,type); } @@ -4422,7 +4455,7 @@ *=================================================================== */ static -char *getTypeOfPos(char * t, int p) +char *getTypeOfPos(const char * t, int p) { static char buffer[100]; int i, bi, comma; @@ -4442,7 +4475,7 @@ return buffer; } -OZ_Return typeError(int Pos, char *Comment, char *TypeString) +OZ_Return typeError(int Pos, const char *Comment, const char *TypeString) { (void) oz_raise(E_ERROR,E_KERNEL, "type",5,NameUnit,NameUnit, --- mozart-1.4.0.orig/platform/emulator/statisti.cc +++ mozart-1.4.0/platform/emulator/statisti.cc @@ -41,9 +41,9 @@ Statistics ozstat; -void printTime(FILE *fd,char *s,unsigned int t) +void printTime(FILE *fd,const char *s,unsigned int t) { - fprintf(fd,s); + fprintf(fd,"%s",s); if (t < 1000) { fprintf(fd,"%u ms",t); } else { @@ -52,9 +52,9 @@ } static -void printPercent(FILE *fd,char *s,unsigned int t,unsigned int total) +void printPercent(FILE *fd,const char *s,unsigned int t,unsigned int total) { - fprintf(fd,s); + fprintf(fd,"%s",s); if (total == 0) { fprintf(fd,"0"); } else { @@ -66,9 +66,9 @@ int workaroundForBugInGCC1 = KB; int workaroundForBugInGCC2 = MB; -void printMem(FILE *fd,char *s,double m) +void printMem(FILE *fd,const char *s,double m) { - fprintf(fd,s); + fprintf(fd,"%s",s); if (m < KB) { fprintf(fd,"%.0f B",m); return; --- mozart-1.4.0.orig/platform/emulator/dpInterface.hh +++ mozart-1.4.0/platform/emulator/dpInterface.hh @@ -38,10 +38,6 @@ // engine. They implement operations that may imply distribution. // The function pointers are assigned once the glue layer is loaded. -// -extern Bool (*dpReady)(); - - /************************* Entity operations **************************/ --- mozart-1.4.0.orig/platform/emulator/am.cc +++ mozart-1.4.0/platform/emulator/am.cc @@ -162,7 +162,7 @@ preparedCalls = NULL; - char *home = osgetenv("OZHOME"); + const char *home = osgetenv("OZHOME"); if (!home) home ="unknown"; @@ -235,7 +235,7 @@ } if (!p2t && !initFile) { - char* ini = "/share/Init.ozf"; + const char* ini = "/share/Init.ozf"; int m = strlen(ozconf.ozHome); int n = m+strlen(ini)+1; char*s = new char[n]; --- mozart-1.4.0.orig/platform/emulator/marshalerBase.hh +++ mozart-1.4.0/platform/emulator/marshalerBase.hh @@ -154,7 +154,7 @@ // const struct { MarshalTag tag; - char *name; + const char *name; } dif_names[] = { { DIF_UNUSED0, "UNUSED0"}, { DIF_SMALLINT, "SMALLINT"}, --- mozart-1.4.0.orig/platform/emulator/version.sed +++ mozart-1.4.0/platform/emulator/version.sed @@ -27,6 +27,6 @@ #include "config.h" -char *AMVersion = OZVERSION; -char *AMDate = "HEREGOESDATE"; -char *ozplatform = "OZPLATFORM"; +const char *AMVersion = OZVERSION; +const char *AMDate = "HEREGOESDATE"; +const char *ozplatform = "OZPLATFORM"; --- mozart-1.4.0.orig/platform/emulator/unix.cc +++ mozart-1.4.0/platform/emulator/unix.cc @@ -194,7 +194,7 @@ // The string returned must be used immediately. // The definition relies on the following errors being defined for all // platforms directly or as done in wsock.hh -char *errnoToString(int aErrno) { +const char *errnoToString(int aErrno) { switch(aErrno) { case ECONNREFUSED: return "Connection refused"; @@ -220,7 +220,7 @@ } } -int raiseUnixError(char *f,int n, char * e, char * g) { +int raiseUnixError(const char *f,int n, const char * e, const char * g) { return oz_raise(E_SYSTEM,E_OS, g, 3, OZ_string(f), OZ_int(n), OZ_string(e)); } @@ -236,7 +236,7 @@ #else -static char* h_strerror(const int err) { +static const char* h_strerror(const int err) { switch (err) { case HOST_NOT_FOUND: return "No such host is known."; @@ -611,7 +611,7 @@ OZ_BI_iodefine(unix_stat,1,1) { struct stat buf; - char *fileType; + const char *fileType; OZ_declareVsIN(0, filename); retry: @@ -1352,7 +1352,7 @@ WRAPCALL("accept",osaccept(sock,(struct sockaddr *)&from, &fromlen),fd); - char *host = inet_ntoa(from.sin_addr); + const char *host = inet_ntoa(from.sin_addr); if (strcmp(host,"127.0.0.1")==0) { // this prevents network connections being host = "localhost"; // opened when working at home for example } else { @@ -1393,7 +1393,7 @@ #endif // - char *host = inet_ntoa(from.sin_addr); + const char *host = inet_ntoa(from.sin_addr); if (strcmp(host,"127.0.0.1")==0) { // this prevents network connections being host = "localhost"; // opened when working at home for example } else { --- mozart-1.4.0.orig/platform/emulator/site.cc +++ mozart-1.4.0/platform/emulator/site.cc @@ -87,7 +87,8 @@ char *nodename = oslocalhostname(); if(nodename==0) { // OZ_warning("getMySiteIP: don't know local hostname"); - nodename = "localhost"; + nodename = (char*) malloc(10); + strcpy(nodename,"localhost"); } // very simple for now --- mozart-1.4.0.orig/platform/emulator/urlc.cc +++ mozart-1.4.0/platform/emulator/urlc.cc @@ -78,7 +78,7 @@ #if 2 <= URLC_DEBUG /* messages to stderr */ #define URLC_MSG(s) fprintf(stderr, "%s:%d: %s\n", \ - __FILE__, __LINE__, ((char*)s)) + __FILE__, __LINE__, ((const char*)s)) #else #define URLC_MSG(s) #endif @@ -165,7 +165,7 @@ int clean(void); // cleans the data fields int tmp_file_open(char *file); // opens a temporary file int tcpip_open(const char* host, int port); // opens connection - int writen(int sockfd, char* buf, int n); // write n bytes to socket + int writen(int sockfd, const char* buf, int n); // write n bytes to socket int write3(int sockfd, const char* p1, int lp1, // writev limited clone const char* p2, int lp2, const char* p3, int lp3); int descape(char* s); // de-escape the string (modifies it!) @@ -179,10 +179,10 @@ int parse_file(const char* line); int get_file(void); - int parse_http(const char* line); + int parse_http(char* line); int get_http(char *file); - int parse_ftp(const char* line); + int parse_ftp(char* line); int get_ftp(char *file); int parse(const char* line); @@ -197,7 +197,7 @@ /* known protocols */ /* ##extension */ -static char* URLC_kp[] = {"http://", "file:", "ftp://", NULL}; +static const char* URLC_kp[] = {"http://", "file:", "ftp://", NULL}; /* I love languages capable of true & full token pasting! */ /* characters not to be escaped in HTTP requests. @@ -347,7 +347,7 @@ returns URLC_OK or reason */ int -urlc::writen(int lsockfd, char* buf, int n) +urlc::writen(int lsockfd, const char* buf, int n) { int nwritten = 0; int nleft = n; @@ -595,7 +595,7 @@ be % escaped _before_ given to this client */ int -urlc::parse_ftp(const char* line) +urlc::parse_ftp(char* line) { char* p_collon = NULL; /* positions in line */ char* p_at = NULL; @@ -1018,7 +1018,7 @@ // wise enough, htons, isn't it? it swaps, I don't care // Intel is little-^H^H^H^H^H^H small-endian - sprintf(port_val, "%s,%d,%d", port_val, + sprintf(port_val + strlen(port_val), ",%d,%d", (unsigned short)((htons(local_addr.sin_port) >> 8) & 0xff), (unsigned short)(htons(local_addr.sin_port) & 0xff)); URLC_MSG(port_val); @@ -1124,7 +1124,7 @@ returns URLC_OK on successful parse, reason otherwise. */ int -urlc::parse_http(const char* line) +urlc::parse_http(char* line) { char* p_collon = NULL; /* positions in line */ char* p_slash = NULL; @@ -1228,7 +1228,7 @@ int n; int tot_len = 0; char* p = NULL; - char* req_form[] = { "GET ", path, " HTTP/1.0\r\n", + const char* req_form[] = { "GET ", path, " HTTP/1.0\r\n", "Host: ", host , "\r\n", "User-Agent: ", HTTP_USER_AGENT, "\r\n", "From: tf@info.ucl.ac.be\r\n", --- mozart-1.4.0.orig/platform/emulator/parser.cc +++ mozart-1.4.0/platform/emulator/parser.cc @@ -1,7 +1,9 @@ -/* A Bison parser, made by GNU Bison 2.0. */ +/* A Bison parser, made by GNU Bison 2.3. */ -/* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +/* Skeleton implementation for Bison's Yacc-like parsers in C + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,16 +17,24 @@ 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. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ + +/* As a special exception, you may create a larger work that contains + part or all of the Bison parser skeleton and distribute that work + under terms of your choice, so long as that work isn't itself a + parser generator using the skeleton or a modified version thereof + as a parser skeleton. Alternatively, if you modify or redistribute + the parser skeleton itself, you may (at your option) remove this + special exception, which will cause the skeleton and the resulting + Bison output files to be licensed under the GNU General Public + License without this special exception. -/* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. - This special exception was added by the Free Software Foundation - in version 1.24 of Bison. */ + This special exception was added by the Free Software Foundation in + version 2.2 of Bison. */ -/* Written by Richard Stallman by simplifying the original so called - ``semantic'' parser. */ +/* C LALR(1) parser skeleton written by Richard Stallman, by + simplifying the original so-called "semantic" parser. */ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local @@ -36,6 +46,9 @@ /* Identify Bison output. */ #define YYBISON 1 +/* Bison version. */ +#define YYBISON_VERSION "2.3" + /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -157,6 +170,7 @@ T_DEREFF = 351 }; #endif +/* Tokens. */ #define T_SWITCH 258 #define T_SWITCHNAME 259 #define T_LOCALSWITCHES 260 @@ -326,9 +340,9 @@ } void checkDeprecation(OZ_Term coord); -void xyreportWarning(char *kind, char *msg, OZ_Term coord); -void xyreportError(char *kind, char *msg, OZ_Term coord); -void xyreportError(char *kind, char *msg, +void xyreportWarning(const char *kind, const char *msg, OZ_Term coord); +void xyreportError(const char *kind, const char *msg, OZ_Term coord); +void xyreportError(const char *kind, const char *msg, const char *file, int line, int column); @@ -341,7 +355,7 @@ static OZ_Term yyoutput; -static void xyerror(char *); +static void xyerror(const char *); //----------------- // Atom definitions @@ -753,7 +767,7 @@ } inline -OZ_Term makeInt(char * chars, OZ_Term pos) { +OZ_Term makeInt(const char * chars, OZ_Term pos) { SRecord * t = SRecord::newSRecord(PA_fInt, 2); t->setArg(0, OZ_CStringToInt(chars)); t->setArg(1, pos); @@ -828,14 +842,21 @@ # define YYERROR_VERBOSE 0 #endif -#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED) +/* Enabling the token table. */ +#ifndef YYTOKEN_TABLE +# define YYTOKEN_TABLE 0 +#endif + +#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED +typedef union YYSTYPE -typedef union YYSTYPE { +{ OZ_Term t; int i; -} YYSTYPE; -/* Line 190 of yacc.c. */ +} +/* Line 187 of yacc.c. */ + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 # define YYSTYPE_IS_TRIVIAL 1 @@ -846,17 +867,94 @@ /* Copy the second part of user declarations. */ -/* Line 213 of yacc.c. */ +/* Line 216 of yacc.c. */ + + +#ifdef short +# undef short +#endif + +#ifdef YYTYPE_UINT8 +typedef YYTYPE_UINT8 yytype_uint8; +#else +typedef unsigned char yytype_uint8; +#endif + +#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; +#endif + +#ifdef YYTYPE_UINT16 +typedef YYTYPE_UINT16 yytype_uint16; +#else +typedef unsigned short int yytype_uint16; +#endif +#ifdef YYTYPE_INT16 +typedef YYTYPE_INT16 yytype_int16; +#else +typedef short int yytype_int16; +#endif -#if ! defined (yyoverflow) || YYERROR_VERBOSE +#ifndef YYSIZE_T +# ifdef __SIZE_TYPE__ +# define YYSIZE_T __SIZE_TYPE__ +# elif defined size_t +# define YYSIZE_T size_t +# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# define YYSIZE_T size_t +# else +# define YYSIZE_T unsigned int +# endif +#endif + +#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) -# ifndef YYFREE -# define YYFREE free +#ifndef YY_ +# if YYENABLE_NLS +# if ENABLE_NLS +# include /* INFRINGES ON USER NAME SPACE */ +# define YY_(msgid) dgettext ("bison-runtime", msgid) +# endif # endif -# ifndef YYMALLOC -# define YYMALLOC malloc +# ifndef YY_ +# define YY_(msgid) msgid # endif +#endif + +/* Suppress unused-variable warnings by "using" E. */ +#if ! defined lint || defined __GNUC__ +# define YYUSE(e) ((void) (e)) +#else +# define YYUSE(e) /* empty */ +#endif + +/* Identity function, used to suppress warnings about constant conditions. */ +#ifndef lint +# define YYID(n) (n) +#else +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +static int +YYID (int i) +#else +static int +YYID (i) + int i; +#endif +{ + return i; +} +#endif + +#if ! defined yyoverflow || YYERROR_VERBOSE /* The parser invokes alloca or malloc; define the necessary symbols. */ @@ -864,34 +962,76 @@ # if YYSTACK_USE_ALLOCA # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca +# elif defined __BUILTIN_VA_ARG_INCR +# include /* INFRINGES ON USER NAME SPACE */ +# elif defined _AIX +# define YYSTACK_ALLOC __alloca +# elif defined _MSC_VER +# include /* INFRINGES ON USER NAME SPACE */ +# define alloca _alloca # else # define YYSTACK_ALLOC alloca +# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif # endif # endif # endif # ifdef YYSTACK_ALLOC - /* Pacify GCC's `empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# else -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t + /* Pacify GCC's `empty if-body' warning. */ +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) +# ifndef YYSTACK_ALLOC_MAXIMUM + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ +# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif +# else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE +# ifndef YYSTACK_ALLOC_MAXIMUM +# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM +# endif +# if (defined __cplusplus && ! defined _STDLIB_H \ + && ! ((defined YYMALLOC || defined malloc) \ + && (defined YYFREE || defined free))) +# include /* INFRINGES ON USER NAME SPACE */ +# ifndef _STDLIB_H +# define _STDLIB_H 1 +# endif +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif +# ifndef YYFREE +# define YYFREE free +# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +void free (void *); /* INFRINGES ON USER NAME SPACE */ +# endif +# endif # endif -#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ +#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ -#if (! defined (yyoverflow) \ - && (! defined (__cplusplus) \ - || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) +#if (! defined yyoverflow \ + && (! defined __cplusplus \ + || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short int yyss; + yytype_int16 yyss; YYSTYPE yyvs; }; @@ -901,24 +1041,24 @@ /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if defined (__GNUC__) && 1 < __GNUC__ +# if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else # define YYCOPY(To, From, Count) \ do \ { \ - register YYSIZE_T yyi; \ + YYSIZE_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (To)[yyi] = (From)[yyi]; \ } \ - while (0) + while (YYID (0)) # endif # endif @@ -936,39 +1076,33 @@ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / sizeof (*yyptr); \ } \ - while (0) - -#endif + while (YYID (0)) -#if defined (__STDC__) || defined (__cplusplus) - typedef signed char yysigned_char; -#else - typedef short int yysigned_char; #endif -/* YYFINAL -- State number of the termination state. */ +/* YYFINAL -- State number of the termination state. */ #define YYFINAL 120 /* YYLAST -- Last index in YYTABLE. */ #define YYLAST 2151 -/* YYNTOKENS -- Number of terminals. */ +/* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 118 -/* YYNNTS -- Number of nonterminals. */ +/* YYNNTS -- Number of nonterminals. */ #define YYNNTS 146 -/* YYNRULES -- Number of rules. */ +/* YYNRULES -- Number of rules. */ #define YYNRULES 377 -/* YYNRULES -- Number of states. */ +/* YYNRULES -- Number of states. */ #define YYNSTATES 810 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 351 -#define YYTRANSLATE(YYX) \ +#define YYTRANSLATE(YYX) \ ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */ -static const unsigned char yytranslate[] = +static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1011,7 +1145,7 @@ #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short int yyprhs[] = +static const yytype_uint16 yyprhs[] = { 0, 0, 3, 6, 8, 11, 14, 16, 20, 23, 30, 37, 43, 44, 47, 49, 51, 53, 54, 57, @@ -1053,8 +1187,8 @@ 1255, 1256, 1266, 1268, 1274, 1276, 1278, 1280 }; -/* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short int yyrhs[] = +/* YYRHS -- A `-1'-separated list of the rules' RHS. */ +static const yytype_int16 yyrhs[] = { 119, 0, -1, 120, 71, -1, 1, -1, 125, 121, -1, 218, 121, -1, 121, -1, 202, 140, 121, -1, @@ -1188,7 +1322,7 @@ }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short int yyrline[] = +static const yytype_uint16 yyrline[] = { 0, 750, 750, 752, 756, 758, 761, 763, 768, 770, 773, 775, 779, 782, 784, 786, 788, 793, 794, 798, @@ -1231,9 +1365,9 @@ }; #endif -#if YYDEBUG || YYERROR_VERBOSE -/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ +#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE +/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. + First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { "$end", "error", "$undefined", "T_SWITCH", "T_SWITCHNAME", @@ -1290,7 +1424,7 @@ # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short int yytoknum[] = +static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -1308,7 +1442,7 @@ # endif /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const unsigned short int yyr1[] = +static const yytype_uint16 yyr1[] = { 0, 118, 119, 119, 120, 120, 120, 120, 121, 121, 121, 121, 121, 122, 122, 122, 122, 123, 123, 124, @@ -1351,7 +1485,7 @@ }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ -static const unsigned char yyr2[] = +static const yytype_uint8 yyr2[] = { 0, 2, 2, 1, 2, 2, 1, 3, 2, 6, 6, 5, 0, 2, 1, 1, 1, 0, 2, 2, @@ -1396,7 +1530,7 @@ /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const unsigned short int yydefact[] = +static const yytype_uint16 yydefact[] = { 0, 3, 17, 14, 15, 16, 251, 148, 258, 256, 257, 255, 252, 152, 260, 260, 260, 260, 260, 260, @@ -1481,8 +1615,8 @@ 377, 320, 320, 320, 324, 324, 324, 365, 368, 371 }; -/* YYDEFGOTO[NTERM-NUM]. */ -static const short int yydefgoto[] = +/* YYDEFGOTO[NTERM-NUM]. */ +static const yytype_int16 yydefgoto[] = { -1, 55, 56, 57, 58, 79, 80, 115, 60, 314, 61, 191, 192, 392, 677, 597, 679, 187, 188, 593, @@ -1504,7 +1638,7 @@ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ #define YYPACT_NINF -584 -static const short int yypact[] = +static const yytype_int16 yypact[] = { 1151, -584, 248, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, -584, @@ -1590,7 +1724,7 @@ }; /* YYPGOTO[NTERM-NUM]. */ -static const short int yypgoto[] = +static const yytype_int16 yypgoto[] = { -584, -584, 712, 14, -584, 686, -584, 108, 414, -379, 104, 575, -584, -584, -584, 183, -584, -584, 589, 109, @@ -1614,7 +1748,7 @@ number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -305 -static const short int yytable[] = +static const yytype_int16 yytable[] = { 83, 84, 86, 87, 88, 433, 488, 331, 89, 90, 92, 93, 94, 95, 96, 97, 98, 200, 108, 99, @@ -1834,7 +1968,7 @@ 0, 54 }; -static const short int yycheck[] = +static const yytype_int16 yycheck[] = { 15, 16, 17, 18, 19, 336, 384, 235, 23, 24, 25, 26, 27, 28, 29, 30, 31, 106, 43, 34, @@ -2056,7 +2190,7 @@ /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const unsigned short int yystos[] = +static const yytype_uint16 yystos[] = { 0, 1, 3, 5, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 23, 25, 26, 27, 28, 30, @@ -2141,22 +2275,6 @@ 263, 256, 258, 260, 236, 236, 236, 238, 238, 238 }; -#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) -# define YYSIZE_T __SIZE_TYPE__ -#endif -#if ! defined (YYSIZE_T) && defined (size_t) -# define YYSIZE_T size_t -#endif -#if ! defined (YYSIZE_T) -# if defined (__STDC__) || defined (__cplusplus) -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# endif -#endif -#if ! defined (YYSIZE_T) -# define YYSIZE_T unsigned int -#endif - #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = YYEMPTY) #define YYEMPTY (-2) @@ -2182,15 +2300,15 @@ yychar = (Token); \ yylval = (Value); \ yytoken = YYTRANSLATE (yychar); \ - YYPOPSTACK; \ + YYPOPSTACK (1); \ goto yybackup; \ } \ else \ - { \ - yyerror ("syntax error: cannot back up");\ + { \ + yyerror (YY_("syntax error: cannot back up")); \ YYERROR; \ } \ -while (0) +while (YYID (0)) #define YYTERROR 1 @@ -2205,7 +2323,7 @@ #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ - if (N) \ + if (YYID (N)) \ { \ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ @@ -2219,7 +2337,7 @@ (Current).first_column = (Current).last_column = \ YYRHSLOC (Rhs, 0).last_column; \ } \ - while (0) + while (YYID (0)) #endif @@ -2231,8 +2349,8 @@ # if YYLTYPE_IS_TRIVIAL # define YY_LOCATION_PRINT(File, Loc) \ fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif @@ -2259,36 +2377,96 @@ do { \ if (yydebug) \ YYFPRINTF Args; \ -} while (0) +} while (YYID (0)) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yysymprint (stderr, \ - Type, Value); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (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)) + + +/*--------------------------------. +| Print this symbol on YYOUTPUT. | +`--------------------------------*/ + +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) +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 +{ + if (!yyvaluep) + return; +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# else + YYUSE (yyoutput); +# endif + switch (yytype) + { + default: + break; + } +} + + +/*--------------------------------. +| 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]); + + yy_symbol_value_print (yyoutput, yytype, yyvaluep); + YYFPRINTF (yyoutput, ")"); +} /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_stack_print (short int *bottom, short int *top) +yy_stack_print (yytype_int16 *bottom, yytype_int16 *top) #else static void yy_stack_print (bottom, top) - short int *bottom; - short int *top; + yytype_int16 *bottom; + yytype_int16 *top; #endif { YYFPRINTF (stderr, "Stack now"); - for (/* Nothing. */; bottom <= top; ++bottom) + for (; bottom <= top; ++bottom) YYFPRINTF (stderr, " %d", *bottom); YYFPRINTF (stderr, "\n"); } @@ -2297,37 +2475,45 @@ do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ -} while (0) +} while (YYID (0)) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule) #else static void -yy_reduce_print (yyrule) +yy_reduce_print (yyvsp, yyrule) + YYSTYPE *yyvsp; int yyrule; #endif { + int yynrhs = yyr2[yyrule]; int yyi; - unsigned int yylno = yyrline[yyrule]; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ", - yyrule - 1, yylno); - /* Print the symbols being reduced, and their result. */ - for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++) - YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]); - YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]); + unsigned long int yylno = yyrline[yyrule]; + YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", + yyrule - 1, yylno); + /* The symbols being reduced. */ + for (yyi = 0; yyi < yynrhs; yyi++) + { + fprintf (stderr, " $%d = ", yyi + 1); + yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], + &(yyvsp[(yyi + 1) - (yynrhs)]) + ); + fprintf (stderr, "\n"); + } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (Rule); \ -} while (0) + yy_reduce_print (yyvsp, Rule); \ +} while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ @@ -2349,7 +2535,7 @@ if the built-in stack extension method is used). Do not make this value too large; the results are undefined if - SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) + YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH @@ -2361,45 +2547,47 @@ #if YYERROR_VERBOSE # ifndef yystrlen -# if defined (__GLIBC__) && defined (_STRING_H) +# if defined __GLIBC__ && defined _STRING_H # define yystrlen strlen # else /* Return the length of YYSTR. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static YYSIZE_T -# if defined (__STDC__) || defined (__cplusplus) yystrlen (const char *yystr) -# else +#else +static YYSIZE_T yystrlen (yystr) - const char *yystr; -# endif + const char *yystr; +#endif { - register const char *yys = yystr; - - while (*yys++ != '\0') + YYSIZE_T yylen; + for (yylen = 0; yystr[yylen]; yylen++) continue; - - return yys - yystr - 1; + return yylen; } # endif # endif # ifndef yystpcpy -# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE) +# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static char * -# if defined (__STDC__) || defined (__cplusplus) yystpcpy (char *yydest, const char *yysrc) -# else +#else +static char * yystpcpy (yydest, yysrc) - char *yydest; - const char *yysrc; -# endif + char *yydest; + const char *yysrc; +#endif { - register char *yyd = yydest; - register const char *yys = yysrc; + char *yyd = yydest; + const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; @@ -2409,53 +2597,171 @@ # endif # endif -#endif /* !YYERROR_VERBOSE */ +# ifndef yytnamerr +/* Copy to YYRES the contents of YYSTR after stripping away unnecessary + quotes and backslashes, so that it's suitable for yyerror. The + heuristic is that double-quoting is unnecessary unless the string + contains an apostrophe, a comma, or backslash (other than + backslash-backslash). YYSTR is taken from yytname. If YYRES is + null, do not copy; instead, return the length of what the result + would have been. */ +static YYSIZE_T +yytnamerr (char *yyres, const char *yystr) +{ + if (*yystr == '"') + { + YYSIZE_T yyn = 0; + 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; + } + do_not_strip_quotes: ; + } -#if YYDEBUG -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ + if (! yyres) + return yystrlen (yystr); -#if defined (__STDC__) || defined (__cplusplus) -static void -yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep) -#else -static void -yysymprint (yyoutput, yytype, yyvaluep) - FILE *yyoutput; - int yytype; - YYSTYPE *yyvaluep; -#endif + return yystpcpy (yyres, yystr) - yyres; +} +# endif + +/* Copy into YYRESULT an error message about the unexpected token + YYCHAR while in state YYSTATE. Return the number of bytes copied, + including the terminating null byte. If YYRESULT is null, do not + copy anything; just return the number of bytes that would be + copied. As a special case, return 0 if an ordinary "syntax error" + message will do. Return YYSIZE_MAXIMUM if overflow occurs during + size calculation. */ +static YYSIZE_T +yysyntax_error (char *yyresult, int yystate, int yychar) { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + int yyn = yypact[yystate]; - if (yytype < YYNTOKENS) - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); + if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) + return 0; else - YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + { + int yytype = YYTRANSLATE (yychar); + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + int yysize_overflow = 0; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + int yyx; + +# if 0 + /* This is so xgettext sees the translatable formats that are + constructed on the fly. */ + YY_("syntax error, unexpected %s"); + YY_("syntax error, unexpected %s, expecting %s"); + YY_("syntax error, unexpected %s, expecting %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s"); + YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); +# endif + char *yyfmt; + char const *yyf; + static char const yyunexpected[] = "syntax error, unexpected %s"; + static char const yyexpecting[] = ", expecting %s"; + static char const yyor[] = " or %s"; + char yyformat[sizeof yyunexpected + + sizeof yyexpecting - 1 + + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) + * (sizeof yyor - 1))]; + char const *yyprefix = yyexpecting; + + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yycount = 1; + + yyarg[0] = yytname[yytype]; + yyfmt = yystpcpy (yyformat, yyunexpected); + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + yyformat[sizeof yyunexpected - 1] = '\0'; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + yyfmt = yystpcpy (yyfmt, yyprefix); + yyprefix = yyor; + } + + yyf = YY_(yyformat); + yysize1 = yysize + yystrlen (yyf); + yysize_overflow |= (yysize1 < yysize); + yysize = yysize1; + if (yysize_overflow) + return YYSIZE_MAXIMUM; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - switch (yytype) - { - default: - break; + if (yyresult) + { + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + char *yyp = yyresult; + int yyi = 0; + while ((*yyp = *yyf) != '\0') + { + if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyf += 2; + } + else + { + yyp++; + yyf++; + } + } + } + return yysize; } - YYFPRINTF (yyoutput, ")"); } +#endif /* YYERROR_VERBOSE */ + -#endif /* ! YYDEBUG */ /*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ -#if defined (__STDC__) || defined (__cplusplus) +/*ARGSUSED*/ +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) static void yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else @@ -2466,8 +2772,7 @@ YYSTYPE *yyvaluep; #endif { - /* Pacify ``unused variable'' warnings. */ - (void) yyvaluep; + YYUSE (yyvaluep); if (!yymsg) yymsg = "Deleting"; @@ -2477,7 +2782,7 @@ { default: - break; + break; } } @@ -2485,13 +2790,13 @@ /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void *YYPARSE_PARAM); -# else +#else int yyparse (); -# endif +#endif #else /* ! YYPARSE_PARAM */ -#if defined (__STDC__) || defined (__cplusplus) +#if defined __STDC__ || defined __cplusplus int yyparse (void); #else int yyparse (); @@ -2516,14 +2821,18 @@ `----------*/ #ifdef YYPARSE_PARAM -# if defined (__STDC__) || defined (__cplusplus) -int yyparse (void *YYPARSE_PARAM) -# else -int yyparse (YYPARSE_PARAM) - void *YYPARSE_PARAM; -# endif +#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 (__cplusplus) +#if (defined __STDC__ || defined __C99__FUNC__ \ + || defined __cplusplus || defined _MSC_VER) int yyparse (void) #else @@ -2534,13 +2843,19 @@ #endif { - register int yystate; - register int yyn; + int yystate; + int yyn; int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; +#if YYERROR_VERBOSE + /* Buffer for error messages, and its allocated size. */ + char yymsgbuf[128]; + char *yymsg = yymsgbuf; + YYSIZE_T yymsg_alloc = sizeof yymsgbuf; +#endif /* Three stacks and their tools: `yyss': related to states, @@ -2551,18 +2866,18 @@ to reallocate them elsewhere. */ /* The state stack. */ - short int yyssa[YYINITDEPTH]; - short int *yyss = yyssa; - register short int *yyssp; + yytype_int16 yyssa[YYINITDEPTH]; + yytype_int16 *yyss = yyssa; + yytype_int16 *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs = yyvsa; - register YYSTYPE *yyvsp; + YYSTYPE *yyvsp; -#define YYPOPSTACK (yyvsp--, yyssp--) +#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)) YYSIZE_T yystacksize = YYINITDEPTH; @@ -2571,9 +2886,9 @@ YYSTYPE yyval; - /* When reducing, the number of symbols on the RHS of the reduced - rule. */ - int yylen; + /* The number of symbols on the RHS of the reduced rule. + Keep to zero when no symbol should be popped. */ + int yylen = 0; YYDPRINTF ((stderr, "Starting parse\n")); @@ -2590,9 +2905,6 @@ yyssp = yyss; yyvsp = yyvs; - - yyvsp[0] = yylval; - goto yysetstate; /*------------------------------------------------------------. @@ -2600,8 +2912,7 @@ `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks - have just been pushed. so pushing a state here evens the stacks. - */ + have just been pushed. So pushing a state here evens the stacks. */ yyssp++; yysetstate: @@ -2614,18 +2925,18 @@ #ifdef yyoverflow { - /* Give user a chance to reallocate the stack. Use copies of + /* 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; - short int *yyss1 = yyss; + 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 ("parser stack overflow", + yyoverflow (YY_("memory exhausted"), &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), @@ -2636,21 +2947,21 @@ } #else /* no yyoverflow */ # ifndef YYSTACK_RELOCATE - goto yyoverflowlab; + goto yyexhaustedlab; # else /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) - goto yyoverflowlab; + goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { - short int *yyss1 = yyss; + yytype_int16 *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) - goto yyoverflowlab; + goto yyexhaustedlab; YYSTACK_RELOCATE (yyss); YYSTACK_RELOCATE (yyvs); @@ -2681,12 +2992,10 @@ `-----------*/ yybackup: -/* Do appropriate processing given the current state. */ -/* Read a look-ahead token if we need one and don't already have one. */ -/* yyresume: */ + /* Do appropriate processing given the current state. Read a + look-ahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to look-ahead token. */ - yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; @@ -2728,22 +3037,21 @@ if (yyn == YYFINAL) YYACCEPT; + /* Count tokens shifted since error; after three, turn off error + status. */ + if (yyerrstatus) + yyerrstatus--; + /* Shift the look-ahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - /* Discard the token being shifted unless it is eof. */ + /* Discard the shifted token unless it is eof. */ if (yychar != YYEOF) yychar = YYEMPTY; + yystate = yyn; *++yyvsp = yylval; - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - yystate = yyn; goto yynewstate; @@ -2780,7 +3088,7 @@ { case 2: - { yyoutput = (yyvsp[-1].t); YYACCEPT; } + { yyoutput = (yyvsp[(1) - (2)].t); YYACCEPT; } break; case 3: @@ -2790,46 +3098,46 @@ case 4: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 5: { (yyval.t) = oz_consUnwrap(newCTerm(PA_fSynTopLevelProductionTemplates, - (yyvsp[-1].t)),(yyvsp[0].t)); } + (yyvsp[(1) - (2)].t)),(yyvsp[(2) - (2)].t)); } break; case 6: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 7: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fFunctor,newCTerm(PA_fDollar,(yyvsp[-2].t)), - (yyvsp[-1].t),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fFunctor,newCTerm(PA_fDollar,(yyvsp[(1) - (3)].t)), + (yyvsp[(2) - (3)].t),(yyvsp[(1) - (3)].t)),(yyvsp[(3) - (3)].t)); } break; case 8: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 9: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[-3].t),newCTerm(PA_fSkip,(yyvsp[-1].t)), - (yyvsp[-4].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[(3) - (6)].t),newCTerm(PA_fSkip,(yyvsp[(5) - (6)].t)), + (yyvsp[(2) - (6)].t)),(yyvsp[(6) - (6)].t)); } break; case 10: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[-4].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[(3) - (6)].t),(yyvsp[(5) - (6)].t),(yyvsp[(2) - (6)].t)),(yyvsp[(6) - (6)].t)); } break; case 11: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[-2].t), - newCTerm(PA_fSkip,(yyvsp[-1].t)),(yyvsp[-3].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDeclare,(yyvsp[(3) - (5)].t), + newCTerm(PA_fSkip,(yyvsp[(4) - (5)].t)),(yyvsp[(2) - (5)].t)),(yyvsp[(5) - (5)].t)); } break; case 12: @@ -2839,7 +3147,7 @@ case 13: - { (yyval.t) = newCTerm(PA_dirSwitch,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_dirSwitch,(yyvsp[(2) - (2)].t)); } break; case 14: @@ -2864,7 +3172,7 @@ case 18: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 19: @@ -2889,159 +3197,159 @@ case 21: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 22: - { (yyval.t) = newCTerm(PA_fAnd,(yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fAnd,(yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 23: - { (yyval.t) = newCTerm(PA_fEq,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fEq,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 24: - { if (oz_isSRecord((yyvsp[-3].t)) && - oz_eq(OZ_label((yyvsp[-3].t)), PA_fOpApply) && - oz_eq(OZ_getArg((yyvsp[-3].t),0), AtomDot)) { - (yyval.t) = newCTerm(PA_fDotAssign,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); + { if (oz_isSRecord((yyvsp[(1) - (4)].t)) && + oz_eq(OZ_label((yyvsp[(1) - (4)].t)), PA_fOpApply) && + oz_eq(OZ_getArg((yyvsp[(1) - (4)].t),0), AtomDot)) { + (yyval.t) = newCTerm(PA_fDotAssign,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } else - (yyval.t) = newCTerm(PA_fColonEquals,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + (yyval.t) = newCTerm(PA_fColonEquals,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 25: - { (yyval.t) = newCTerm(PA_fAssign,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fAssign,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 26: - { (yyval.t) = newCTerm(PA_fOrElse,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fOrElse,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 27: - { (yyval.t) = newCTerm(PA_fAndThen,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fAndThen,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 28: - { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[-2].t), - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[(2) - (4)].t), + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 29: - { (yyval.t) = newCTerm(PA_fFdCompare,(yyvsp[-2].t),(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fFdCompare,(yyvsp[(2) - (4)].t),(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 30: - { (yyval.t) = newCTerm(PA_fFdIn,(yyvsp[-2].t),(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fFdIn,(yyvsp[(2) - (4)].t),(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 31: - { (yyval.t) = makeCons((yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = makeCons((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 32: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 33: { (yyval.t) = newCTerm(PA_fRecord, - newCTerm(PA_fAtom,AtomPair,(yyvsp[-1].t)), - oz_consUnwrap((yyvsp[-3].t),(yyvsp[0].t))); } + newCTerm(PA_fAtom,AtomPair,(yyvsp[(3) - (4)].t)), + oz_consUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t))); } break; case 34: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 35: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 36: - { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[-2].t), - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[(2) - (4)].t), + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 37: - { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[-2].t), - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[(2) - (4)].t), + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 38: - { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[-2].t), - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fOpApply,(yyvsp[(2) - (4)].t), + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 39: - { (yyval.t) = newCTerm(PA_fObjApply,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fObjApply,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 40: { (yyval.t) = newCTerm(PA_fOpApply,AtomTilde, - oz_mklistUnwrap((yyvsp[0].t)),(yyvsp[-1].t)); } + oz_mklistUnwrap((yyvsp[(3) - (3)].t)),(yyvsp[(2) - (3)].t)); } break; case 41: { (yyval.t) = newCTerm(PA_fOpApply,AtomDot, - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 42: { (yyval.t) = newCTerm(PA_fOpApply,AtomDot, - oz_mklistUnwrap((yyvsp[-1].t),makeInt(xytext,pos())),pos()); } + oz_mklistUnwrap((yyvsp[(1) - (2)].t),makeInt(xytext,pos())),pos()); } break; case 43: { (yyval.t) = newCTerm(PA_fOpApply,AtomHat, - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[0].t)),(yyvsp[-1].t)); } + oz_mklistUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; case 44: - { (yyval.t) = newCTerm(PA_fAt,(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fAt,(yyvsp[(3) - (3)].t),(yyvsp[(2) - (3)].t)); } break; case 45: { (yyval.t) = newCTerm(PA_fOpApply,AtomDExcl, - oz_mklistUnwrap((yyvsp[0].t)),(yyvsp[-1].t)); } + oz_mklistUnwrap((yyvsp[(3) - (3)].t)),(yyvsp[(2) - (3)].t)); } break; case 46: - { (yyval.t) = newCTerm(PA_parens,(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_parens,(yyvsp[(2) - (3)].t)); } break; case 47: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 48: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 49: @@ -3076,94 +3384,94 @@ case 55: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 56: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 57: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 58: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 59: { (yyval.t) = newCTerm(PA_fRecord,newCTerm(PA_fAtom,AtomCons, - makeLongPos((yyvsp[-4].t),(yyvsp[0].t))), - oz_mklistUnwrap((yyvsp[-3].t),(yyvsp[-2].t))); } + makeLongPos((yyvsp[(2) - (6)].t),(yyvsp[(6) - (6)].t))), + oz_mklistUnwrap((yyvsp[(3) - (6)].t),(yyvsp[(4) - (6)].t))); } break; case 60: - { (yyval.t) = newCTerm(PA_fApply,(yyvsp[-3].t),(yyvsp[-2].t),makeLongPos((yyvsp[-4].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fApply,(yyvsp[(3) - (6)].t),(yyvsp[(4) - (6)].t),makeLongPos((yyvsp[(2) - (6)].t),(yyvsp[(6) - (6)].t))); } break; case 61: - { (yyval.t) = newCTerm(PA_fProc,(yyvsp[-5].t),(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-7].t),makeLongPos((yyvsp[-8].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fProc,(yyvsp[(5) - (10)].t),(yyvsp[(6) - (10)].t),(yyvsp[(8) - (10)].t),(yyvsp[(3) - (10)].t),makeLongPos((yyvsp[(2) - (10)].t),(yyvsp[(10) - (10)].t))); } break; case 62: - { (yyval.t) = newCTerm(PA_fFun,(yyvsp[-5].t),(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-7].t),makeLongPos((yyvsp[-8].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fFun,(yyvsp[(5) - (10)].t),(yyvsp[(6) - (10)].t),(yyvsp[(8) - (10)].t),(yyvsp[(3) - (10)].t),makeLongPos((yyvsp[(2) - (10)].t),(yyvsp[(10) - (10)].t))); } break; case 63: - { (yyval.t) = newCTerm(PA_fFunctor,(yyvsp[-3].t),(yyvsp[-2].t),makeLongPos((yyvsp[-4].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fFunctor,(yyvsp[(3) - (6)].t),(yyvsp[(4) - (6)].t),makeLongPos((yyvsp[(2) - (6)].t),(yyvsp[(6) - (6)].t))); } break; case 64: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 65: - { (yyval.t) = newCTerm(PA_fLocal,(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[-4].t)); } + { (yyval.t) = newCTerm(PA_fLocal,(yyvsp[(3) - (6)].t),(yyvsp[(5) - (6)].t),(yyvsp[(2) - (6)].t)); } break; case 66: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 67: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 68: - { (yyval.t) = newCTerm(PA_fLock,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fLock,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 69: - { (yyval.t) = newCTerm(PA_fLockThen,(yyvsp[-4].t),(yyvsp[-2].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fLockThen,(yyvsp[(3) - (7)].t),(yyvsp[(5) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 70: - { (yyval.t) = newCTerm(PA_fThread,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fThread,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 71: - { (yyval.t) = newCTerm(PA_fTry,(yyvsp[-4].t),(yyvsp[-3].t),(yyvsp[-2].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fTry,(yyvsp[(3) - (7)].t),(yyvsp[(4) - (7)].t),(yyvsp[(5) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 72: - { (yyval.t) = newCTerm(PA_fRaise,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fRaise,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 73: @@ -3178,54 +3486,54 @@ case 75: - { (yyval.t) = newCTerm(PA_fNot,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fNot,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 76: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 77: - { (yyval.t) = newCTerm(PA_fOr,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fOr,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 78: - { (yyval.t) = newCTerm(PA_fDis,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fDis,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 79: - { (yyval.t) = newCTerm(PA_fChoice,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fChoice,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 80: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 81: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 82: - { (yyval.t) = newCTerm(PA_fMacro,(yyvsp[-2].t),makeLongPos((yyvsp[-3].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fMacro,(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(2) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 83: { (yyval.t) = newCTerm(PA_fLoop, - newCTerm(PA_fAnd,(yyvsp[-4].t),(yyvsp[-2].t)), - makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + newCTerm(PA_fAnd,(yyvsp[(3) - (7)].t),(yyvsp[(5) - (7)].t)), + makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 84: - { (yyval.t) = newCTerm(PA_fFOR,(yyvsp[-4].t),(yyvsp[-2].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fFOR,(yyvsp[(3) - (7)].t),(yyvsp[(5) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 85: @@ -3235,49 +3543,49 @@ case 86: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 87: - { (yyval.t) = newCTerm(oz_atom("forFlag"),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forFlag"),(yyvsp[(1) - (1)].t)); } break; case 88: - { (yyval.t) = newCTerm(oz_atom("forFeature"),(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forFeature"),(yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 89: - { (yyval.t) = newCTerm(oz_atom("forPattern"),(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forPattern"),(yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 90: - { (yyval.t) = newCTerm(oz_atom("forFrom"),(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forFrom"),(yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 91: - { (yyval.t) = newCTerm(oz_atom("forGeneratorList"),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forGeneratorList"),(yyvsp[(1) - (1)].t)); } break; case 92: - { (yyval.t) = newCTerm(oz_atom("forGeneratorInt"),(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(oz_atom("forGeneratorInt"),(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)); } break; case 93: - { (yyval.t) = newCTerm(oz_atom("forGeneratorC"),(yyvsp[-2].t),oz_headUnwrap((yyvsp[0].t)), - oz_tailUnwrap((yyvsp[0].t))); } + { (yyval.t) = newCTerm(oz_atom("forGeneratorC"),(yyvsp[(1) - (3)].t),oz_headUnwrap((yyvsp[(3) - (3)].t)), + oz_tailUnwrap((yyvsp[(3) - (3)].t))); } break; case 94: - { (yyval.t) = newCTerm(oz_atom("forGeneratorC"),(yyvsp[-3].t),oz_headUnwrap((yyvsp[-1].t)), - oz_tailUnwrap((yyvsp[-1].t))); } + { (yyval.t) = newCTerm(oz_atom("forGeneratorC"),(yyvsp[(2) - (5)].t),oz_headUnwrap((yyvsp[(4) - (5)].t)), + oz_tailUnwrap((yyvsp[(4) - (5)].t))); } break; case 95: @@ -3287,12 +3595,12 @@ case 96: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 97: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 98: @@ -3302,13 +3610,13 @@ case 99: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 100: { - (yyval.t) = newCTerm(PA_fAnd,(yyvsp[-1].t),(yyvsp[0].t)); + (yyval.t) = newCTerm(PA_fAnd,(yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; @@ -3317,15 +3625,15 @@ { (yyval.t) = newCTerm(PA_fMacro, oz_list(newCTerm(PA_fAtom,oz_atom("for"),NameUnit), - unwrap((yyvsp[-7].t)), + unwrap((yyvsp[(1) - (8)].t)), newCTerm(PA_fAtom,oz_atom("from"),NameUnit), - unwrap((yyvsp[-4].t)), + unwrap((yyvsp[(4) - (8)].t)), newCTerm(PA_fAtom,oz_atom("to"),NameUnit), - unwrap((yyvsp[-2].t)), + unwrap((yyvsp[(6) - (8)].t)), newCTerm(PA_fAtom,oz_atom("by"),NameUnit), - (unwrap((yyvsp[-1].t)) == 0)?makeInt("1",NameUnit):unwrap((yyvsp[-1].t)), + (unwrap((yyvsp[(7) - (8)].t)) == 0)?makeInt("1",NameUnit):unwrap((yyvsp[(7) - (8)].t)), 0), - makeLongPos(OZ_subtree((yyvsp[-7].t),makeTaggedSmallInt(2)),(yyvsp[0].t))); + makeLongPos(OZ_subtree((yyvsp[(1) - (8)].t),makeTaggedSmallInt(2)),(yyvsp[(8) - (8)].t))); } break; @@ -3334,22 +3642,22 @@ { /* <> <> */ - if ((yyvsp[-1].t) == 0) { + if ((yyvsp[(5) - (6)].t) == 0) { (yyval.t) = newCTerm(PA_fMacro, oz_list(newCTerm(PA_fAtom,oz_atom("for"),NameUnit), - unwrap((yyvsp[-5].t)), + unwrap((yyvsp[(1) - (6)].t)), newCTerm(PA_fAtom,oz_atom("in"),NameUnit), - unwrap((yyvsp[-2].t)), + unwrap((yyvsp[(4) - (6)].t)), 0), - makeLongPos(OZ_subtree((yyvsp[-5].t),makeTaggedSmallInt(2)),(yyvsp[0].t))); + makeLongPos(OZ_subtree((yyvsp[(1) - (6)].t),makeTaggedSmallInt(2)),(yyvsp[(6) - (6)].t))); } else { (yyval.t) = newCTerm(PA_fMacro, oz_list(newCTerm(PA_fAtom,oz_atom("for"),NameUnit), - newCTerm(PA_fEq,(yyvsp[-5].t),(yyvsp[-2].t),NameUnit), + newCTerm(PA_fEq,(yyvsp[(1) - (6)].t),(yyvsp[(4) - (6)].t),NameUnit), newCTerm(PA_fAtom,oz_atom("next"),NameUnit), - unwrap((yyvsp[-1].t)), + unwrap((yyvsp[(5) - (6)].t)), 0), - makeLongPos(OZ_subtree((yyvsp[-5].t),makeTaggedSmallInt(2)),(yyvsp[0].t))); + makeLongPos(OZ_subtree((yyvsp[(1) - (6)].t),makeTaggedSmallInt(2)),(yyvsp[(6) - (6)].t))); } } break; @@ -3361,7 +3669,7 @@ case 105: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 106: @@ -3371,7 +3679,7 @@ case 107: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 108: @@ -3381,44 +3689,44 @@ case 109: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 110: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fRequire,(yyvsp[-1].t),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fRequire,(yyvsp[(3) - (4)].t),(yyvsp[(2) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 111: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fPrepare,(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[-4].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fPrepare,(yyvsp[(3) - (6)].t),(yyvsp[(5) - (6)].t),(yyvsp[(2) - (6)].t)),(yyvsp[(6) - (6)].t)); } break; case 112: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fPrepare,(yyvsp[-1].t), - newCTerm(PA_fSkip,(yyvsp[-2].t)),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fPrepare,(yyvsp[(3) - (4)].t), + newCTerm(PA_fSkip,(yyvsp[(2) - (4)].t)),(yyvsp[(2) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 113: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImport,(yyvsp[-1].t),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImport,(yyvsp[(3) - (4)].t),(yyvsp[(2) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 114: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fExport,(yyvsp[-1].t),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fExport,(yyvsp[(3) - (4)].t),(yyvsp[(2) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 115: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDefine,(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[-4].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDefine,(yyvsp[(3) - (6)].t),(yyvsp[(5) - (6)].t),(yyvsp[(2) - (6)].t)),(yyvsp[(6) - (6)].t)); } break; case 116: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDefine,(yyvsp[-1].t), - newCTerm(PA_fSkip,(yyvsp[-2].t)),(yyvsp[-2].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fDefine,(yyvsp[(3) - (4)].t), + newCTerm(PA_fSkip,(yyvsp[(2) - (4)].t)),(yyvsp[(2) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 117: @@ -3428,37 +3736,37 @@ case 118: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImportItem,(yyvsp[-2].t),AtomNil,(yyvsp[-1].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImportItem,(yyvsp[(1) - (3)].t),AtomNil,(yyvsp[(2) - (3)].t)),(yyvsp[(3) - (3)].t)); } break; case 119: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImportItem,(yyvsp[-5].t),(yyvsp[-3].t),(yyvsp[-1].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fImportItem,(yyvsp[(1) - (6)].t),(yyvsp[(3) - (6)].t),(yyvsp[(5) - (6)].t)),(yyvsp[(6) - (6)].t)); } break; case 120: - { (yyval.t) = newCTerm(PA_fVar,OZ_atom(xytext),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fVar,OZ_atom(xytext),(yyvsp[(2) - (2)].t)); } break; case 121: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 122: - { (yyval.t) = oz_mklistUnwrap(oz_pair2Unwrap((yyvsp[0].t),(yyvsp[-2].t))); } + { (yyval.t) = oz_mklistUnwrap(oz_pair2Unwrap((yyvsp[(3) - (3)].t),(yyvsp[(1) - (3)].t))); } break; case 123: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 124: - { (yyval.t) = oz_consUnwrap(oz_pair2Unwrap((yyvsp[-1].t),(yyvsp[-3].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(oz_pair2Unwrap((yyvsp[(3) - (4)].t),(yyvsp[(1) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 125: @@ -3468,7 +3776,7 @@ case 126: - { (yyval.t) = newCTerm(PA_fImportAt,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fImportAt,(yyvsp[(2) - (2)].t)); } break; case 127: @@ -3478,13 +3786,13 @@ case 128: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fExportItem,(yyvsp[-1].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fExportItem,(yyvsp[(1) - (2)].t)),(yyvsp[(2) - (2)].t)); } break; case 129: { (yyval.t) = oz_consUnwrap(newCTerm(PA_fExportItem, - newCTerm(PA_fColon,(yyvsp[-3].t),(yyvsp[-1].t))),(yyvsp[0].t)); } + newCTerm(PA_fColon,(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t))),(yyvsp[(4) - (4)].t)); } break; case 130: @@ -3519,12 +3827,12 @@ case 136: - { (yyval.t) = newCTerm(PA_fLocal,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fLocal,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 137: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 138: @@ -3534,19 +3842,19 @@ case 139: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 140: - { (yyval.t) = newCTerm(PA_fAtom,AtomNil,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fAtom,AtomNil,(yyvsp[(1) - (1)].t)); } break; case 141: { (yyval.t) = newCTerm(PA_fRecord, - newCTerm(PA_fAtom,AtomCons,(yyvsp[-2].t)), - oz_mklistUnwrap((yyvsp[-1].t),(yyvsp[0].t))); } + newCTerm(PA_fAtom,AtomCons,(yyvsp[(1) - (3)].t)), + oz_mklistUnwrap((yyvsp[(2) - (3)].t),(yyvsp[(3) - (3)].t))); } break; case 142: @@ -3556,7 +3864,7 @@ case 143: - { (yyval.t) = newCTerm(PA_fCatch,(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fCatch,(yyvsp[(3) - (3)].t),(yyvsp[(2) - (3)].t)); } break; case 144: @@ -3566,22 +3874,22 @@ case 145: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 146: { - (yyval.t) = newCTerm(OZ_isTrue((yyvsp[-2].t))? PA_fOpenRecord : PA_fRecord, - newCTerm(PA_fAtom,(yyvsp[-6].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))),(yyvsp[-3].t)); + (yyval.t) = newCTerm(OZ_isTrue((yyvsp[(5) - (7)].t))? PA_fOpenRecord : PA_fRecord, + newCTerm(PA_fAtom,(yyvsp[(1) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))),(yyvsp[(4) - (7)].t)); } break; case 147: { - (yyval.t) = newCTerm(OZ_isTrue((yyvsp[-2].t))? PA_fOpenRecord : PA_fRecord, - makeVar((yyvsp[-6].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))),(yyvsp[-3].t)); + (yyval.t) = newCTerm(OZ_isTrue((yyvsp[(5) - (7)].t))? PA_fOpenRecord : PA_fRecord, + makeVar((yyvsp[(1) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))),(yyvsp[(4) - (7)].t)); } break; @@ -3617,12 +3925,12 @@ case 154: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 155: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fColon,(yyvsp[-3].t),(yyvsp[-1].t)),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fColon,(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t)),(yyvsp[(4) - (4)].t)); } break; case 156: @@ -3637,17 +3945,17 @@ case 158: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 159: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 160: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 161: @@ -3667,32 +3975,32 @@ case 164: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 165: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 166: - { (yyval.t) = newCTerm(PA_fBoolCase,(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-1].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fBoolCase,(yyvsp[(2) - (6)].t),(yyvsp[(4) - (6)].t),(yyvsp[(5) - (6)].t),makeLongPos((yyvsp[(1) - (6)].t),(yyvsp[(6) - (6)].t))); } break; case 167: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 168: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 169: - { (yyval.t) = (yyvsp[-1].t); } + { (yyval.t) = (yyvsp[(2) - (3)].t); } break; case 170: @@ -3702,29 +4010,29 @@ case 171: - { checkDeprecation((yyvsp[-3].t)); - (yyval.t) = newCTerm(PA_fBoolCase,(yyvsp[-5].t),(yyvsp[-2].t),(yyvsp[-1].t),makeLongPos((yyvsp[-6].t),(yyvsp[0].t))); + { checkDeprecation((yyvsp[(4) - (7)].t)); + (yyval.t) = newCTerm(PA_fBoolCase,(yyvsp[(2) - (7)].t),(yyvsp[(5) - (7)].t),(yyvsp[(6) - (7)].t),makeLongPos((yyvsp[(1) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 172: - { (yyval.t) = newCTerm(PA_fCase,(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-1].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fCase,(yyvsp[(2) - (6)].t),(yyvsp[(4) - (6)].t),(yyvsp[(5) - (6)].t),makeLongPos((yyvsp[(1) - (6)].t),(yyvsp[(6) - (6)].t))); } break; case 173: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 174: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 175: - { (yyval.t) = (yyvsp[-1].t); } + { (yyval.t) = (yyvsp[(2) - (3)].t); } break; case 176: @@ -3734,85 +4042,85 @@ case 177: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 178: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 179: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 180: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 181: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 182: - { (yyval.t) = newCTerm(PA_fCaseClause,(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fCaseClause,(yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 183: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 184: - { (yyval.t) = newCTerm(PA_fSideCondition,(yyvsp[-3].t), - newCTerm(PA_fSkip,(yyvsp[-1].t)),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSideCondition,(yyvsp[(1) - (4)].t), + newCTerm(PA_fSkip,(yyvsp[(3) - (4)].t)),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 185: - { (yyval.t) = newCTerm(PA_fSideCondition,(yyvsp[-5].t),(yyvsp[-2].t),(yyvsp[0].t),(yyvsp[-3].t)); } + { (yyval.t) = newCTerm(PA_fSideCondition,(yyvsp[(1) - (6)].t),(yyvsp[(4) - (6)].t),(yyvsp[(6) - (6)].t),(yyvsp[(3) - (6)].t)); } break; case 186: - { (yyval.t) = newCTerm(PA_fEq,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fEq,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 187: - { (yyval.t) = makeCons((yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = makeCons((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 188: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 189: { (yyval.t) = newCTerm(PA_fRecord, - newCTerm(PA_fAtom,AtomPair,(yyvsp[-1].t)), - oz_consUnwrap((yyvsp[-3].t),(yyvsp[0].t))); } + newCTerm(PA_fAtom,AtomPair,(yyvsp[(3) - (4)].t)), + oz_consUnwrap((yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t))); } break; case 190: - { (yyval.t) = newCTerm(PA_fClass,(yyvsp[-4].t),(yyvsp[-3].t),(yyvsp[-2].t),makeLongPos((yyvsp[-5].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fClass,(yyvsp[(3) - (7)].t),(yyvsp[(4) - (7)].t),(yyvsp[(5) - (7)].t),makeLongPos((yyvsp[(2) - (7)].t),(yyvsp[(7) - (7)].t))); } break; case 191: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 192: - { (yyval.t) = newCTerm(PA_fDollar,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fDollar,(yyvsp[(1) - (1)].t)); } break; case 193: @@ -3822,27 +4130,27 @@ case 194: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 195: - { (yyval.t) = newCTerm(PA_fFrom,oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)),(yyvsp[-2].t)); } + { (yyval.t) = newCTerm(PA_fFrom,oz_consUnwrap((yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(2) - (4)].t)); } break; case 196: - { (yyval.t) = newCTerm(PA_fAttr,oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)),(yyvsp[-2].t)); } + { (yyval.t) = newCTerm(PA_fAttr,oz_consUnwrap((yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(2) - (4)].t)); } break; case 197: - { (yyval.t) = newCTerm(PA_fFeat,oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)),(yyvsp[-2].t)); } + { (yyval.t) = newCTerm(PA_fFeat,oz_consUnwrap((yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(2) - (4)].t)); } break; case 198: - { (yyval.t) = newCTerm(PA_fProp,oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)),(yyvsp[-2].t)); } + { (yyval.t) = newCTerm(PA_fProp,oz_consUnwrap((yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)),(yyvsp[(2) - (4)].t)); } break; case 199: @@ -3852,32 +4160,32 @@ case 200: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 201: - { (yyval.t) = oz_pair2Unwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_pair2Unwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 202: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 203: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 204: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 205: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 206: @@ -3902,32 +4210,32 @@ case 210: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 211: - { (yyval.t) = newCTerm(PA_fMeth,(yyvsp[-2].t),(yyvsp[-1].t),(yyvsp[-3].t)); } + { (yyval.t) = newCTerm(PA_fMeth,(yyvsp[(3) - (5)].t),(yyvsp[(4) - (5)].t),(yyvsp[(2) - (5)].t)); } break; case 212: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 213: - { (yyval.t) = newCTerm(PA_fEq,(yyvsp[-3].t),(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fEq,(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 214: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 215: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 216: @@ -3947,12 +4255,12 @@ case 219: - { (yyval.t) = newCTerm(PA_fRecord,(yyvsp[-3].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fRecord,(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 220: - { (yyval.t) = newCTerm(PA_fOpenRecord,(yyvsp[-4].t),(yyvsp[-2].t)); } + { (yyval.t) = newCTerm(PA_fOpenRecord,(yyvsp[(1) - (5)].t),(yyvsp[(3) - (5)].t)); } break; case 221: @@ -3967,7 +4275,7 @@ case 223: - { (yyval.t) = newCTerm(PA_fEscape,makeVar(xytext),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fEscape,makeVar(xytext),(yyvsp[(2) - (3)].t)); } break; case 224: @@ -3987,7 +4295,7 @@ case 227: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 228: @@ -3997,17 +4305,17 @@ case 229: - { (yyval.t) = newCTerm(PA_fMethArg,(yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fMethArg,(yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 230: - { (yyval.t) = newCTerm(PA_fMethColonArg,(yyvsp[-3].t),(yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fMethColonArg,(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t),(yyvsp[(4) - (4)].t)); } break; case 231: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 232: @@ -4022,7 +4330,7 @@ case 234: - { (yyval.t) = newCTerm(PA_fDefault,(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fDefault,(yyvsp[(3) - (3)].t),(yyvsp[(2) - (3)].t)); } break; case 235: @@ -4032,12 +4340,12 @@ case 236: - { (yyval.t) = newCTerm(PA_fCond,(yyvsp[-3].t),(yyvsp[-2].t),makeLongPos((yyvsp[-4].t),(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fCond,(yyvsp[(2) - (5)].t),(yyvsp[(3) - (5)].t),makeLongPos((yyvsp[(1) - (5)].t),(yyvsp[(5) - (5)].t))); } break; case 237: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 238: @@ -4047,65 +4355,65 @@ case 239: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 240: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 241: - { (yyval.t) = newCTerm(PA_fClause,newCTerm(PA_fSkip,(yyvsp[-1].t)),(yyvsp[-3].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fClause,newCTerm(PA_fSkip,(yyvsp[(3) - (4)].t)),(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)); } break; case 242: - { (yyval.t) = newCTerm(PA_fClause,(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fClause,(yyvsp[(1) - (5)].t),(yyvsp[(3) - (5)].t),(yyvsp[(5) - (5)].t)); } break; case 243: - { (yyval.t) = oz_mklistUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 244: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 245: { (yyval.t) = newCTerm(PA_fClause, - newCTerm(PA_fSkip,(yyvsp[0].t)), - (yyvsp[-1].t),newCTerm(PA_fNoThen,(yyvsp[0].t))); } + newCTerm(PA_fSkip,(yyvsp[(2) - (2)].t)), + (yyvsp[(1) - (2)].t),newCTerm(PA_fNoThen,(yyvsp[(2) - (2)].t))); } break; case 246: - { (yyval.t) = newCTerm(PA_fClause,(yyvsp[-3].t),(yyvsp[-1].t),newCTerm(PA_fNoThen,(yyvsp[0].t))); } + { (yyval.t) = newCTerm(PA_fClause,(yyvsp[(1) - (4)].t),(yyvsp[(3) - (4)].t),newCTerm(PA_fNoThen,(yyvsp[(4) - (4)].t))); } break; case 247: { (yyval.t) = newCTerm(PA_fClause, - newCTerm(PA_fSkip,(yyvsp[-2].t)),(yyvsp[-3].t),(yyvsp[0].t)); } + newCTerm(PA_fSkip,(yyvsp[(2) - (4)].t)),(yyvsp[(1) - (4)].t),(yyvsp[(4) - (4)].t)); } break; case 248: - { (yyval.t) = newCTerm(PA_fClause,(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fClause,(yyvsp[(1) - (5)].t),(yyvsp[(3) - (5)].t),(yyvsp[(5) - (5)].t)); } break; case 249: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 250: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 251: @@ -4120,12 +4428,12 @@ case 253: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 254: - { (yyval.t) = newCTerm(PA_fEscape,(yyvsp[0].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fEscape,(yyvsp[(3) - (3)].t),(yyvsp[(2) - (3)].t)); } break; case 255: @@ -4162,53 +4470,53 @@ { OZ_Term prefix = scannerPrefix? scannerPrefix: PA_zy; - (yyval.t) = newCTerm(PA_fScanner,(yyvsp[-5].t),(yyvsp[-4].t),(yyvsp[-3].t),(yyvsp[-2].t),prefix, - makeLongPos((yyvsp[-6].t),(yyvsp[0].t))); } + (yyval.t) = newCTerm(PA_fScanner,(yyvsp[(3) - (8)].t),(yyvsp[(4) - (8)].t),(yyvsp[(5) - (8)].t),(yyvsp[(6) - (8)].t),prefix, + makeLongPos((yyvsp[(2) - (8)].t),(yyvsp[(8) - (8)].t))); } break; case 262: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 263: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 264: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 265: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 266: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 267: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 268: - { (yyval.t) = newCTerm(PA_fLexicalAbbreviation,(yyvsp[-3].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fLexicalAbbreviation,(yyvsp[(2) - (5)].t),(yyvsp[(4) - (5)].t)); } break; case 269: - { (yyval.t) = newCTerm(PA_fLexicalAbbreviation,(yyvsp[-3].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fLexicalAbbreviation,(yyvsp[(2) - (5)].t),(yyvsp[(4) - (5)].t)); } break; case 270: - { (yyval.t) = newCTerm(PA_fLexicalRule,(yyvsp[-2].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fLexicalRule,(yyvsp[(2) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 271: @@ -4223,7 +4531,7 @@ case 273: - { (yyval.t) = newCTerm(PA_fMode,(yyvsp[-2].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fMode,(yyvsp[(2) - (4)].t),(yyvsp[(3) - (4)].t)); } break; case 274: @@ -4233,49 +4541,49 @@ case 275: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 276: - { (yyval.t) = newCTerm(PA_fInheritedModes,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fInheritedModes,(yyvsp[(2) - (2)].t)); } break; case 277: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 278: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 279: { OZ_Term expect = parserExpect? parserExpect: makeTaggedSmallInt(0); - (yyval.t) = newCTerm(PA_fParser,(yyvsp[-6].t),(yyvsp[-5].t),(yyvsp[-4].t),(yyvsp[-3].t),(yyvsp[-2].t),expect, - makeLongPos((yyvsp[-7].t),(yyvsp[0].t))); } + (yyval.t) = newCTerm(PA_fParser,(yyvsp[(3) - (9)].t),(yyvsp[(4) - (9)].t),(yyvsp[(5) - (9)].t),(yyvsp[(6) - (9)].t),(yyvsp[(7) - (9)].t),expect, + makeLongPos((yyvsp[(2) - (9)].t),(yyvsp[(9) - (9)].t))); } break; case 280: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 281: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 282: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 283: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 284: @@ -4285,47 +4593,47 @@ case 285: - { (yyval.t) = newCTerm(PA_fToken,(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fToken,(yyvsp[(2) - (2)].t)); } break; case 286: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 287: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 288: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 289: - { (yyval.t) = oz_pair2Unwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_pair2Unwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 290: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 291: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 292: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 293: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 294: @@ -4335,7 +4643,7 @@ case 295: - { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[-3].t),(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-1].t),(yyvsp[-7].t)); } + { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[(6) - (9)].t),(yyvsp[(5) - (9)].t),(yyvsp[(7) - (9)].t),(yyvsp[(8) - (9)].t),(yyvsp[(2) - (9)].t)); } break; case 296: @@ -4350,32 +4658,32 @@ case 298: - { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[-3].t),(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-1].t),(yyvsp[-7].t)); } + { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[(7) - (10)].t),(yyvsp[(6) - (10)].t),(yyvsp[(8) - (10)].t),(yyvsp[(9) - (10)].t),(yyvsp[(3) - (10)].t)); } break; case 299: - { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[-3].t),(yyvsp[-4].t),(yyvsp[-2].t),(yyvsp[-1].t),PA_none); } + { (yyval.t) = newCTerm(PA_fProductionTemplate,(yyvsp[(3) - (6)].t),(yyvsp[(2) - (6)].t),(yyvsp[(4) - (6)].t),(yyvsp[(5) - (6)].t),PA_none); } break; case 300: - { (yyval.t) = oz_mklistUnwrap((yyvsp[-1].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(2) - (3)].t)); } break; case 301: - { (yyval.t) = oz_mklistUnwrap((yyvsp[-1].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (2)].t)); } break; case 302: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 305: - { prodName[depth] = OZ_string(OZ_atomToC(OZ_getArg((yyvsp[-1].t),0))); } + { prodName[depth] = OZ_string(OZ_atomToC(OZ_getArg((yyvsp[(1) - (2)].t),0))); } break; case 306: @@ -4390,7 +4698,7 @@ case 308: - { (yyval.t) = (yyvsp[-3].t); } + { (yyval.t) = (yyvsp[(3) - (6)].t); } break; case 309: @@ -4405,7 +4713,7 @@ case 311: - { (yyval.t) = (yyvsp[-3].t); } + { (yyval.t) = (yyvsp[(3) - (6)].t); } break; case 312: @@ -4420,22 +4728,22 @@ case 314: - { (yyval.t) = (yyvsp[-3].t); } + { (yyval.t) = (yyvsp[(3) - (6)].t); } break; case 315: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 316: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 317: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 318: @@ -4474,32 +4782,32 @@ case 326: - { (yyval.t) = (yyvsp[-1].t); } + { (yyval.t) = (yyvsp[(1) - (2)].t); } break; case 327: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 328: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 329: - { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[-2].t),AtomNil,(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[(2) - (4)].t),AtomNil,(yyvsp[(3) - (4)].t)); } break; case 330: - { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[-2].t),AtomNil,(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[(2) - (4)].t),AtomNil,(yyvsp[(3) - (4)].t)); } break; case 331: - { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[-5].t),(yyvsp[-3].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSyntaxRule,(yyvsp[(2) - (7)].t),(yyvsp[(4) - (7)].t),(yyvsp[(6) - (7)].t)); } break; case 332: @@ -4509,12 +4817,12 @@ case 333: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 334: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 335: @@ -4529,34 +4837,34 @@ case 337: - { (yyval.t) = newCTerm(PA_fSynAlternative, (yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fSynAlternative, (yyvsp[(1) - (1)].t)); } break; case 338: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 339: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 340: - { OZ_Term t = (yyvsp[0].t); + { OZ_Term t = (yyvsp[(2) - (2)].t); while (terms[depth]) { t = oz_consUnwrap(newCTerm(PA_fSynApplication, terms[depth]->term, AtomNil), t); TermNode *tmp = terms[depth]; terms[depth] = terms[depth]->next; delete tmp; } - (yyval.t) = newCTerm(PA_fSynSequence, decls[depth], t, (yyvsp[-1].t)); + (yyval.t) = newCTerm(PA_fSynSequence, decls[depth], t, (yyvsp[(1) - (2)].t)); decls[depth] = AtomNil; } break; case 341: - { (yyval.t) = newCTerm(PA_fSynSequence, AtomNil, (yyvsp[0].t), (yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSynSequence, AtomNil, (yyvsp[(3) - (3)].t), (yyvsp[(2) - (3)].t)); } break; case 342: @@ -4566,31 +4874,31 @@ case 343: - { (yyval.t) = oz_mklistUnwrap(newCTerm(PA_fSynAction,(yyvsp[0].t))); } + { (yyval.t) = oz_mklistUnwrap(newCTerm(PA_fSynAction,(yyvsp[(2) - (2)].t))); } break; case 344: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 345: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fSynTemplateInstantiation, (yyvsp[0].t), + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fSynTemplateInstantiation, (yyvsp[(5) - (5)].t), oz_consUnwrap(newCTerm(PA_fSynApplication, terms[depth]->term, AtomNil), AtomNil), - (yyvsp[-2].t)), - (yyvsp[-1].t)); + (yyvsp[(3) - (5)].t)), + (yyvsp[(4) - (5)].t)); TermNode *tmp = terms[depth]; terms[depth] = terms[depth]->next; delete tmp; } break; case 346: - { (yyval.t) = oz_consUnwrap(newCTerm(PA_fSynAssignment, terms[depth]->term, (yyvsp[-1].t)), - (yyvsp[0].t)); + { (yyval.t) = oz_consUnwrap(newCTerm(PA_fSynAssignment, terms[depth]->term, (yyvsp[(3) - (4)].t)), + (yyvsp[(4) - (4)].t)); TermNode *tmp = terms[depth]; terms[depth] = terms[depth]->next; delete tmp; } break; @@ -4601,91 +4909,91 @@ decls[depth] = oz_consUnwrap(terms[depth]->term, decls[depth]); TermNode *tmp = terms[depth]; terms[depth] = terms[depth]->next; delete tmp; } - (yyval.t) = (yyvsp[0].t); + (yyval.t) = (yyvsp[(2) - (2)].t); } break; case 348: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 349: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 350: - { terms[depth] = new TermNode((yyvsp[0].t), terms[depth]); } + { terms[depth] = new TermNode((yyvsp[(1) - (1)].t), terms[depth]); } break; case 351: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 352: - { (yyval.t) = oz_consUnwrap((yyvsp[-1].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (2)].t),(yyvsp[(2) - (2)].t)); } break; case 353: - { (yyval.t) = newCTerm(PA_fSynAssignment,(yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = newCTerm(PA_fSynAssignment,(yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; case 354: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 355: - { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[0].t),AtomNil); } + { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[(1) - (1)].t),AtomNil); } break; case 356: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t), - oz_consUnwrap(newCTerm(PA_fSynApplication,(yyvsp[-3].t), + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(4) - (4)].t), + oz_consUnwrap(newCTerm(PA_fSynApplication,(yyvsp[(1) - (4)].t), AtomNil), - AtomNil),(yyvsp[-1].t)); + AtomNil),(yyvsp[(3) - (4)].t)); } break; case 357: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 358: { (yyval.t) = newCTerm(PA_fSynAssignment, - newCTerm(PA_fEscape,(yyvsp[-2].t),(yyvsp[-3].t)),(yyvsp[0].t)); } + newCTerm(PA_fEscape,(yyvsp[(3) - (5)].t),(yyvsp[(2) - (5)].t)),(yyvsp[(5) - (5)].t)); } break; case 359: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 360: - { (yyval.t) = (yyvsp[0].t); } + { (yyval.t) = (yyvsp[(1) - (1)].t); } break; case 361: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t), - oz_mklistUnwrap((yyvsp[-2].t)),(yyvsp[-3].t)); + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(5) - (5)].t), + oz_mklistUnwrap((yyvsp[(3) - (5)].t)),(yyvsp[(2) - (5)].t)); } break; case 362: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t), - oz_mklistUnwrap((yyvsp[-3].t)),(yyvsp[-1].t)); + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(4) - (4)].t), + oz_mklistUnwrap((yyvsp[(1) - (4)].t)),(yyvsp[(3) - (4)].t)); } break; @@ -4701,7 +5009,7 @@ case 365: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t),(yyvsp[-4].t),(yyvsp[-7].t)); } + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(9) - (9)].t),(yyvsp[(5) - (9)].t),(yyvsp[(2) - (9)].t)); } break; case 366: @@ -4716,7 +5024,7 @@ case 368: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t),(yyvsp[-4].t),(yyvsp[-7].t)); } + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(9) - (9)].t),(yyvsp[(5) - (9)].t),(yyvsp[(2) - (9)].t)); } break; case 369: @@ -4731,17 +5039,17 @@ case 371: - { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[0].t),(yyvsp[-4].t),(yyvsp[-7].t)); } + { (yyval.t) = newCTerm(PA_fSynTemplateInstantiation,(yyvsp[(9) - (9)].t),(yyvsp[(5) - (9)].t),(yyvsp[(2) - (9)].t)); } break; case 372: - { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[0].t),AtomNil); } + { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[(1) - (1)].t),AtomNil); } break; case 373: - { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[-4].t),(yyvsp[-1].t)); } + { (yyval.t) = newCTerm(PA_fSynApplication,(yyvsp[(1) - (5)].t),(yyvsp[(4) - (5)].t)); } break; case 374: @@ -4756,24 +5064,23 @@ case 376: - { (yyval.t) = oz_mklistUnwrap((yyvsp[0].t)); } + { (yyval.t) = oz_mklistUnwrap((yyvsp[(1) - (1)].t)); } break; case 377: - { (yyval.t) = oz_consUnwrap((yyvsp[-2].t),(yyvsp[0].t)); } + { (yyval.t) = oz_consUnwrap((yyvsp[(1) - (3)].t),(yyvsp[(3) - (3)].t)); } break; - } - -/* Line 1037 of yacc.c. */ - - - yyvsp -= yylen; - yyssp -= yylen; +/* Line 1267 of yacc.c. */ + default: break; + } + YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); + YYPOPSTACK (yylen); + yylen = 0; YY_STACK_PRINT (yyss, yyssp); *++yyvsp = yyval; @@ -4802,66 +5109,41 @@ if (!yyerrstatus) { ++yynerrs; -#if YYERROR_VERBOSE - yyn = yypact[yystate]; - - if (YYPACT_NINF < yyn && yyn < YYLAST) - { - YYSIZE_T yysize = 0; - int yytype = YYTRANSLATE (yychar); - const char* yyprefix; - char *yymsg; - int yyx; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 0; - - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) +#if ! YYERROR_VERBOSE + yyerror (YY_("syntax error")); +#else + { + YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); + if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) + { + YYSIZE_T yyalloc = 2 * yysize; + if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) + yyalloc = YYSTACK_ALLOC_MAXIMUM; + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yyalloc); + if (yymsg) + yymsg_alloc = yyalloc; + else { - yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]); - yycount += 1; - if (yycount == 5) - { - yysize = 0; - break; - } + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; } - yysize += (sizeof ("syntax error, unexpected ") - + yystrlen (yytname[yytype])); - yymsg = (char *) YYSTACK_ALLOC (yysize); - if (yymsg != 0) - { - char *yyp = yystpcpy (yymsg, "syntax error, unexpected "); - yyp = yystpcpy (yyp, yytname[yytype]); + } - if (yycount < 5) - { - yyprefix = ", expecting "; - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - yyp = yystpcpy (yyp, yyprefix); - yyp = yystpcpy (yyp, yytname[yyx]); - yyprefix = " or "; - } - } - yyerror (yymsg); - YYSTACK_FREE (yymsg); - } - else - yyerror ("syntax error; also virtual memory exhausted"); - } - else -#endif /* YYERROR_VERBOSE */ - yyerror ("syntax error"); + if (0 < yysize && yysize <= yymsg_alloc) + { + (void) yysyntax_error (yymsg, yystate, yychar); + yyerror (yymsg); + } + else + { + yyerror (YY_("syntax error")); + if (yysize != 0) + goto yyexhaustedlab; + } + } +#endif } @@ -4872,23 +5154,15 @@ error, discard it. */ if (yychar <= YYEOF) - { - /* If at end of input, pop the error token, - then the rest of the stack, then return failure. */ + { + /* Return failure if at end of input. */ if (yychar == YYEOF) - for (;;) - { - - YYPOPSTACK; - if (yyssp == yyss) - YYABORT; - yydestruct ("Error: popping", - yystos[*yyssp], yyvsp); - } - } + YYABORT; + } else { - yydestruct ("Error: discarding", yytoken, &yylval); + yydestruct ("Error: discarding", + yytoken, &yylval); yychar = YYEMPTY; } } @@ -4903,15 +5177,17 @@ `---------------------------------------------------*/ yyerrorlab: -#ifdef __GNUC__ - /* Pacify GCC when the user code never invokes YYERROR and the label - yyerrorlab therefore never appears in user code. */ - if (0) + /* Pacify compilers like GCC when the user code never invokes + YYERROR and the label yyerrorlab therefore never appears in user + code. */ + if (/*CONSTCOND*/ 0) goto yyerrorlab; -#endif -yyvsp -= yylen; - yyssp -= yylen; + /* Do not reclaim the symbols of the rule which action triggered + this YYERROR. */ + YYPOPSTACK (yylen); + yylen = 0; + YY_STACK_PRINT (yyss, yyssp); yystate = *yyssp; goto yyerrlab1; @@ -4941,8 +5217,9 @@ YYABORT; - yydestruct ("Error: popping", yystos[yystate], yyvsp); - YYPOPSTACK; + yydestruct ("Error: popping", + yystos[yystate], yyvsp); + YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } @@ -4953,7 +5230,7 @@ *++yyvsp = yylval; - /* Shift the error token. */ + /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); yystate = yyn; @@ -4971,28 +5248,43 @@ | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: - yydestruct ("Error: discarding lookahead", - yytoken, &yylval); - yychar = YYEMPTY; yyresult = 1; goto yyreturn; #ifndef yyoverflow -/*----------------------------------------------. -| yyoverflowlab -- parser overflow comes here. | -`----------------------------------------------*/ -yyoverflowlab: - yyerror ("parser stack overflow"); +/*-------------------------------------------------. +| yyexhaustedlab -- memory exhaustion comes here. | +`-------------------------------------------------*/ +yyexhaustedlab: + yyerror (YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif yyreturn: + if (yychar != YYEOF && yychar != YYEMPTY) + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + /* Do not reclaim the symbols of the rule which action triggered + this YYABORT or YYACCEPT. */ + YYPOPSTACK (yylen); + YY_STACK_PRINT (yyss, yyssp); + while (yyssp != yyss) + { + yydestruct ("Cleanup: popping", + yystos[*yyssp], yyvsp); + YYPOPSTACK (1); + } #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif - return yyresult; +#if YYERROR_VERBOSE + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); +#endif + /* Make sure YYID is used. */ + return YYID (yyresult); } @@ -5000,7 +5292,7 @@ void checkDeprecation(OZ_Term coord) { - char *msg = "use `if' instead of `case' for boolean conditionals"; + const char *msg = "use `if' instead of `case' for boolean conditionals"; if (xy_allowDeprecated) { xyreportWarning("deprecation warning",msg,coord); } else { @@ -5008,7 +5300,7 @@ } } -void xyreportWarning(char *kind, char *msg, OZ_Term coord) { +void xyreportWarning(const char *kind, const char *msg, OZ_Term coord) { OZ_Term args = oz_mklist(oz_pair2(PA_coord, coord), oz_pair2(PA_kind, OZ_atom(kind)), oz_pair2(PA_msg, OZ_atom(msg))); @@ -5016,7 +5308,7 @@ xy_errorMessages); } -void xyreportError(char *kind, char *msg, OZ_Term coord) { +void xyreportError(const char *kind, const char *msg, OZ_Term coord) { OZ_Term args = oz_mklist(oz_pair2(PA_coord, coord), oz_pair2(PA_kind, OZ_atom(kind)), oz_pair2(PA_msg, OZ_atom(msg))); @@ -5024,13 +5316,13 @@ xy_errorMessages); } -void xyreportError(char *kind, char *msg, const char *file, +void xyreportError(const char *kind, const char *msg, const char *file, int line, int column) { xyreportError(kind,msg,OZ_mkTupleC("pos",3,OZ_atom((char*)file), oz_int(line),oz_int(column))); } -static void xyerror(char *s) { +static void xyerror(const char *s) { if (!strncmp(s, "parse error", 11)) { if (strlen(s) > 13) { xyreportError("parse error", s + 13, xyFileName, xylino, xycharno()); --- mozart-1.4.0.orig/platform/emulator/builtins.hh +++ mozart-1.4.0/platform/emulator/builtins.hh @@ -389,9 +389,9 @@ #define oz_typeError(pos,type) return oz_typeErrorInternal(pos,type) -OZ_Return typeError(int pos, char *comment, char *typeString); +OZ_Return typeError(int pos, const char *comment, const char *typeString); -#define ExpectedTypes(S) char * __typeString = S; +#define ExpectedTypes(S) const char * __typeString = S; #define TypeError(Pos, Comment) return typeError(Pos,Comment,__typeString); #endif --- mozart-1.4.0.orig/platform/emulator/print.cc +++ mozart-1.4.0/platform/emulator/print.cc @@ -1234,7 +1234,7 @@ void OZ_FiniteDomainImpl::printLong(ostream &stream, int idnt) const { - static char * descr_type_text[3] = {"bv_descr", "iv_descr", "fd_descr"}; + static const char * descr_type_text[3] = {"bv_descr", "iv_descr", "fd_descr"}; stream << indent(idnt) << "min_elem=" << min_elem << " max_elem=" << max_elem << " size=" << getSize() --- mozart-1.4.0.orig/platform/emulator/libfd/std.cc +++ mozart-1.4.0/platform/emulator/libfd/std.cc @@ -106,7 +106,7 @@ RETURN_LIST4(reg_x, reg_y, reg_z, OZ_int(reg_c)); } -OZ_Term Propagator_D_D_D_I::getParametersC(char * lit) const +OZ_Term Propagator_D_D_D_I::getParametersC(const char * lit) const { RETURN_LIST5(reg_x, reg_y, OZ_atom(lit), reg_z, OZ_int(reg_c)); } @@ -141,7 +141,7 @@ RETURN_LIST3(reg_x, reg_y, OZ_int(reg_c)); } -OZ_Term Propagator_D_D_I::getParametersC(char * lit) const +OZ_Term Propagator_D_D_I::getParametersC(const char * lit) const { RETURN_LIST4(reg_x, reg_y, OZ_atom(lit), OZ_int(reg_c)); } @@ -364,7 +364,7 @@ reg_x = OZ_sCloneAllocBlock(reg_sz, reg_x); } -OZ_Term Propagator_VI_VD_I::getParametersC(char * lit) const +OZ_Term Propagator_VI_VD_I::getParametersC(const char * lit) const { INTVECTOR2LIST(reg_a, reg_sz, a); TERMVECTOR2LIST(reg_x, reg_sz, x); @@ -384,7 +384,7 @@ OZ_sCloneTerm(reg_b); } -OZ_Term Propagator_VI_VD_I_D::getParametersC(char * lit) const +OZ_Term Propagator_VI_VD_I_D::getParametersC(const char * lit) const { INTVECTOR2LIST(reg_a, reg_sz, a); TERMVECTOR2LIST(reg_x, reg_sz, x); @@ -611,7 +611,7 @@ reg_smd_sz = OZ_copyCInts(reg_sz, reg_smd_sz); } -OZ_Term Propagator_VI_VVD_I::getParametersC(char * lit) const +OZ_Term Propagator_VI_VVD_I::getParametersC(const char * lit) const { INTVECTOR2LIST(reg_a, reg_sz, a); @@ -753,7 +753,7 @@ reg_a = OZ_copyCInts(reg_sz, reg_a); } -OZ_Term Propagator_VI_VD_D::getParametersC(char *lit) const +OZ_Term Propagator_VI_VD_D::getParametersC(const char *lit) const { INTVECTOR2LIST(reg_a, reg_sz, a); TERMVECTOR2LIST(reg_x, reg_sz, x); --- mozart-1.4.0.orig/platform/emulator/libfd/std.hh +++ mozart-1.4.0/platform/emulator/libfd/std.hh @@ -94,7 +94,7 @@ virtual size_t sizeOf(void) { return sizeof(Propagator_D_D_D_I); } virtual OZ_Term getParameters(void) const; - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; }; //----------------------------------------------------------------------------- @@ -129,7 +129,7 @@ virtual size_t sizeOf(void) { return sizeof(Propagator_D_D_I); } virtual OZ_Term getParameters(void) const; - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; }; //----------------------------------------------------------------------------- @@ -192,7 +192,7 @@ virtual void sClone(void); virtual size_t sizeOf(void) { return sizeof(Propagator_VI_VD_I); } - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; void simplify_on_equality(void); void simplify(void); @@ -284,7 +284,7 @@ virtual void sClone(void); virtual size_t sizeOf(void) { return sizeof(Propagator_VI_VD_I_D); } - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; }; //----------------------------------------------------------------------------- @@ -370,7 +370,7 @@ virtual void sClone(void); virtual size_t sizeOf(void) { return sizeof(Propagator_VI_VVD_I); } - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; }; //----------------------------------------------------------------------------- @@ -456,7 +456,7 @@ virtual void sClone(void); virtual size_t sizeOf(void) { return sizeof(Propagator_VI_VD_D); } - virtual OZ_Term getParametersC(char *) const; + virtual OZ_Term getParametersC(const char *) const; OZ_Boolean simplify(void); }; --- mozart-1.4.0.orig/platform/emulator/libdp/dpMarshaler.cc +++ mozart-1.4.0/platform/emulator/libdp/dpMarshaler.cc @@ -666,34 +666,6 @@ /* interface to Oz-core */ /* *********************************************************************/ -static -char *tagToComment(MarshalTag tag) -{ - switch(tag){ - case DIF_PORT: - case DIF_PORT_DEF: - return "port"; - case DIF_CELL: - case DIF_CELL_DEF: - return "cell"; - case DIF_LOCK: - case DIF_LOCK_DEF: - return "lock"; - case DIF_OBJECT: - case DIF_OBJECT_DEF: - case DIF_VAR_OBJECT: - case DIF_VAR_OBJECT_DEF: - case DIF_STUB_OBJECT: - case DIF_STUB_OBJECT_DEF: - return "object"; - case DIF_RESOURCE: - case DIF_RESOURCE_DEF: - return "resource"; - default: - Assert(0); - return ""; -}} - void DPBuilderCodeAreaDescriptor::gc() { Assert(current >= start && current <= end); --- mozart-1.4.0.orig/platform/emulator/libdp/glue_ioFactory.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_ioFactory.hh @@ -30,6 +30,12 @@ #ifndef __GLUE_IOFACTORY_HH #define __GLUE_IOFACTORY_HH +enum ErrorClass { + EC_OK, + EC_GO_AHEAD, + EC_CONTINUE_LATER, + EC_LOST // This perm only means the transObj should give up +}; // implementation of DSS channels, using sockets class SocketChannel : public DssChannel { --- mozart-1.4.0.orig/platform/emulator/libdp/glue_interface.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_interface.hh @@ -39,9 +39,6 @@ virtual PstInContainerInterface* createPstInContainer(); virtual void GL_error(const char* const format, ...); virtual void GL_warning(const char* const format, ...); - virtual void kbr_message(int key, PstInContainerInterface*); - virtual void kbr_divideResp(int start, int stop, int n); - virtual void kbr_newResp(int start, int stop, int n, PstInContainerInterface*); }; class ComService: public ComServiceInterface{ @@ -51,8 +48,6 @@ ComService(); ~ComService() {} - virtual ExtDataContainerInterface* m_createExtDataContainer(BYTE); - // The CsSite Object virtual CsSiteInterface* unmarshalCsSite(DSite*, DssReadBuffer* const buf); virtual CsSiteInterface *connectSelfReps(MsgnLayer*, DSite*); @@ -64,7 +59,6 @@ // defined in engine_interface together with inits -extern MAP* glue_dss_connection; extern DSS_Object* dss; extern ComService* glue_com_connection; --- mozart-1.4.0.orig/platform/emulator/libdp/glue_buffer.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_buffer.cc @@ -30,7 +30,7 @@ // This one had to be redefined. We cannot reuse availableSpace() // from ByteBuffer since it does not have the 'const' modifier. -int GlueReadBuffer::availableData() const { return endMB - posMB; } +size_t GlueReadBuffer::availableData() const { return endMB - posMB; } void GlueReadBuffer::commitRead(size_t size) {} @@ -46,7 +46,7 @@ // We cannot inherit this method from ByteBuffer, since it does not // have the 'const' modifier. -int GlueWriteBuffer::availableSpace() const { return endMB - posMB;} +size_t GlueWriteBuffer::availableSpace() const { return endMB - posMB;} void GlueWriteBuffer::putByte(const BYTE& c) { put(c); } --- mozart-1.4.0.orig/platform/emulator/libdp/glue_site.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_site.hh @@ -139,8 +139,6 @@ -void putInt(DssWriteBuffer *buf, int i); -int getInt(DssReadBuffer *buf); void putStr(DssWriteBuffer *buf, char *str, int len); void getStr(DssReadBuffer *buf, char *str, int len); void cleanStr(DssReadBuffer *buf, int len); --- mozart-1.4.0.orig/platform/emulator/libdp/glue_mediators.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_mediators.hh @@ -216,7 +216,7 @@ virtual int getMarshaledDataSize() const; /*************** debugging ***************/ - virtual char* getPrintType() { return "unknown"; } + virtual const char* getPrintType() { return "unknown"; } void print(); }; @@ -242,7 +242,7 @@ void setConst(ConstTermWithHome* c) { setEntity(makeTaggedConst(c)); } virtual void attach(); virtual void detach(); - virtual char *getPrintType() { return "const"; } + virtual const char *getPrintType() { return "const"; } }; @@ -253,9 +253,9 @@ PortMediator(); PortMediator(TaggedRef); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, + virtual void callback_Write(DssThreadId*, PstInContainerInterface*); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, + virtual void callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation() { @@ -263,7 +263,7 @@ virtual void installEntityRepresentation(PstInContainerInterface*) { Assert(0); } virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "port"; } + virtual const char *getPrintType() { return "port"; } }; @@ -273,19 +273,19 @@ CellMediator(); CellMediator(TaggedRef); - AOcallback callback(DssThreadId*, DssOperationId*, - PstInContainerInterface*, PstOutContainerInterface*&); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + void callback(DssThreadId*, + PstInContainerInterface*, PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual PstOutContainerInterface *deinstallEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "cell"; } + virtual const char *getPrintType() { return "cell"; } }; @@ -295,17 +295,17 @@ LockMediator(); LockMediator(TaggedRef); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual PstOutContainerInterface *deinstallEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "lock"; } + virtual const char *getPrintType() { return "lock"; } }; @@ -315,12 +315,12 @@ ArrayMediator(); ArrayMediator(TaggedRef); - AOcallback callback(DssThreadId*, DssOperationId*, - PstInContainerInterface*, PstOutContainerInterface*&); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, + void callback(DssThreadId*, + PstInContainerInterface*, PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); @@ -329,7 +329,7 @@ virtual void marshalData(ByteBuffer*); virtual void unmarshalData(ByteBuffer*); virtual int getMarshaledDataSize() const; - virtual char *getPrintType() { return "array"; } + virtual const char *getPrintType() { return "array"; } }; @@ -339,19 +339,19 @@ DictionaryMediator(); DictionaryMediator(TaggedRef); - AOcallback callback(DssThreadId*, DssOperationId*, - PstInContainerInterface*, PstOutContainerInterface*&); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + void callback(DssThreadId*, + PstInContainerInterface*, PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual PstOutContainerInterface *deinstallEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "dictionary"; } + virtual const char *getPrintType() { return "dictionary"; } }; @@ -362,13 +362,13 @@ ObjectMediator(TaggedRef); virtual bool annotate(Annotation); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "object"; } + virtual const char *getPrintType() { return "object"; } }; @@ -378,19 +378,19 @@ ObjectStateMediator(); ObjectStateMediator(TaggedRef); - AOcallback callback(DssThreadId*, DssOperationId*, - PstInContainerInterface*, PstOutContainerInterface*&); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + void callback(DssThreadId*, + PstInContainerInterface*, PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual PstOutContainerInterface *deinstallEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "object state"; } + virtual const char *getPrintType() { return "object state"; } }; @@ -400,16 +400,16 @@ OzThreadMediator(); OzThreadMediator(TaggedRef); - virtual AOcallback callback_Write(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Write(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "thread"; } + virtual const char *getPrintType() { return "thread"; } }; @@ -422,16 +422,13 @@ virtual void attach(); virtual void gCollectPrepare(); // overrides Mediator::gCollectPrepare() - virtual char *getPrintType() { return "var"; } + virtual const char *getPrintType() { return "var"; } void bind(TaggedRef); // bind the variable and its fault stream - virtual AOcallback callback_Bind(DssOperationId *id, - PstInContainerInterface* operation); - virtual AOcallback callback_Append(DssOperationId *id, - PstInContainerInterface* operation); - virtual AOcallback callback_Changes(DssOperationId* id, - PstOutContainerInterface*& answer); + virtual void callback_Bind(PstInContainerInterface* operation); + virtual void callback_Append(PstInContainerInterface* operation); + virtual void callback_Changes(PstOutContainerInterface*& answer); virtual PstOutContainerInterface *retrieveEntityRepresentation(); virtual void installEntityRepresentation(PstInContainerInterface*); virtual void unmarshalData(ByteBuffer*); @@ -451,15 +448,15 @@ UnusableMediator(); UnusableMediator(TaggedRef); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual PstOutContainerInterface *retrieveEntityRepresentation() { Assert(0); return NULL; } virtual void installEntityRepresentation(PstInContainerInterface*) { Assert(0); } virtual void unmarshalData(ByteBuffer*); - virtual char *getPrintType() { return "unusable"; } + virtual const char *getPrintType() { return "unusable"; } }; @@ -497,13 +494,13 @@ ChunkMediator(); ChunkMediator(TaggedRef); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual void marshalData(ByteBuffer*); virtual void unmarshalData(ByteBuffer*); virtual int getMarshaledDataSize() const; - virtual char *getPrintType() { return "chunk"; } + virtual const char *getPrintType() { return "chunk"; } }; // mediators for classes @@ -512,13 +509,13 @@ ClassMediator(); ClassMediator(TaggedRef); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual void marshalData(ByteBuffer*); virtual void unmarshalData(ByteBuffer*); virtual int getMarshaledDataSize() const; - virtual char *getPrintType() { return "class"; } + virtual const char *getPrintType() { return "class"; } }; // mediators for procedures (Abstraction) @@ -527,13 +524,13 @@ ProcedureMediator(); ProcedureMediator(TaggedRef); - virtual AOcallback callback_Read(DssThreadId*, DssOperationId*, - PstInContainerInterface*, - PstOutContainerInterface*&); + virtual void callback_Read(DssThreadId*, + PstInContainerInterface*, + PstOutContainerInterface*&); virtual void marshalData(ByteBuffer*); virtual void unmarshalData(ByteBuffer*); virtual int getMarshaledDataSize() const; - virtual char *getPrintType() { return "procedure"; } + virtual const char *getPrintType() { return "procedure"; } }; --- mozart-1.4.0.orig/platform/emulator/libdp/glue_mediators.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_mediators.cc @@ -67,7 +67,6 @@ case GLUE_VARIABLE: case GLUE_READONLY: return (1 << pn) & (1 << PN_TRANSIENT | 1 << PN_TRANSIENT_REMOTE); - case GLUE_UNUSABLE: case GLUE_CHUNK: case GLUE_CLASS: case GLUE_OBJECT: @@ -75,6 +74,8 @@ return (1 << pn) & (1 << PN_SIMPLE_CHANNEL | 1 << PN_IMMUTABLE_LAZY | 1 << PN_IMMUTABLE_EAGER | 1 << PN_IMMEDIATE | 1 << PN_SITED); + case GLUE_UNUSABLE: + return pn == PN_SITED; default: return false; } @@ -386,7 +387,7 @@ void Mediator::print(){ - printf("%s mediator, id %d, proxy %x, ref %x, gc(eng:%d dss:%d), con %d\n", + printf("%s mediator, id %d, proxy %p, ref %x, gc(eng:%d dss:%d), con %d\n", getPrintType(), id, getCoordinatorAssistant(), entity, (int) collected, (int) dss_gc_status, (int) attached); } @@ -421,22 +422,20 @@ setEntity(e); } -AOcallback -PortMediator::callback_Write(DssThreadId*, DssOperationId*, +void +PortMediator::callback_Write(DssThreadId*, PstInContainerInterface* pstin) { TaggedRef arg = static_cast(pstin)->a_term; doPortSend(static_cast(getConst()), arg, NULL); - return AOCB_FINISH; } -AOcallback -PortMediator::callback_Read(DssThreadId*, DssOperationId*, +void +PortMediator::callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&) { Assert(0); - return AOCB_FINISH; } @@ -450,8 +449,8 @@ setEntity(e); } -AOcallback -CellMediator::callback(DssThreadId*, DssOperationId*, +void +CellMediator::callback(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { @@ -467,21 +466,20 @@ Assert(ret == RAISE); answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } - return AOCB_FINISH; } -AOcallback -CellMediator::callback_Write(DssThreadId* thr, DssOperationId* op, +void +CellMediator::callback_Write(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } -AOcallback -CellMediator::callback_Read(DssThreadId* thr, DssOperationId* op, +void +CellMediator::callback_Read(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } PstOutContainerInterface * @@ -515,8 +513,8 @@ setEntity(e); } -AOcallback -LockMediator::callback_Write(DssThreadId*, DssOperationId*, +void +LockMediator::callback_Write(DssThreadId*, PstInContainerInterface* operation, PstOutContainerInterface*& answer) { @@ -542,16 +540,14 @@ answer = NULL; } } - return AOCB_FINISH; } -AOcallback -LockMediator::callback_Read(DssThreadId*, DssOperationId*, +void +LockMediator::callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&) { Assert(0); - return AOCB_FINISH; } PstOutContainerInterface * @@ -603,8 +599,8 @@ setEntity(e); } -AOcallback -ArrayMediator::callback(DssThreadId*, DssOperationId*, +void +ArrayMediator::callback(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { @@ -620,21 +616,20 @@ Assert(ret == RAISE); answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } - return AOCB_FINISH; } -AOcallback -ArrayMediator::callback_Write(DssThreadId* thr, DssOperationId* op, +void +ArrayMediator::callback_Write(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } -AOcallback -ArrayMediator::callback_Read(DssThreadId* thr, DssOperationId* op, +void +ArrayMediator::callback_Read(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } PstOutContainerInterface* @@ -686,8 +681,8 @@ setEntity(e); } -AOcallback -DictionaryMediator::callback(DssThreadId*, DssOperationId*, +void +DictionaryMediator::callback(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { @@ -703,21 +698,20 @@ Assert(ret == RAISE); answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } - return AOCB_FINISH; } -AOcallback -DictionaryMediator::callback_Write(DssThreadId* thr, DssOperationId* op, +void +DictionaryMediator::callback_Write(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } -AOcallback -DictionaryMediator::callback_Read(DssThreadId* thr, DssOperationId* op, +void +DictionaryMediator::callback_Read(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } PstOutContainerInterface* @@ -772,8 +766,8 @@ } } -AOcallback -ObjectMediator::callback_Read(DssThreadId*, DssOperationId*, +void +ObjectMediator::callback_Read(DssThreadId*, PstInContainerInterface* operation, PstOutContainerInterface*& answer) { TaggedRef msg = static_cast(operation)->a_term; @@ -806,7 +800,6 @@ answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } } - return AOCB_FINISH; } PstOutContainerInterface* @@ -835,8 +828,8 @@ setEntity(e); } -AOcallback -ObjectStateMediator::callback(DssThreadId*, DssOperationId*, +void +ObjectStateMediator::callback(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { @@ -852,21 +845,20 @@ Assert(ret == RAISE); answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } - return AOCB_FINISH; } -AOcallback -ObjectStateMediator::callback_Write(DssThreadId* thr, DssOperationId* op, +void +ObjectStateMediator::callback_Write(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } -AOcallback -ObjectStateMediator::callback_Read(DssThreadId* thr, DssOperationId* op, +void +ObjectStateMediator::callback_Read(DssThreadId* thr, PstInContainerInterface* pstin, PstOutContainerInterface*& pstout) { - return callback(thr, op, pstin, pstout); + callback(thr, pstin, pstout); } PstOutContainerInterface* @@ -900,21 +892,17 @@ setEntity(e); } -AOcallback -OzThreadMediator::callback_Write(DssThreadId*, DssOperationId*, +void +OzThreadMediator::callback_Write(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&) -{ - return AOCB_FINISH; -} +{ } -AOcallback -OzThreadMediator::callback_Read(DssThreadId*, DssOperationId*, +void +OzThreadMediator::callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&) -{ - return AOCB_FINISH; -} +{ } PstOutContainerInterface* OzThreadMediator::retrieveEntityRepresentation(){ @@ -1038,19 +1026,16 @@ } } -AOcallback -OzVariableMediator::callback_Bind(DssOperationId*, - PstInContainerInterface* pstin) { +void +OzVariableMediator::callback_Bind(PstInContainerInterface* pstin) { Assert(active); // the variable must be bound on the coordinator's site, even if the // site has made it localFail. bind(static_cast(pstin)->a_term); - return AOCB_FINISH; } -AOcallback -OzVariableMediator::callback_Append(DssOperationId*, - PstInContainerInterface* pstin) { +void +OzVariableMediator::callback_Append(PstInContainerInterface* pstin) { // raph: The variable may have been bound at this point. This can // happen when two operations Bind and Append are done concurrently // (a "feature" of the dss). Therefore we check the type first. @@ -1061,16 +1046,13 @@ TaggedRef* ref = tagged2Ref(getEntity()); // points to the tagged ref oz_var_makeNeededLocal(ref); } - return AOCB_FINISH; } -AOcallback -OzVariableMediator::callback_Changes(DssOperationId*, - PstOutContainerInterface*& answer) { +void +OzVariableMediator::callback_Changes(PstOutContainerInterface*& answer) { // simply check whether the variable is needed answer = (active && oz_isNeeded(oz_deref(entity)) ? new PstOutContainer(oz_atom("needed")) : NULL); - return AOCB_FINISH; } @@ -1085,13 +1067,11 @@ setAnnotation(Annotation(PN_SITED, AA_NO_ARCHITECTURE, RC_ALG_NONE)); } -AOcallback -UnusableMediator::callback_Read(DssThreadId*, DssOperationId*, +void +UnusableMediator::callback_Read(DssThreadId*, PstInContainerInterface*, PstOutContainerInterface*&) -{ - return AOCB_FINISH; -} +{ } @@ -1122,8 +1102,8 @@ setEntity(e); } -AOcallback -ChunkMediator::callback_Read(DssThreadId*, DssOperationId*, +void +ChunkMediator::callback_Read(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { SChunk* chunk = static_cast(getConst()); @@ -1138,7 +1118,6 @@ Assert(ret == RAISE); answer = new PstOutContainer(glue_raise(am.getExceptionValue())); } - return AOCB_FINISH; } @@ -1154,13 +1133,12 @@ setAnnotation(Annotation(PN_SITED, AA_NO_ARCHITECTURE, RC_ALG_NONE)); } -AOcallback -ClassMediator::callback_Read(DssThreadId*, DssOperationId*, +void +ClassMediator::callback_Read(DssThreadId*, PstInContainerInterface* pstin, PstOutContainerInterface*& answer) { // no distributed operation on stationary classes! Assert(0); - return AOCB_FINISH; } @@ -1177,8 +1155,8 @@ setAnnotation(Annotation(PN_SITED, AA_NO_ARCHITECTURE, RC_ALG_NONE)); } -AOcallback -ProcedureMediator::callback_Read(DssThreadId*, DssOperationId*, +void +ProcedureMediator::callback_Read(DssThreadId*, PstInContainerInterface* operation, PstOutContainerInterface*& answer) { // the only read operation is: call @@ -1198,5 +1176,4 @@ if (thread->isSuspended()) oz_wakeupThread(thread); // answer = new PstOutContainer(glue_return(ret)); - return AOCB_FINISH; } --- mozart-1.4.0.orig/platform/emulator/libdp/glue_base.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_base.hh @@ -32,9 +32,6 @@ Protected Oz Data */ extern OZ_Term g_connectPort; -extern OZ_Term g_kbrStreamPort; -extern OZ_Term g_defaultAcceptProcedure; -extern OZ_Term g_faultPort; void doPortSend(OzPort *port, TaggedRef val, Board*); --- mozart-1.4.0.orig/platform/emulator/libdp/engine_interface.cc +++ mozart-1.4.0/platform/emulator/libdp/engine_interface.cc @@ -48,16 +48,9 @@ #define HEART_BEAT_RATE 32 -Bool glueInitialized = FALSE; -MAP* glue_dss_connection = NULL; DSS_Object* dss = NULL; ComService* glue_com_connection = NULL; -// -Bool dpReadyImpl() { - return true; -} - // GC Routines // // These routines are now defined at Glue level, and not as it used to be @@ -350,10 +343,10 @@ void initDP() { - // + static Bool glueInitialized = FALSE; if (glueInitialized) return; glueInitialized = OK; - glue_dss_connection = new MAP(); + glue_com_connection = new ComService(); // Allocate the marshalers, and unmarshalers @@ -398,9 +391,6 @@ // create mediator table mediatorTable = new MediatorTable(); - // init flag - dpReady = dpReadyImpl; - // distributed operations initEntityOperations(); @@ -412,7 +402,7 @@ gCollectMediator = gcMediatorImpl; // Starting the DSS - dss = new DSS_Object(glue_com_connection, glue_dss_connection); + dss = new DSS_Object(glue_com_connection, new MAP()); initHeartBeat(HEART_BEAT_RATE); OzSite_init(); --- mozart-1.4.0.orig/platform/emulator/libdp/glue_site.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_site.cc @@ -141,19 +141,19 @@ int GlueSite::getCsSiteSize() { - return SIZE_INT + tagged2ByteString(info)->getWidth(); + return sz_MNumberMax + tagged2ByteString(info)->getWidth(); } void GlueSite::marshalCsSite( DssWriteBuffer* const buf){ ByteString* bs = tagged2ByteString(info); - putInt(buf, bs->getWidth()); + gf_MarshalNumber(buf, bs->getWidth()); putStr(buf, (char*) bs->getData(), bs->getWidth()); } void GlueSite::updateCsSite( DssReadBuffer* const buf){ - ByteString* bs = new ByteString(getInt(buf)); + ByteString* bs = new ByteString(gf_UnmarshalNumber(buf)); getStr(buf, (char*) bs->getData(), bs->getWidth()); info = makeTaggedExtension(bs); } @@ -177,7 +177,8 @@ dsite->m_stateChange(FS_OK); // fall through case FS_OK: - if (rtt > RTT_UPPERBOUND) rtt = RTT_UPPERBOUND; + rtt = min(rtt, RTT_UPPERBOUND); + // consider rtt <= RTT_UPPERBOUND, larger values are abnormal if (rtt_avg) { int err = rtt - rtt_avg; rtt_avg += err / 2; @@ -186,7 +187,8 @@ rtt_avg = rtt; rtt_mdev = rtt; } - rtt_timeout = rtt_avg + rtt_mdev; + rtt_timeout = rtt_avg + max(rtt_mdev, rtt_avg); + // rtt_timeout >= 2 * rtt_avg, this avoids too much sensitivity dsite->m_monitorRTT(rtt_timeout); // fall through default: --- mozart-1.4.0.orig/platform/emulator/libdp/glue_interface.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_interface.cc @@ -52,10 +52,6 @@ Mediation_Object() {} OZ_Term g_connectPort; - OZ_Term g_kbrStreamPort; - OZ_Term g_defaultAcceptProcedure; - OZ_Term g_faultPort; - PstInContainerInterface* MAP::createPstInContainer(){ @@ -85,46 +81,6 @@ //OZ_warning("DSS_warning %s", format,ap); va_end(ap); } -void -MAP::kbr_message(int key, PstInContainerInterface* pstin){ - PstInContainer *pst = static_cast(pstin); - printf("Receiving key:%d, msg %s\n", key, toC(pst->a_term)); - OzPort *pws = tagged2Port(g_kbrStreamPort); - OZ_Term msg = OZ_recordInit(oz_atom("message"), - oz_cons(oz_pairA("msg", pst->a_term), - oz_cons(oz_pairAI("key", key), - oz_nil()))); - doPortSend(pws, msg, NULL); -} - - -void -MAP::kbr_divideResp(int start, int stop, int n){ - printf("Divide interval ]%d %d ]\n", start, stop); - OzPort *pws = tagged2Port(g_kbrStreamPort); - OZ_Term msg = OZ_recordInit(oz_atom("divide"), - oz_cons(oz_pairAI("begin",start), - oz_cons(oz_pairAI("end", stop), - oz_cons(oz_pairAI("n", n), - oz_nil())))); - doPortSend(pws, msg, NULL); -} - -void -MAP::kbr_newResp(int start, int stop, int n, PstInContainerInterface* pstin){ - printf("Divide interval ]%d %d ]\n", start, stop); - OzPort *pws = tagged2Port(g_kbrStreamPort); - PstInContainer *pst = static_cast(pstin); - OZ_Term msg = OZ_recordInit(oz_atom("newResp"), - oz_cons(oz_pairAI("begin",start), - oz_cons(oz_pairAI("end", stop), - oz_cons(oz_pairAI("n", n), - oz_cons(oz_pairA("data", pst->a_term), - oz_nil()))))); - doPortSend(pws, msg, NULL); -} - - /************************* ComService *************************/ @@ -162,9 +118,3 @@ site = site->getNext(); } } - -ExtDataContainerInterface* -ComService::m_createExtDataContainer(BYTE){ - printf("we're sending NOTHING, thus we should se no extdata containers\n"); - return NULL; -} --- mozart-1.4.0.orig/platform/emulator/libdp/glue_buffer.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_buffer.hh @@ -33,8 +33,8 @@ public: GlueReadBuffer(BYTE*, int); - - virtual int availableData() const; + + virtual size_t availableData() const; virtual bool canRead(size_t len) const {return this->availableData()>=len;} virtual void readFromBuffer(BYTE* ptr, size_t wanted); virtual void commitRead(size_t read); @@ -49,7 +49,7 @@ public: GlueWriteBuffer(BYTE*, int); - virtual int availableSpace() const; + virtual size_t availableSpace() const; virtual bool canWrite(size_t len) const {return this->availableSpace()>=len;} virtual void writeToBuffer(const BYTE* ptr, size_t write); @@ -70,14 +70,14 @@ ~GlueMarshalerBuffer() {} // DssReadBuffer interface - virtual int availableData() const { return 1000000; } // ahem... + virtual size_t availableData() const { return 1000000; } // ahem... virtual bool canRead(size_t) const { return true; } virtual void readFromBuffer(BYTE*, size_t); virtual void commitRead(size_t) {} virtual const BYTE getByte() { return buffer->get(); } // DssWriteBuffer interface - virtual int availableSpace() const { return 1000000; } // ahem... + virtual size_t availableSpace() const { return 1000000; } // ahem... virtual bool canWrite(size_t) const { return true; } virtual void writeToBuffer(const BYTE* ptr, size_t write); virtual void putByte(const BYTE& b) { buffer->put(b); } --- mozart-1.4.0.orig/platform/emulator/libdp/glue_builtins.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_builtins.cc @@ -34,7 +34,6 @@ #include "dss_object.hh" #include "glue_interface.hh" #include "glue_tables.hh" -#include "glue_utils.hh" #include "engine_interface.hh" #include "glue_site.hh" #include "glue_buffer.hh" @@ -276,75 +275,13 @@ } OZ_BI_end -// For setting up a ticket - -OZ_BI_define(BIgetCRC,1,1) -{ - oz_declareVirtualStringIN(0,s); - - crc_t crc = update_crc(init_crc(),(unsigned char *) s, strlen(s)); - - OZ_RETURN(OZ_unsignedInt(crc)); -} OZ_BI_end - -#define PORT_TO_TICK_BUF_LEN 400 -unsigned char portToTickBuf[PORT_TO_TICK_BUF_LEN]; - -OZ_BI_define(BIportToMS,1,1) -{ - oz_declareNonvarIN(0,prt); - if (!oz_isPort(prt)) { oz_typeError(0,"Port"); } - - // globalize the port, and get its mediator - glue_globalizeEntity(prt); - Mediator *med = glue_getMediator(prt); - - // marshal the Dss abstract entity, and entity-specific stuff - GlueWriteBuffer buf(portToTickBuf, PORT_TO_TICK_BUF_LEN); - med->getCoordinatorAssistant()->marshal(&buf, PMF_FREE); - med->marshalData(&buf); - - // turn it into a string - int len = buf.bufferUsed(); - char *str = encodeB64((char*) portToTickBuf, len); - OZ_RETURN(OZ_string(str)); -}OZ_BI_end - - -OZ_BI_define(BImsToPort,1,1) -{ - oz_declareProperStringIN(0,str); - int len = strlen(str); - unsigned char* raw_buf = (unsigned char*) decodeB64((char*)str, len); - - // unmarshal the Dss abstract entity, and entity-specific stuff - GlueReadBuffer buf(raw_buf, len); - AbstractEntityName aen; - bool trail; - CoordinatorAssistant* proxy = dss->unmarshalProxy(&buf, PUF_FREE, aen, trail); - Assert(!trail); - - // build mediator and entity if not present - Mediator* med = dynamic_cast(proxy->getAbstractEntity()); - if (!med) { // create mediator - med = glue_newMediator(GLUE_PORT); - med->setProxy(proxy); - } - med->unmarshalData(&buf); - free(raw_buf); - - OZ_RETURN(med->getEntity()); - -}OZ_BI_end - - /**********************************************************************/ /* Misc Builtins */ /**********************************************************************/ extern -int raiseUnixError(char *f,int n, char * e, char * g); +int raiseUnixError(const char *f,int n, const char * e, const char * g); // #define WRAPCALL(f, CALL, RET) \ @@ -670,58 +607,6 @@ } OZ_BI_end - -/**********************************************************************/ -/* Fault Builtins */ -/**********************************************************************/ - - -/* NOTE - - - Due to the limited time available the implementation of - fault detection is not complete. Enough is implemented to - display the basic concepts. - - Lacking fucntionality on lang-level: - - + Injectors,or their only interesting format, exception raisers. - - + The failure reporting over the EMU structure is lacking. - -*/ - - -OZ_BI_define(BIinstallFaultPort,1,0){ - oz_declareNonvarIN(0,port); - if (!oz_isPort(port)) { - oz_typeError(0,"Port"); - } - g_faultPort = port; - OZ_protect(&g_faultPort); - return PROCEED; -}OZ_BI_end - -OZ_BI_define(BIdistHandlerInstall,4,1){ - OZ_warning("Watcher installation disabled"); - OZ_RETURN(oz_bool(TRUE)); -}OZ_BI_end - - - - -OZ_BI_define(BIdistHandlerDeInstall,2,1){ - OZ_Term c0 = OZ_in(0); - OZ_Term proc0 = OZ_in(1); - OZ_RETURN(oz_bool(TRUE)); -}OZ_BI_end - -OZ_BI_define(BIgetEntityCond,2,0){ - OZ_warning("Watcher deinstallation disabled"); - OZ_RETURN(oz_cons(AtomNormal,oz_nil())); -}OZ_BI_end - - // send a value (1) on a given site (0) OZ_BI_define(BIsendMsgToSite,2,0){ oz_declareNonvarIN(0, site); --- mozart-1.4.0.orig/platform/emulator/libdp/Makefile.in +++ mozart-1.4.0/platform/emulator/libdp/Makefile.in @@ -34,7 +34,7 @@ REALCORESRCS = glue_interface.cc engine_interface.cc \ glue_tables.cc glue_faults.cc \ glue_builtins.cc \ - glue_utils.cc pstContainer.cc dpMarshaler.cc \ + pstContainer.cc dpMarshaler.cc \ glue_buffer.cc glue_site.cc \ glue_mediators.cc glue_marshal.cc \ glue_suspendedThreads.cc \ @@ -58,6 +58,8 @@ all: # Remember the order, CREATEDFILES MUST be created before COREOBJS +$(COREOBJS): $(CREATEDFILES) + # The DSS should be included when dynamically linked.. ../Glue.so-$(PLATFORM): $(CREATEDFILES) $(COREOBJS) $(DYNLD) -L$(BUILDTOP)/platform/emulator -lDSS -o $@ $(COREOBJS) --- mozart-1.4.0.orig/platform/emulator/libdp/glue_suspendedThreads.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_suspendedThreads.cc @@ -135,11 +135,10 @@ } } -WakeRetVal SuspendedOperation::resumeFailed() { +void SuspendedOperation::resumeFailed() { // simply forget about the control var, and release the thread id releaseThreadId(threadId); threadId = NULL; - return WRV_DONE; } @@ -149,12 +148,12 @@ SuspendedDummy::SuspendedDummy() : SuspendedOperation(NULL) {} -WakeRetVal SuspendedDummy::resumeDoLocal(DssOperationId*) { - resume(); return WRV_DONE; +void SuspendedDummy::resumeDoLocal() { + resume(); } -WakeRetVal SuspendedDummy::resumeRemoteDone(PstInContainerInterface*) { - resume(); return WRV_DONE; +void SuspendedDummy::resumeRemoteDone(PstInContainerInterface*) { + resume(); } bool SuspendedDummy::gCollect() { @@ -175,7 +174,7 @@ suspend(); } -WakeRetVal SuspendedCellOp::resumeDoLocal(DssOperationId*) { +void SuspendedCellOp::resumeDoLocal() { CellMediator* med = static_cast(getMediator()); OzCell* cell = static_cast(med->getConst()); TaggedRef out; @@ -186,10 +185,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal SuspendedCellOp::resumeRemoteDone(PstInContainerInterface* pstin){ +void SuspendedCellOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { resume(); @@ -198,7 +196,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedCellOp::gCollect(){ @@ -220,7 +217,7 @@ suspend(); } -WakeRetVal SuspendedLockTake::resumeDoLocal(DssOperationId*) { +void SuspendedLockTake::resumeDoLocal() { ConstMediator* med = static_cast(getMediator()); OzLock* lock = static_cast(med->getConst()); if (!lock->take(ozthread)) { // the thread must subscribe @@ -229,10 +226,9 @@ ctlVar = 0; } resume(); - return WRV_DONE; } -WakeRetVal +void SuspendedLockTake::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); // The result is either unit, or a control variable, on which the @@ -242,7 +238,6 @@ Assert(ret == PROCEED); ctlVar = 0; resume(); - return WRV_DONE; } bool SuspendedLockTake::gCollect() { @@ -264,18 +259,16 @@ // so we do not suspend it. } -WakeRetVal SuspendedLockRelease::resumeDoLocal(DssOperationId*) { +void SuspendedLockRelease::resumeDoLocal() { ConstMediator* med = static_cast(getMediator()); OzLock *lock = static_cast(med->getConst()); lock->release(ozthread); resume(); - return WRV_DONE; } -WakeRetVal +void SuspendedLockRelease::resumeRemoteDone(PstInContainerInterface* pstin){ resume(); - return WRV_DONE; } bool SuspendedLockRelease::gCollect() { @@ -301,7 +294,7 @@ suspend(); } -WakeRetVal SuspendedArrayOp::resumeDoLocal(DssOperationId*) { +void SuspendedArrayOp::resumeDoLocal() { ArrayMediator* med = static_cast(getMediator()); OzArray* arr = static_cast(med->getConst()); TaggedRef out; @@ -312,10 +305,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal SuspendedArrayOp::resumeRemoteDone(PstInContainerInterface* pstin){ +void SuspendedArrayOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { resume(); @@ -324,7 +316,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedArrayOp::gCollect(){ @@ -351,7 +342,7 @@ suspend(); } -WakeRetVal SuspendedDictionaryOp::resumeDoLocal(DssOperationId*) { +void SuspendedDictionaryOp::resumeDoLocal() { DictionaryMediator* med = static_cast(getMediator()); OzDictionary* dict = static_cast(med->getConst()); TaggedRef out; @@ -362,10 +353,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal SuspendedDictionaryOp::resumeRemoteDone(PstInContainerInterface* pstin){ +void SuspendedDictionaryOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { resume(); @@ -374,7 +364,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedDictionaryOp::gCollect(){ @@ -401,7 +390,7 @@ suspend(); } -WakeRetVal SuspendedObjectOp::resumeDoLocal(DssOperationId*) { +void SuspendedObjectOp::resumeDoLocal() { ObjectMediator* med = static_cast(getMediator()); OzObject* obj = static_cast(med->getConst()); TaggedRef out; @@ -412,10 +401,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal SuspendedObjectOp::resumeRemoteDone(PstInContainerInterface* pstin){ +void SuspendedObjectOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { resume(); @@ -424,7 +412,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedObjectOp::gCollect(){ @@ -451,7 +438,7 @@ suspend(); } -WakeRetVal SuspendedObjectStateOp::resumeDoLocal(DssOperationId*) { +void SuspendedObjectStateOp::resumeDoLocal() { ObjectMediator* med = static_cast(getMediator()); ObjectState* state = static_cast(med->getConst()); TaggedRef out; @@ -462,10 +449,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal +void SuspendedObjectStateOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { @@ -475,7 +461,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedObjectStateOp::gCollect(){ @@ -502,7 +487,7 @@ suspend(); } -WakeRetVal SuspendedChunkOp::resumeDoLocal(DssOperationId*) { +void SuspendedChunkOp::resumeDoLocal() { ChunkMediator* med = static_cast(getMediator()); SChunk* chunk = static_cast(med->getConst()); TaggedRef out; @@ -513,10 +498,9 @@ Assert(ret == RAISE); resumeRaise(am.getExceptionValue()); } - return WRV_DONE; } -WakeRetVal SuspendedChunkOp::resumeRemoteDone(PstInContainerInterface* pstin){ +void SuspendedChunkOp::resumeRemoteDone(PstInContainerInterface* pstin){ PstInContainer* pst = static_cast(pstin); if (pst == NULL) { resume(); @@ -525,7 +509,6 @@ } else { resumeRaise(glue_getData(pst->a_term)); } - return WRV_DONE; } bool SuspendedChunkOp::gCollect(){ @@ -548,7 +531,7 @@ suspend(); } -WakeRetVal SuspendedGenericDot::resumeDoLocal(DssOperationId*) { +void SuspendedGenericDot::resumeDoLocal() { TaggedRef entity = getMediator()->getEntity(); TaggedRef out; switch (dotInline(entity, key, out)) { @@ -571,10 +554,9 @@ // should never happen, because the state is local Assert(0); } - return WRV_DONE; } -WakeRetVal +void SuspendedGenericDot::resumeRemoteDone(PstInContainerInterface* pstin) { if (pstin) { PstInContainer *pst = static_cast(pstin); @@ -583,7 +565,6 @@ TaggedRef entity = getMediator()->getEntity(); resumeRaise(OZ_makeException(E_ERROR, E_KERNEL, ".", 2, entity, key)); } - return WRV_DONE; } bool SuspendedGenericDot::gCollect(){ @@ -606,19 +587,17 @@ suspend(); } -WakeRetVal SuspendedCall::resumeDoLocal(DssOperationId*) { +void SuspendedCall::resumeDoLocal() { // resume by a local call TaggedRef entity = getMediator()->getEntity(); resumeApply(entity, args); - return WRV_DONE; } -WakeRetVal +void SuspendedCall::resumeRemoteDone(PstInContainerInterface* pstin) { // the calling thread synchronizes on the result PstInContainer* pst = static_cast(pstin); resumeApply(BI_wait, oz_mklist(glue_getData(pst->a_term))); - return WRV_DONE; } bool SuspendedCall::gCollect(){ @@ -640,12 +619,12 @@ ctlVar = cv; } -WakeRetVal SuspendedClassGet::resumeDoLocal(DssOperationId*) { - resume(); return WRV_DONE; +void SuspendedClassGet::resumeDoLocal() { + resume(); } -WakeRetVal SuspendedClassGet::resumeRemoteDone(PstInContainerInterface*) { - Assert(0); return WRV_DONE; +void SuspendedClassGet::resumeRemoteDone(PstInContainerInterface*) { + Assert(0); } bool SuspendedClassGet::gCollect() { --- mozart-1.4.0.orig/platform/emulator/libdp/glue_ioFactory.cc +++ mozart-1.4.0/platform/emulator/libdp/glue_ioFactory.cc @@ -77,7 +77,6 @@ void SocketChannel::close() { - delete this; } bool --- mozart-1.4.0.orig/platform/emulator/libdp/glue_suspendedThreads.hh +++ mozart-1.4.0/platform/emulator/libdp/glue_suspendedThreads.hh @@ -100,9 +100,9 @@ bool gc(); // returns TRUE and collect stuff if needed // inherited from ThreadMediator - virtual WakeRetVal resumeDoLocal(DssOperationId*) = 0; - virtual WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin) = 0; - virtual WakeRetVal resumeFailed(); + virtual void resumeDoLocal() = 0; + virtual void resumeRemoteDone(PstInContainerInterface* pstin) = 0; + virtual void resumeFailed(); // returns TRUE and collect stuff if needed virtual bool gCollect() = 0; @@ -113,8 +113,8 @@ class SuspendedDummy : public SuspendedOperation { public: SuspendedDummy(); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; @@ -127,8 +127,8 @@ TaggedRef result; public: SuspendedCellOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -140,8 +140,8 @@ TaggedRef ozthread; public: SuspendedLockTake(Mediator*, TaggedRef); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; @@ -151,8 +151,8 @@ public: // Note: we do not suspend the requesting thread! SuspendedLockRelease(Mediator*, TaggedRef); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; @@ -165,8 +165,8 @@ TaggedRef result; public: SuspendedArrayOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -179,8 +179,8 @@ TaggedRef result; public: SuspendedDictionaryOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -193,8 +193,8 @@ TaggedRef result; public: SuspendedObjectOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -206,8 +206,8 @@ TaggedRef result; public: SuspendedObjectStateOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -220,8 +220,8 @@ TaggedRef result; public: SuspendedChunkOp(Mediator*, OperationTag, TaggedRef*, TaggedRef*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface*); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface*); bool gCollect(); }; @@ -233,8 +233,8 @@ OZ_Term result; // a variable public: SuspendedGenericDot(Mediator*, OZ_Term, OZ_Term); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; @@ -245,8 +245,8 @@ OZ_Term args; // list of arguments public: SuspendedCall(Mediator*, OZ_Term); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; @@ -255,8 +255,8 @@ class SuspendedClassGet : public SuspendedOperation { public: SuspendedClassGet(Mediator*); - WakeRetVal resumeDoLocal(DssOperationId*); - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin); + void resumeDoLocal(); + void resumeRemoteDone(PstInContainerInterface* pstin); bool gCollect(); }; --- mozart-1.4.0.orig/platform/tools/configure +++ mozart-1.4.0/platform/tools/configure @@ -583,7 +583,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1237,9 +1237,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1242: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1243: checking for OZLOADSEP" >&5 +echo "configure:1256: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1259,7 +1272,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1263: checking for OZLOADWIN" >&5 +echo "configure:1276: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1300,7 +1313,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1304: checking for $ac_word" >&5 +echo "configure:1317: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1497,6 +1510,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/tools/gump/configure +++ mozart-1.4.0/platform/tools/gump/configure @@ -1099,7 +1099,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1753,9 +1753,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1758: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1759: checking for OZLOADSEP" >&5 +echo "configure:1772: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1775,7 +1788,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1779: checking for OZLOADWIN" >&5 +echo "configure:1792: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1815,7 +1828,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1819: checking for --with-global-oz" >&5 +echo "configure:1832: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1849,7 +1862,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1853: checking for $ac_word" >&5 +echo "configure:1866: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1895,7 +1908,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1899: checking for --with-global-oz" >&5 +echo "configure:1912: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1929,7 +1942,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1933: checking for $ac_word" >&5 +echo "configure:1946: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1975,7 +1988,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1979: checking for --with-global-oz" >&5 +echo "configure:1992: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -2009,7 +2022,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2013: checking for $ac_word" >&5 +echo "configure:2026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2071,7 +2084,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2075: checking for $ac_word" >&5 +echo "configure:2088: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2103,7 +2116,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2107: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2120: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2114,12 +2127,12 @@ cat > conftest.$ac_ext << EOF -#line 2118 "configure" +#line 2131 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2145,12 +2158,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2149: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2162: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2154: checking whether we are using GNU C++" >&5 +echo "configure:2167: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2159,7 +2172,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2178,7 +2191,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2182: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2195: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2216,7 +2229,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:2220: checking $CXX version is at least 3.3.2" >&5 +echo "configure:2233: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2349,7 +2362,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:2353: checking c++ compiler option $ozm_opt" >&5 +echo "configure:2366: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2380,7 +2393,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2384: checking how to run the C++ preprocessor" >&5 +echo "configure:2397: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2393,12 +2406,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2430,23 +2443,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:2434: checking for C++ compiler" >&5 +echo "configure:2447: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2439: checking whether we are using GNU C++" >&5 +echo "configure:2452: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2444: checking for C++ preprocessor" >&5 +echo "configure:2457: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:2450: checking for default CXXFLAGS" >&5 +echo "configure:2463: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -2464,7 +2477,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2468: checking whether ln -s works" >&5 +echo "configure:2481: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2489,7 +2502,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2493: checking for $ac_word" >&5 +echo "configure:2506: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2691,6 +2704,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/tools/gump/Makefile.in +++ mozart-1.4.0/platform/tools/gump/Makefile.in @@ -63,6 +63,10 @@ $(INCDIR) $(INCFILES) \ $(NEWCACHEDIR) $(NEWCACHEFILES) +$(PLATFORMFILES): $(PLATFORMDIR) +$(INCFILES): $(INCDIR) +$(NEWCACHEFILES): $(NEWCACHEDIR) + $(SHAREDIR) $(PLATFORMDIR) $(INCDIR) $(NEWCACHEDIR): $(MKINSTALLDIRS) $@ --- mozart-1.4.0.orig/platform/tools/gump/ozflex/configure +++ mozart-1.4.0/platform/tools/gump/ozflex/configure @@ -583,7 +583,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1237,9 +1237,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1242: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1243: checking for OZLOADSEP" >&5 +echo "configure:1256: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1259,7 +1272,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1263: checking for OZLOADWIN" >&5 +echo "configure:1276: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1303,7 +1316,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1307: checking for $ac_word" >&5 +echo "configure:1320: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1333,7 +1346,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1337: checking for $ac_word" >&5 +echo "configure:1350: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1384,7 +1397,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1388: checking for $ac_word" >&5 +echo "configure:1401: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1416,7 +1429,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1420: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1433: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1427,12 +1440,12 @@ cat > conftest.$ac_ext << EOF -#line 1431 "configure" +#line 1444 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1458,12 +1471,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1462: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1475: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1467: checking whether we are using GNU C" >&5 +echo "configure:1480: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1472,7 +1485,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1491,7 +1504,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1495: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1508: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1529,7 +1542,7 @@ else echo $ac_n "checking $CC version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1533: checking $CC version is at least 3.3.2" >&5 +echo "configure:1546: checking $CC version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CC -dumpversion || $CC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1662,7 +1675,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking cc compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1666: checking cc compiler option $ozm_opt" >&5 +echo "configure:1679: checking cc compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gccopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1693,7 +1706,7 @@ ;; esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1697: checking how to run the C preprocessor" >&5 +echo "configure:1710: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1708,13 +1721,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1725,13 +1738,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1742,13 +1755,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1780,23 +1793,23 @@ else echo $ac_n "checking for C compiler""... $ac_c" 1>&6 -echo "configure:1784: checking for C compiler" >&5 +echo "configure:1797: checking for C compiler" >&5 CC=$oz_cv_CC echo "$ac_t""(cached) $CC" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1789: checking whether we are using GNU C" >&5 +echo "configure:1802: checking whether we are using GNU C" >&5 GCC=$oz_cv_GCC echo "$ac_t""(cached) $GCC" 1>&6 echo $ac_n "checking for C preprocessor""... $ac_c" 1>&6 -echo "configure:1794: checking for C preprocessor" >&5 +echo "configure:1807: checking for C preprocessor" >&5 CPP=$oz_cv_CPP echo "$ac_t""(cached) $CPP" 1>&6 if test "${CFLAGS+set}" != set ; then echo $ac_n "checking for default CFLAGS""... $ac_c" 1>&6 -echo "configure:1800: checking for default CFLAGS" >&5 +echo "configure:1813: checking for default CFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1810,7 +1823,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1814: checking for $ac_word" >&5 +echo "configure:1827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1853,7 +1866,7 @@ else echo $ac_n "checking $YACC version is at least 1.25""... $ac_c" 1>&6 -echo "configure:1857: checking $YACC version is at least 1.25" >&5 +echo "configure:1870: checking $YACC version is at least 1.25" >&5 oz_tmp_ok=no if oz_tmp_version1=`$YACC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1977,7 +1990,7 @@ else echo $ac_n "checking for GNU bison""... $ac_c" 1>&6 -echo "configure:1981: checking for GNU bison" >&5 +echo "configure:1994: checking for GNU bison" >&5 YACC=$oz_cv_YACC echo "$ac_t""(cached) $YACC" 1>&6 fi @@ -1985,12 +1998,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1989: checking for working const" >&5 +echo "configure:2002: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2060,12 +2073,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2064: checking for ANSI C header files" >&5 +echo "configure:2077: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2073,7 +2086,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2090,7 +2103,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2108,7 +2121,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2129,7 +2142,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2140,7 +2153,7 @@ exit (0); } EOF -if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2164,12 +2177,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2168: checking for size_t" >&5 +echo "configure:2181: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2197,12 +2210,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2201: checking for ANSI C header files" >&5 +echo "configure:2214: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2210,7 +2223,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2214: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2227,7 +2240,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2245,7 +2258,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2266,7 +2279,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2277,7 +2290,7 @@ exit (0); } EOF -if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2304,17 +2317,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2308: checking for $ac_hdr" >&5 +echo "configure:2321: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2346,7 +2359,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2350: checking for $ac_word" >&5 +echo "configure:2363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2382,19 +2395,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2386: checking for working alloca.h" >&5 +echo "configure:2399: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2415,12 +2428,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2419: checking for alloca" >&5 +echo "configure:2432: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2480,12 +2493,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2484: checking whether alloca needs Cray hooks" >&5 +echo "configure:2497: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2514: checking for $ac_func" >&5 +echo "configure:2527: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2565,7 +2578,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2569: checking stack direction for C alloca" >&5 +echo "configure:2582: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2573,7 +2586,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2769,6 +2782,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/dss/config.sub +++ mozart-1.4.0/platform/dss/config.sub @@ -1,79 +1,1676 @@ #! /bin/sh +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-01-16' + +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file 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., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# Expect to find configfsf.sub in the same directory as this config.sub -configfsf_sub="`echo \"$0\" | sed 's/config.sub$/configfsf.sub/'`" -if test "$configfsf_sub" = "$0"; then - echo "Cannot derive configfsf.sub from $0" 1>&2 - exit 1 -fi -if test -f "$configfsf_sub"; then - : -else - echo "$configfsf_sub not found" 1>&2 - exit 1 -fi -# Always run configfsf.sub with $SHELL, like autoconf does for config.sub -SHELL=${CONFIG_SHELL-/bin/sh} +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." -# Identify ourselves on --version, --help, etc -case "$1" in -"" | -*) - $SHELL $configfsf_sub "$@" - exit - ;; -esac - -given_full="$1" -given_cpu=`echo "$given_full" | sed 's/-.*$//'` -given_rest=`echo "$given_full" | sed 's/^[^-]*//'` - - -# Aliases for GMP extras -case "$given_cpu" in -p5 | p54) given_cpu=pentium ;; -p55) given_cpu=pentiummmx ;; -p6) given_cpu=pentiumpro ;; -pentiumii) given_cpu=pentium2 ;; -pentiumiii) given_cpu=pentium3 ;; -esac -given_full="$given_cpu$given_rest" - - -# GMP extras and what to use for the config.sub test -case "$given_cpu" in -pentium | pentiummmx | pentiumpro | pentium[234] | k[56] | k6[23] | athlon) - test_cpu=i386 ;; -sparcv8 | supersparc | microsparc | \ -ultrasparc | ultrasparc2 | ultrasparc2i | ultrasparc3) - test_cpu=sparc ;; -*) - # Don't need or want to change the given name, just run configfsf.sub - $SHELL $configfsf_sub "$given_full" - if test $? = 0; then - exit 0 - else - echo "(Testing \"$given_full\")" - exit 1 - fi +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; esac +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx | dvp \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ + | ns16k | ns32k \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | pyramid \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ + | we32k \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | pyramid-* \ + | romp-* | rs6000-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mipsEE* | ee | ps2) + basic_machine=mips64r5900el-scei + case $os in + -linux*) + ;; + *) + os=-elf + ;; + esac + ;; + iop) + basic_machine=mipsel-scei + os=-irx + ;; + dvp) + basic_machine=dvp-scei + os=-elf + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac -test_full="$test_cpu$given_rest" -canonical_full=`$SHELL $configfsf_sub "$test_full"` -if test $? = 0; then - : +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac else - echo "(Testing \"$given_full\" as \"$test_full\")" - exit 1 + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac fi -canonical_rest=`echo "$canonical_full" | sed 's/^[^-]*//'` -echo "$given_cpu$canonical_rest" -exit 0 +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac +echo $basic_machine$os +exit # Local variables: -# fill-column: 76 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" # End: --- mozart-1.4.0.orig/platform/dss/README +++ mozart-1.4.0/platform/dss/README @@ -27,9 +27,6 @@ This option will default to dss, which includes messaging, if any dss example is enabled and default to messaging if such examples are selected - * "--enable-exceptions" to enable throwing of exceptions from the DSS, exceptions are of the - ExceptionType found in dss_enums.hh - * "--enable-warnings" This flag is ALLWAYS TURNED ON. to disable warnings, set to "no". If set to "error" warnings are also treated as errors @@ -45,6 +42,5 @@ types of status messages are printed. This tool might be useful during implementation of a MAP layer. for more info check out the dssBase.hh in the source directory. * "INTERFACE", enables space-saving gcc pragma directives (for instance during debug compilation) - * "EXCEPTION, allows for throwing exceptions from the interface to the MAP. * "WIN32", Signal that we're in the windows environment and should use such headers --- mozart-1.4.0.orig/platform/dss/config.guess +++ mozart-1.4.0/platform/dss/config.guess @@ -1,296 +1,1545 @@ #! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +# Free Software Foundation, Inc. + +timestamp='2008-01-23' + +# This file 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., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # -# Print the host system CPU-VENDOR-OS. configfsf.guess is run and its -# guess then sharpened up to take advantage of the finer grained CPU +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. # +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. -# Expect to find configfsf.guess in the same directory as this config.guess -configfsf_guess="`echo \"$0\" | sed 's/config.guess$/configfsf.guess/'`" -if test "$configfsf_guess" = "$0"; then - echo "Cannot derive configfsf.guess from $0" 1>&2 - exit 1 -fi -if test -f "$configfsf_guess"; then - : -else - echo "$configfsf_guess not found" 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] -# Always run configfsf.guess with $SHELL, like autoconf does for config.guess -SHELL=${CONFIG_SHELL-/bin/sh} +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done -# Identify ourselves on --version, --help or errors if test $# != 0; then - $SHELL $configfsf_guess "$@" + echo "$me: too many arguments$help" >&2 exit 1 fi +trap 'exit 1' 1 2 15 -guess_full=`$SHELL $configfsf_guess` -if test $? != 0; then - exit 1 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH fi -guess_cpu=`echo "$guess_full" | sed 's/-.*$//'` -guess_rest=`echo "$guess_full" | sed 's/^[^-]*//'` -exact_cpu= +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +if [ "${UNAME_SYSTEM}" = "Linux" ] ; then + eval $set_cc_for_build + cat << EOF > $dummy.c + #include + #ifdef __UCLIBC__ + # ifdef __UCLIBC_CONFIG_VERSION__ + LIBC=uclibc __UCLIBC_CONFIG_VERSION__ + # else + LIBC=uclibc + # endif + #else + LIBC=gnu + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'` +fi +# Note: order is significant - the case branches are not exclusive. -# ------------------------------------------------------------------------- -# The following should look at the current guess and probe the system to -# establish a better guess in exact_cpu. Leave exact_cpu empty if probes -# can't be done, or don't work. -# -# When a number of probes are done, test -z "$exact_cpu" can be used instead -# of putting each probe under an "else" of the preceeding. That can stop -# the code getting horribly nested and marching off the right side of the -# screen. +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-${LIBC} + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-${LIBC} + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld" + exit ;; + esac + # This should get integrated into the C code below, but now we hack + if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; +esac +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy ${dummy}1.s ${dummy}2.c ; exit 1' 1 2 15 - -# Use $HOST_CC if defined. $CC may point to a cross-compiler -if test x"$CC_FOR_BUILD" = x; then - if test x"$HOST_CC" != x; then - CC_FOR_BUILD="$HOST_CC" +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); else - if test x"$CC" != x; then - CC_FOR_BUILD="$CC" - else - echo 'dummy(){}' >$dummy.c - for c in cc c89 gcc; do - ($c $dummy.c -c) >/dev/null 2>&1 - if test $? = 0; then - CC_FOR_BUILD="$c"; break - fi - done - rm -f $dummy.c $dummy.o - if test x"$CC_FOR_BUILD" = x; then - CC_FOR_BUILD=no_compiler_found - fi - fi - fi -fi + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif +#if defined (_SEQUENT_) + struct utsname un; -case "$guess_full" in + uname(&un); -sparc-*-* | sparc64-*-*) - # If we can recognise an actual v7 then $exact_cpu is set to "sparc" so as - # to short-circuit subsequent tests. - - # Grep the linux kernel /proc/cpuinfo pseudo-file. - # A typical line is "cpu\t\t: TI UltraSparc II (BlackBird)" - # See arch/sparc/kernel/cpu.c and arch/sparc64/kernel/cpu.c. - # - if test -f /proc/cpuinfo; then - if grep 'cpu.*Cypress' /proc/cpuinfo >/dev/null; then - exact_cpu="sparc" # ie. v7 - elif grep 'cpu.*Power-UP' /proc/cpuinfo >/dev/null; then - exact_cpu="sparc" # ie. v7 - elif grep 'cpu.*HyperSparc' /proc/cpuinfo >/dev/null; then - exact_cpu="sparcv8" - elif grep 'cpu.*SuperSparc' /proc/cpuinfo >/dev/null; then - exact_cpu="supersparc" - elif grep 'cpu.*MicroSparc' /proc/cpuinfo >/dev/null; then - exact_cpu="microsparc" - elif grep 'cpu.*MB86904' /proc/cpuinfo >/dev/null; then - # actually MicroSPARC-II - exact_cpu=microsparc - elif grep 'cpu.*UltraSparc III' /proc/cpuinfo >/dev/null; then - exact_cpu="ultrasparc3" - elif grep 'cpu.*UltraSparc IIi' /proc/cpuinfo >/dev/null; then - exact_cpu="ultrasparc2i" - elif grep 'cpu.*UltraSparc II' /proc/cpuinfo >/dev/null; then - exact_cpu="ultrasparc2" - elif grep 'cpu.*UltraSparc' /proc/cpuinfo >/dev/null; then - exact_cpu="ultrasparc" - fi - fi - - # Grep the output from sysinfo on SunOS. - # sysinfo has been seen living in /bin or in /usr/kvm - # cpu0 is a "SuperSPARC Model 41 SPARCmodule" CPU - # cpu0 is a "75 MHz TI,TMS390Z55" CPU - # - if test -z "$exact_cpu"; then - for i in sysinfo /usr/kvm/sysinfo; do - if $SHELL -c $i 2>/dev/null >conftest.dat; then - if grep 'cpu0 is a "SuperSPARC' conftest.dat >/dev/null; then - exact_cpu=supersparc - break - elif grep 'cpu0 is a .*TMS390Z55' conftest.dat >/dev/null; then - # TMS390Z55 is a supersparc - exact_cpu=supersparc - break - fi - fi - done - rm -f conftest.dat - fi - - # Grep the output from prtconf on Solaris. - # Use an explicit /usr/sbin, since that directory might not be in a normal - # user's path. - # - # SUNW,UltraSPARC (driver not attached) - # SUNW,UltraSPARC-II (driver not attached) - # SUNW,UltraSPARC-IIi (driver not attached) - # SUNW,UltraSPARC-III+ (driver not attached) - # Ross,RT625 (driver not attached) - # TI,TMS390Z50 (driver not attached) - # - # /usr/sbin/sysdef prints similar information, but includes all loadable - # cpu modules, not just the real cpu. - # - if test -z "$exact_cpu"; then - if $SHELL -c /usr/sbin/prtconf 2>/dev/null >conftest.dat; then - if grep 'SUNW,UltraSPARC-III' conftest.dat >/dev/null; then - exact_cpu=ultrasparc3 - elif grep 'SUNW,UltraSPARC-IIi' conftest.dat >/dev/null; then - exact_cpu=ultrasparc2i - elif grep 'SUNW,UltraSPARC-II' conftest.dat >/dev/null; then - exact_cpu=ultrasparc2 - elif grep 'SUNW,UltraSPARC' conftest.dat >/dev/null; then - exact_cpu=ultrasparc - elif grep 'Ross,RT62.' conftest.dat >/dev/null; then - # RT620, RT625, RT626 hypersparcs (v8). - exact_cpu=sparcv8 - elif grep 'TI,TMS390Z5.' conftest.dat >/dev/null; then - # TMS390Z50 and TMS390Z55 - exact_cpu=supersparc - elif grep 'TI,TMS390S10' conftest.dat >/dev/null; then - exact_cpu=microsparc - elif grep 'FMI,MB86904' conftest.dat >/dev/null; then - # actually MicroSPARC-II - exact_cpu=microsparc - fi - fi - rm -f conftest.dat - fi - - # sun4m and sun4d are v8s of some sort, sun4u is a v9 of some sort - # - if test -z "$exact_cpu"; then - case `uname -m` in - sun4[md]) exact_cpu=sparcv8 ;; - sun4u) exact_cpu=sparcv9 ;; - esac - fi - ;; - -i?86-*-*) - cat <${dummy}1.s - .globl cpuid - .globl _cpuid -cpuid: -_cpuid: - pushl %esi - pushl %ebx - movl 16(%esp),%eax - .byte 0x0f - .byte 0xa2 - movl 12(%esp),%esi - movl %ebx,(%esi) - movl %edx,4(%esi) - movl %ecx,8(%esi) - popl %ebx - popl %esi - ret -EOF - cat <${dummy}2.c -main () -{ - char vendor_string[13]; - char dummy_string[12]; - long fms; - int family, model; - char *modelstr; - - cpuid (vendor_string, 0); - vendor_string[12] = 0; - - fms = cpuid (dummy_string, 1); - - family = (fms >> 8) & 15; - model = (fms >> 4) & 15; - - modelstr = "i486"; - if (strcmp (vendor_string, "GenuineIntel") == 0) - { - switch (family) - { - case 5: - if (model <= 2) modelstr = "pentium"; - else if (model >= 4) modelstr = "pentiummmx"; - break; - case 6: - if (model == 1) modelstr = "pentiumpro"; - else if (model <= 6) modelstr = "pentium2"; - else modelstr = "pentium3"; - break; - case 15: - modelstr = "pentium4"; - break; - } - } - else if (strcmp (vendor_string, "AuthenticAMD") == 0) - { - switch (family) - { - case 5: - if (model <= 3) modelstr = "k5"; - else if (model <= 7) modelstr = "k6"; - else if (model <= 8) modelstr = "k62"; - else if (model <= 9) modelstr = "k63"; - break; - case 6: - modelstr = "athlon"; - break; - } + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); } - else if (strcmp (vendor_string, "CyrixInstead") == 0) - { - /* Should recognize Cyrix' processors too. */ + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif - printf ("%s\n", modelstr); - return 0; + exit (1); } EOF - if ($CC_FOR_BUILD ${dummy}1.s ${dummy}2.c -o $dummy) >/dev/null 2>&1; then - # suppress SIGILL message on 80386 - x=`$SHELL -c ./$dummy 2>/dev/null` - if test -n "$x"; then - exact_cpu=$x - fi - fi - - # We need to remove some .o files here since lame C compilers - # generate these even when not asked. - rm -f ${dummy}1.s ${dummy}1.o ${dummy}2.c ${dummy}2.o $dummy - ;; - -esac +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } -# ------------------------------------------------------------------------- -# Use an exact cpu, if possible +# Convex versions that predate uname can use getsysinfo(1) -if test -n "$exact_cpu"; then - echo "$exact_cpu$guess_rest" -else - echo "$guess_full" +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac fi -exit 0 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF +exit 1 # Local variables: -# fill-column: 76 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" # End: --- mozart-1.4.0.orig/platform/dss/configure +++ mozart-1.4.0/platform/dss/configure @@ -681,7 +681,6 @@ RANLIB subdirs WARNINGS -EXCEPTS ENVTYPE ENV COPY_HEADERS @@ -1281,7 +1280,6 @@ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-opt) ---enable-exceptions) --enable-warnings) --enable-profiling) --enable-build) @@ -5607,7 +5605,7 @@ WARNINGS="-Wall -Wold-style-cast -Woverloaded-virtual -Wshadow" -CXX_BASE="-funsigned-char \$(INCS) \$(EXCEPTS) \$(WARNINGS)" +CXX_BASE="-funsigned-char \$(INCS) \$(WARNINGS)" { echo "$as_me:$LINENO: result: " >&5 echo "${ECHO_T}" >&6; } @@ -5628,38 +5626,20 @@ fi case "$enable_opt" in - debug) + dbg | debug) { echo "$as_me:$LINENO: result: compile to debug mode" >&5 echo "${ECHO_T}compile to debug mode" >&6; } - CXXFLAGS="-fno-inline -fno-default-inline -fno-inline-functions -DDEBUG_CHECK -DDSS_LOG -DINTERFACE -g3 -ggdb $CXX_BASE" - WARNINGS="-pedantic-errors" + CXXFLAGS="-O3 -fomit-frame-pointer -fno-inline -fno-default-inline -fno-inline-functions -DDEBUG_CHECK -DDSS_LOG -DINTERFACE -g3 -ggdb $CXX_BASE" + WARNINGS="-pedantic-errors $WARNINGS" ;; *) { echo "$as_me:$LINENO: result: compile optimized mode" >&5 echo "${ECHO_T}compile optimized mode" >&6; } CXXFLAGS="-O3 -fomit-frame-pointer $CXX_BASE" - WARNINGS="-Weffc++ $WARNINGS" + WARNINGS="$WARNINGS" ;; esac -{ echo "$as_me:$LINENO: checking exception handling..." >&5 -echo $ECHO_N "checking exception handling...... $ECHO_C" >&6; } -# Check whether --enable-exceptions was given. -if test "${enable_exceptions+set}" = set; then - enableval=$enable_exceptions; -fi - -if test "$enable_exceptions" = yes -a "$enable_opt" != d; then - EXCEPTS="$EXCEPTS -fexceptions" - CXXFLAGS="-DEXCEPTIONS $CXXFLAGS" - { echo "$as_me:$LINENO: result: using exceptions" >&5 -echo "${ECHO_T}using exceptions" >&6; } -else - EXCEPTS="$EXCEPTS -fno-exceptions" - { echo "$as_me:$LINENO: result: no exceptions" >&5 -echo "${ECHO_T}no exceptions" >&6; } -fi - { echo "$as_me:$LINENO: checking warning configuration" >&5 echo $ECHO_N "checking warning configuration... $ECHO_C" >&6; } # Check whether --enable-exceptions was given. @@ -5674,12 +5654,12 @@ else { echo "$as_me:$LINENO: result: using extensive warnings" >&5 echo "${ECHO_T}using extensive warnings" >&6; } - if test "$VERSION" = 3; then + if test "$VERSION" = 3 -o "$VERSION" = ABOVE3 ; then WARNINGS="$WARNINGS -Wswitch -Wreturn-type -Wunused" fi if test "$enable_opt" != d; then - WARNINGS="-Winline $WARNINGS" - if test "$VERSION" = 3; then + WARNINGS="$WARNINGS" + if test "$VERSION" = 3 -o "$VERSION" = ABOVE3 ; then WARNINGS="-Wdisabled-optimization -Wuninitialized $WARNINGS" fi fi @@ -5743,6 +5723,7 @@ { echo "$as_me:$LINENO: result: dynamic linking" >&5 echo "${ECHO_T}dynamic linking" >&6; } ENVTYPE="lib$ENV.so" + CXXFLAGS="$CXXFLAGS -fPIC" fi { echo "$as_me:$LINENO: checking inclusion of examples" >&5 @@ -5836,7 +5817,12 @@ echo "${ECHO_T}$host_cpu architecture" >&6; } CPU_FLAGS="-mtune=$host_cpu -DBIG_ENDIAN_HOST" ;; - *) + *-i*86|i*86-darwin) + if test "$enable_opt" = native; then + { echo "$as_me:$LINENO: result: native architecture" >&5 +echo "${ECHO_T}native architecture" >&6; } + CPU_FLAGS="-march=native" + else { echo "$as_me:$LINENO: result: $host_cpu architecture" >&5 echo "${ECHO_T}$host_cpu architecture" >&6; } if test "$VERSION" = ABOVE3; then @@ -5844,6 +5830,9 @@ else CPU_FLAGS="-march=$host_cpu -mcpu=$host_cpu" fi + fi + ;; + *) ;; esac CXXFLAGS="$CPU_FLAGS $CXXFLAGS" @@ -5867,7 +5856,6 @@ - ac_config_files="$ac_config_files Makefile Makefile.vars" cat >confcache <<\_ACEOF @@ -6566,7 +6554,6 @@ RANLIB!$RANLIB$ac_delim subdirs!$subdirs$ac_delim WARNINGS!$WARNINGS$ac_delim -EXCEPTS!$EXCEPTS$ac_delim ENVTYPE!$ENVTYPE$ac_delim ENV!$ENV$ac_delim COPY_HEADERS!$COPY_HEADERS$ac_delim @@ -6579,7 +6566,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- mozart-1.4.0.orig/platform/dss/Makefile.vars.in +++ mozart-1.4.0/platform/dss/Makefile.vars.in @@ -1,7 +1,6 @@ # Sets specific vars like AR, CXX, RANLIB and... WARNINGS= @WARNINGS@ -EXCEPTS = @EXCEPTS@ AR = @AR@ RANLIB = @RANLIB@ @@ -9,7 +8,8 @@ CXXFLAGS= @CXXFLAGS@ DEPEND = $(CXX) -MM $(CXXFLAGS) -INSTDIR = @prefix@ +PREFIX = @prefix@ +INSTDIR = ${PREFIX} INSTALL = @INSTALL@ ROOTDIR = @abs_srcdir@ --- mozart-1.4.0.orig/platform/dss/configure.ac +++ mozart-1.4.0/platform/dss/configure.ac @@ -86,7 +86,7 @@ dnl Basis for warnings and CXXGLAGS WARNINGS="-Wall -Wold-style-cast -Woverloaded-virtual -Wshadow" -CXX_BASE="-funsigned-char \$(INCS) \$(EXCEPTS) \$(WARNINGS)" +CXX_BASE="-funsigned-char \$(INCS) \$(WARNINGS)" AC_MSG_RESULT() AC_MSG_RESULT(*************** CHECKING OPTIONS ****************) @@ -97,29 +97,18 @@ AC_MSG_CHECKING(compiler alternative.) AC_ARG_ENABLE(opt, [--enable-opt)],,) case "$enable_opt" in - debug) + dbg | debug) AC_MSG_RESULT(compile to debug mode) - CXXFLAGS="-fno-inline -fno-default-inline -fno-inline-functions -DDEBUG_CHECK -DDSS_LOG -DINTERFACE -g3 -ggdb $CXX_BASE" - WARNINGS="-pedantic-errors" + CXXFLAGS="-O3 -fomit-frame-pointer -fno-inline -fno-default-inline -fno-inline-functions -DDEBUG_CHECK -DDSS_LOG -DINTERFACE -g3 -ggdb $CXX_BASE" + WARNINGS="-pedantic-errors $WARNINGS" ;; *) AC_MSG_RESULT(compile optimized mode) CXXFLAGS="-O3 -fomit-frame-pointer $CXX_BASE" - WARNINGS="-Weffc++ $WARNINGS" + WARNINGS="$WARNINGS" ;; esac -AC_MSG_CHECKING(exception handling...) -AC_ARG_ENABLE(exceptions, [--enable-exceptions)],,) -if test "$enable_exceptions" = yes -a "$enable_opt" != d; then - EXCEPTS="$EXCEPTS -fexceptions" - CXXFLAGS="-DEXCEPTIONS $CXXFLAGS" - AC_MSG_RESULT(using exceptions) -else - EXCEPTS="$EXCEPTS -fno-exceptions" - AC_MSG_RESULT(no exceptions) -fi - AC_MSG_CHECKING(warning configuration) AC_ARG_ENABLE(exceptions, [--enable-warnings)],,) if test "$enable_warnings" = no; then @@ -127,12 +116,12 @@ WARNINGS="-Wall" else AC_MSG_RESULT(using extensive warnings) - if test "$VERSION" = 3; then + if test "$VERSION" = 3 -o "$VERSION" = ABOVE3 ; then WARNINGS="$WARNINGS -Wswitch -Wreturn-type -Wunused" fi if test "$enable_opt" != d; then - WARNINGS="-Winline $WARNINGS" - if test "$VERSION" = 3; then + WARNINGS="$WARNINGS" + if test "$VERSION" = 3 -o "$VERSION" = ABOVE3 ; then WARNINGS="-Wdisabled-optimization -Wuninitialized $WARNINGS" fi fi @@ -175,6 +164,7 @@ else AC_MSG_RESULT(dynamic linking) ENVTYPE="lib$ENV.so" + CXXFLAGS="$CXXFLAGS -fPIC" fi AC_MSG_CHECKING(inclusion of examples) @@ -239,13 +229,20 @@ AC_MSG_RESULT($host_cpu architecture) CPU_FLAGS="-mtune=$host_cpu -DBIG_ENDIAN_HOST" ;; - *) + *-i*86|i*86-darwin) + if test "$enable_opt" = native; then + AC_MSG_RESULT(native architecture) + CPU_FLAGS="-march=native" + else AC_MSG_RESULT($host_cpu architecture) if test "$VERSION" = ABOVE3; then CPU_FLAGS="-march=$host_cpu -mtune=$host_cpu" else CPU_FLAGS="-march=$host_cpu -mcpu=$host_cpu" fi + fi + ;; + *) ;; esac CXXFLAGS="$CPU_FLAGS $CXXFLAGS" @@ -260,7 +257,6 @@ dnl subst all variables!! AC_SUBST(WARNINGS) -AC_SUBST(EXCEPTS) AC_SUBST(ENVTYPE) AC_SUBST(ENV) AC_SUBST(COPY_HEADERS) --- mozart-1.4.0.orig/platform/dss/Makefile.in +++ mozart-1.4.0/platform/dss/Makefile.in @@ -11,26 +11,24 @@ SRCBSE = base.cc SRCMSL = msl_timers.cc mslBase.cc \ - msl_buffer.cc msl_serialize.cc msl_prioQueues.cc \ + msl_buffer.cc msl_prioQueues.cc \ msl_crypto.cc msl_dct.cc msgnLayer.cc \ msl_msgContainer.cc msl_dsite.cc msl_comObj.cc \ msl_transObj.cc msl_tcpTransObj.cc \ msl_endRouter.cc msl_interRouter.cc SRCDSS = dssBase.cc dss_interface.cc dss_msgLayerInterface.cc \ - dss_largeMessages.cc dss_global_name.cc protocols.cc \ + protocols.cc \ coordinator.cc referenceConsistency.cc \ abstractEntityImplementations.cc dss_threads.cc \ protocol_once_only.cc protocol_migratory.cc \ - protocol_simple_channel.cc protocol_eagerinvalid.cc \ + protocol_simple_channel.cc protocol_invalid.cc \ protocol_pilgrim.cc protocol_transient_remote.cc \ protocol_immediate.cc dss_netId.cc protocol_immutable_lazy.cc \ protocol_immutable_eager.cc protocol_sited.cc \ coordinator_stationary.cc coordinator_fwdchain.cc \ - coordinator_mobile.cc dgc.cc dgc_rc.cc dgc_rl2.cc dgc_fwrc.cc \ - dgc_irc.cc dgc_rl1.cc dgc_tl.cc dss_rl_siteHandler.cc \ - DKSNode.cc dss_psDKS.cc dss_dksInstance.cc dss_dssDks.cc \ - protocol_dksBroadcast.cc dss_dksBackbone.cc + dgc.cc dgc_rl2.cc dgc_fwrc.cc \ + dgc_rl1.cc dgc_tl.cc dgc_rl_siteHandler.cc REALSRC = $(SRCMSL:%=$(SRCDIR)/%) $(SRCDSS:%=$(SRCDIR)/%) @@ -64,11 +62,11 @@ -rm -f Makefile config.* install: all - mkdir -p @prefix@ - mkdir -p @prefix@/include - mkdir -p @prefix@/lib - @INSTALL@ @ENVTYPE@ @prefix@/lib; @EXAMPLES@ - @COPY_HEADERS@ + mkdir -p $(PREFIX) + mkdir -p $(PREFIX)/include + mkdir -p $(PREFIX)/lib + @INSTALL@ @ENVTYPE@ $(PREFIX)/lib; @EXAMPLES@ + @INSTALL@ @srcdir@/include/*.hh $(PREFIX)/include/ depend:: $(REALSRC) $(DEPEND) $^ > Makefile.deps --- mozart-1.4.0.orig/platform/dss/src/dssBase.cc +++ mozart-1.4.0/platform/dss/src/dssBase.cc @@ -68,17 +68,14 @@ DSS_Environment::DSS_Environment(const DSS_Environment& de): a_map( NULL), - a_dksInstHT( NULL), a_proxyTable( NULL), a_coordinatorTable( NULL), a_threadTable( NULL), - a_nameTable( NULL),// ....... a_myDSite( NULL), a_dssconf( DssConfigData()), a_dssMslClbk( NULL), a_msgnLayer( NULL), - a_dksBackbone( NULL), a_CreateXistRefCounter( 0), a_CreateNonXRefCounter( 0), a_DuplicateXistRefCounter( 0), --- mozart-1.4.0.orig/platform/dss/src/bucketHashTable.hh +++ mozart-1.4.0/platform/dss/src/bucketHashTable.hh @@ -99,7 +99,7 @@ } public: - BucketHashTable(unsigned int sz) : count(0), minsize(sz) { init(sz); } + BucketHashTable(unsigned int sz) : minsize(sz), count(0) { init(sz); } ~BucketHashTable() { clear(); delete [] table; } unsigned int getSize() const { return size; } --- mozart-1.4.0.orig/platform/dss/src/dssBase.hh +++ mozart-1.4.0/platform/dss/src/dssBase.hh @@ -92,12 +92,9 @@ class CoordinatorTable; class GlobalThreadTable; class GlobalThread; - class GlobalNameTable; class DssMslClbk; - class DksBackbone; class DSS_Environment; - class DksInstanceHT; class MD5; class DssSimpleWriteDct; @@ -117,8 +114,6 @@ // - DEBUG_CHECK, enables asserts // - INTERFACE, enables pragma directives // - DSS_LOG, enables the logging utility. - // - EXCEPTIONS, enables throwing of exceptions (isn't used that often for now) - // from interfaces to the MAP. // - WIN32 chooses between windows environment and unix environment (header files) @@ -217,19 +212,15 @@ // *********************** GLOBAL VARIABLES ************************ Mediation_Object* const a_map; - DksInstanceHT* a_dksInstHT; ProxyTable* a_proxyTable; CoordinatorTable* a_coordinatorTable; GlobalThreadTable* a_threadTable; - GlobalNameTable* a_nameTable; DSite* a_myDSite; DssConfigData a_dssconf; DssMslClbk* a_dssMslClbk; MsgnLayer* a_msgnLayer; - DksBackbone* a_dksBackbone; - // For evaluation of how many operations done per site. // This is good to know when optimizing reference handling and // configurating of dgc algs. @@ -275,14 +266,7 @@ ParamRetVal m_operateIntParam(const DSS_AREA& area, const DSS_AREA_ID& id, const int& param, int& arg); ParamRetVal m_operateStrParam(const DSS_AREA& area, const DSS_AREA_ID& id, const int& param, const char* const str); - - KbrInstance* m_createKbr(int K, int Bits, int Fail, KbrCallbackInterface* inf); - bool m_unmarshalKbr(DssReadBuffer* buf, KbrInstance* &inst); - - void m_setupBackbone(DssWriteBuffer* buf); - void m_joinBackbone(DssReadBuffer *buf); }; - } // End namespace --- mozart-1.4.0.orig/platform/dss/src/mslBase.cc +++ mozart-1.4.0/platform/dss/src/mslBase.cc @@ -26,6 +26,8 @@ #if defined(INTERFACE) #pragma implementation "mslBase.hh" +#endif +#if defined(DSS_INTERFACE) #pragma implementation "dss_comService.hh" #endif --- mozart-1.4.0.orig/platform/dss/src/dss_threads.hh +++ mozart-1.4.0/platform/dss/src/dss_threads.hh @@ -58,14 +58,14 @@ GlobalThread(GlobalThreadTable* const ext); ~GlobalThread() { DebugCode(a_allocated--); } - WakeRetVal resumeDoLocal(DssOperationId* id){ - return getThreadMediator()->resumeDoLocal(id); + void resumeDoLocal(){ + getThreadMediator()->resumeDoLocal(); } - WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin){ - return getThreadMediator()->resumeRemoteDone(pstin); + void resumeRemoteDone(PstInContainerInterface* pstin){ + getThreadMediator()->resumeRemoteDone(pstin); } - WakeRetVal resumeFailed() { - return getThreadMediator()->resumeFailed(); + void resumeFailed() { + getThreadMediator()->resumeFailed(); } virtual void dispose(); void m_makeGCpreps(); --- mozart-1.4.0.orig/platform/dss/src/msl_tcpTransObj.hh +++ mozart-1.4.0/platform/dss/src/msl_tcpTransObj.hh @@ -55,7 +55,7 @@ TCPTransObj(MsgnLayerEnv* env); virtual ~TCPTransObj(); - virtual DssChannel* m_closeConnection(); + virtual void m_closeConnection(); virtual void deliver(); virtual void readyToReceive(); --- mozart-1.4.0.orig/platform/dss/src/protocol_pilgrim.cc +++ mozart-1.4.0/platform/dss/src/protocol_pilgrim.cc @@ -156,7 +156,7 @@ } // initiate a color change, in order to diagnose a possible failure a_color++; - sendToProxy(a_ring.current(), PLGM_COLOR_START, (int) a_color); + sendToProxy(a_ring.current(), PLGM_COLOR_START, static_cast(a_color)); } @@ -216,7 +216,7 @@ } case PLGM_COLOR_START: { a_color++; - sendToProxy(a_ring.current(), PLGM_COLOR_START, (int) a_color); + sendToProxy(a_ring.current(), PLGM_COLOR_START, static_cast(a_color)); break; } case PLGM_COLOR_DONE: { @@ -224,7 +224,7 @@ if (a_color == col) { // send a_color to all registered proxies out of the ring for (Position p(a_proxies); p(); p++) - if (!a_ring.find(*p)) sendToProxy(*p, PLGM_COLOR_DONE, (int) a_color); + if (!a_ring.find(*p)) sendToProxy(*p, PLGM_COLOR_DONE, static_cast(a_color)); } break; } @@ -318,7 +318,7 @@ Assert(hasToken() && a_jobsLeft == 0); if (a_successor && !m_isAlone()) { sendToProxy(a_successor, PLGM_TOKEN, - a_proxy->deinstallEntityState(), (int) a_color); + a_proxy->deinstallEntityState(), static_cast(a_color)); hasToken(false); } } @@ -333,7 +333,7 @@ ProtocolPilgrimProxy::m_forwardColor() { isColoring(true); if (a_successor) { - sendToProxy(a_successor, PLGM_COLOR, (int) a_color); + sendToProxy(a_successor, PLGM_COLOR, static_cast(a_color)); isColoring(false); } } @@ -341,9 +341,8 @@ void ProtocolPilgrimProxy::m_resumeOperations(){ while (!a_susps.isEmpty()) { - if (a_susps.pop()->resumeDoLocal(NULL) == WRV_CONTINUING) a_jobsLeft++; + a_susps.pop()->resumeDoLocal(); } - // a_jobsLeft is decremented when operations actually resume } void @@ -427,7 +426,7 @@ PilgrimColor col = msg->popIntVal(); if (a_color == col) { // the coloring started here if (a_color.isDark() || col.isDark()) { // token was met - sendToManager(PLGM_COLOR_DONE, (int) col); + sendToManager(PLGM_COLOR_DONE, static_cast(col)); } else { // token has not been met, and is therefore lost sendToManager(PROT_PERMFAIL); m_lostToken(); @@ -453,14 +452,6 @@ } } - - void - ProtocolPilgrimProxy::localInitatedOperationCompleted() { - Assert(hasToken() && a_jobsLeft > 0); - a_jobsLeft--; - if (a_jobsLeft == 0) m_forwardToken(); - } - // interpret site failures FaultState ProtocolPilgrimProxy::siteStateChanged(DSite* s, const FaultState& state) { --- mozart-1.4.0.orig/platform/dss/src/dss_netId.cc +++ mozart-1.4.0/platform/dss/src/dss_netId.cc @@ -30,7 +30,6 @@ #include "dss_netId.hh" #include "dss_comService.hh" -#include "msl_serialize.hh" #include "dssBase.hh" namespace _dss_internal{ //Start namespace --- mozart-1.4.0.orig/platform/dss/src/msl_prioQueues.hh +++ mozart-1.4.0/platform/dss/src/msl_prioQueues.hh @@ -29,7 +29,7 @@ #pragma interface #endif -//#include "dssBase.hh" +#include "base.hh" #include //NULL namespace _msl_internal{ //Start namespace @@ -46,11 +46,6 @@ class PrioQueues { private: - // *********** Only internal *********** - static const int Q_PRIO_VAL_4; - static const int Q_PRIO_VAL_3; - static const int Q_PRIO_VAL_2; - Timers* const e_timers; Queue qs[5]; Queue unackedMsgs; // Sorted list of unacked msgCs @@ -62,11 +57,15 @@ int prio_val_3; int prio_val_2; +#ifdef DEBUG_CHECK int noMsgs; - +#endif + PrioQueues(const PrioQueues&):e_timers(NULL), unackedMsgs(Queue()), recList(NULL), - curq(NULL), prio_val_4(0), prio_val_3(0), prio_val_2(0), - noMsgs(0){} + curq(NULL), prio_val_4(0), prio_val_3(0), prio_val_2(0) + { + DebugCode(noMsgs=0); + } PrioQueues& operator=(const PrioQueues&){ return *this; }; public: PrioQueues(Timers* tim); @@ -89,9 +88,8 @@ // ---------------------------- bool hasNeed(); bool hasQueued(); - int getQueueStatus(); - void clear5(); // Clears prio 5 (+ recList no Unmarshalcont) + void clear5(); // Clears prio 5 (+ !?not done!? recList no Unmarshalcont) MsgCnt* clearAll(); void gcMsgCs(); }; --- mozart-1.4.0.orig/platform/dss/src/abstractEntityImplementations.hh +++ mozart-1.4.0/platform/dss/src/abstractEntityImplementations.hh @@ -50,32 +50,18 @@ // more direct (no more mediators). enum AbsOp{ - AO_NO_OP = 0, AO_OO_BIND, - AO_OO_ACCESS, AO_OO_UPDATE, AO_OO_CHANGES, AO_STATE_WRITE, - AO_STATE_READ, - AO_STATE_LOCK, - AO_STATE_UNLOCK, - AO_STATE_EXTRACT, - AO_STATE_INSTALL, - AO_LZ_FETCH, - AO_DC_SEND, - AO_DC_EXTRACT, - AO_DC_INSTALL, - AO_EP_W_EXEC, - AO_EP_W_DONE, - AO_EP_EXTRACT, - AO_EP_INSTALL + AO_STATE_READ }; // apply an abstract operation on a given abstract entity - AOcallback applyAbstractOperation(AbstractEntity* ae, const AbsOp& aop, - DssThreadId* tid, DssOperationId* oid, - PstInContainerInterface* pstin, - PstOutContainerInterface*& pstout); + void applyAbstractOperation(AbstractEntity* ae, const AbsOp& aop, + DssThreadId* tid, + PstInContainerInterface* pstin, + PstOutContainerInterface*& pstout); } #endif --- mozart-1.4.0.orig/platform/dss/src/protocol_immutable_eager.hh +++ mozart-1.4.0/platform/dss/src/protocol_immutable_eager.hh @@ -62,9 +62,6 @@ void m_installState(PstInContainerInterface*); virtual void msgReceived(MsgContainer*,DSite*); - virtual void remoteInitatedOperationCompleted(DssOperationId*, - PstOutContainerInterface*) {} - virtual void localInitatedOperationCompleted() {} virtual FaultState siteStateChanged(DSite*, const FaultState&); }; --- mozart-1.4.0.orig/platform/dss/src/msl_dct.hh +++ mozart-1.4.0/platform/dss/src/msl_dct.hh @@ -36,10 +36,7 @@ namespace _msl_internal{ enum DCT_Types{ - DctT_DAC, - DctT_intList, - DctT_appLayer, - DctT_cscLayer + DctT_DAC }; // ERIK, VALENTIN, ZACHARIAS: To ease development, please comment @@ -65,9 +62,7 @@ // ****************************** BUFFER TRANSPORTING********************************* // // Transports data areas, perfectly suitable to match with the - // simple buffers (and yes I know this is similar to - // DataAreaContainers but these works...) - + // simple buffers class DssSimpleDacDct: public DssCompoundTerm{ private: enum DSDD_Mode{ @@ -78,10 +73,10 @@ BYTE* a_buf; BYTE* a_pos; - u32 a_size; + size_t a_size; DSDD_Mode a_mode; - inline u32 getPosDiff() const { return a_pos - a_buf; } + inline size_t getPosDiff() const { return a_pos - a_buf; } DssSimpleDacDct(const DssSimpleDacDct&): a_buf(NULL),a_pos(NULL),a_size(0),a_mode(DSDD_UNDEF){} @@ -94,13 +89,13 @@ } DssSimpleDacDct(const u32& sz, BYTE* const bf):a_buf(bf),a_pos(bf),a_size(sz),a_mode(DSDD_UNDEF){ - //printf("DssSimpleDacDct(%p)::create %d\n",static_cast(this),sz); gf_printBuf("buffer", a_buf,a_size); + //printf("DssSimpleDacDct(%p)::create %d\n",static_cast(this),sz); } virtual ~DssSimpleDacDct(){ delete [] a_buf; } - u32 getSize() const { return a_size; } + size_t getSize() const { return a_size; } int getData(BYTE*, const int&); void putData(BYTE*, const int&); @@ -116,31 +111,5 @@ virtual DCT_Types getType() const { return DctT_DAC; }; virtual void resetMarshaling(); }; - - - // You want to transport unbounded long lists of - // integers? Use the IntListDct! This class can - // probably be generalized to handle lists of - // any type.. - - class IntListDct: public DssCompoundTerm { - private: - SimpleList *a_list; - Position a_curPos; // used for marshaling - - IntListDct(const IntListDct&):a_list(NULL), a_curPos(){} - IntListDct& operator=(const IntListDct&){ return *this; } - - public: - IntListDct(); - IntListDct(SimpleList*); - virtual bool marshal(DssWriteBuffer *bb,MsgnLayerEnv* env); - virtual bool unmarshal(DssReadBuffer *bb,MsgnLayerEnv* env); - virtual void dispose(); - virtual DCT_Types getType() const { return DctT_intList; } - virtual void resetMarshaling(); - SimpleList *getItems(); - }; - } #endif --- mozart-1.4.0.orig/platform/dss/src/base.cc +++ mozart-1.4.0/platform/dss/src/base.cc @@ -27,6 +27,8 @@ #if defined(INTERFACE) #pragma implementation "base.hh" +#endif +#if defined(DSS_INTERFACE) #pragma implementation "dss_classes.hh" #endif @@ -57,27 +59,6 @@ // // ********************************************************************* - char *gf_bool2string(const bool& b){ - static char buf[6]; - if(b) sprintf(buf,"TRUE"); - else sprintf(buf,"FALSE"); - return buf; - } - - - void gf_printBuf(const char* const format,BYTE* const buf, int len){ - BYTE c[4]; - gf_integer2char(c,0); - printf("%s:%d:",format,len); - for(int i = 0; i< len; ++i){ - c[0] = buf[i]; - printf("%02x",gf_char2integer(c)); - if(((i+1)%10) == 0 && (i > 0)) printf(" :%d: ",i+1); - } - printf("\n"); - } - - void dssError(const char* format, ...){ fprintf(stderr,"DSS_FATAL_ERROR:"); va_list ap; @@ -103,13 +84,14 @@ // We enable the dssLog utility here if flag is set #ifdef DSS_LOG - static char * const s_DLL_names[] ={ + static const char * const s_DLL_names[] ={ "DSS_NOTHING ", "DSS_PRINT_INFO", "DSS_IMPORTANT ", "DSS_BEHAVIOR ", "DSS_DEBUG_INFO", - "DSS_EVERYTHING" + "DSS_MOST", + "DSS_TOO_MUCH" }; void dssLog(DSS_LOG_LEVEL level,const char* const format, ...){ @@ -125,11 +107,6 @@ } } - // ****************** DSS LONGTIME ******************** - // - - - #endif //Constructors added to force the inclussion of the symbols in the library. --- mozart-1.4.0.orig/platform/dss/src/dss_threads.cc +++ mozart-1.4.0/platform/dss/src/dss_threads.cc @@ -30,7 +30,6 @@ #include "dss_threads.hh" #include "dssBase.hh" -#include "msl_serialize.hh" #include "dss_msgLayerInterface.hh" namespace _dss_internal{ //Start namespace --- mozart-1.4.0.orig/platform/dss/src/protocol_simple_channel.hh +++ mozart-1.4.0/platform/dss/src/protocol_simple_channel.hh @@ -65,8 +65,6 @@ virtual OpRetVal operationWrite(PstOutContainerInterface**&); void do_operation(DSite*, GlobalThread*, AbsOp, PstInContainerInterface*); - void remoteInitatedOperationCompleted(DssOperationId*, PstOutContainerInterface*); - void localInitatedOperationCompleted() { Assert(0); } void msgReceived(::MsgContainer*,DSite*); bool m_initRemoteProt(DssReadBuffer*); --- mozart-1.4.0.orig/platform/dss/src/msl_prioQueues.cc +++ mozart-1.4.0/platform/dss/src/msl_prioQueues.cc @@ -90,9 +90,9 @@ // Class methods ///////////////////////////////////////////////////// - const int PrioQueues::Q_PRIO_VAL_4=10; - const int PrioQueues::Q_PRIO_VAL_3=10; - const int PrioQueues::Q_PRIO_VAL_2=100; +#define Q_PRIO_VAL_4 10 +#define Q_PRIO_VAL_3 10 +#define Q_PRIO_VAL_2 100 PrioQueues::PrioQueues(Timers* tim): @@ -102,9 +102,10 @@ curq(NULL), prio_val_4(Q_PRIO_VAL_4), prio_val_3(Q_PRIO_VAL_3), - prio_val_2(Q_PRIO_VAL_2), - noMsgs(0){ - //dssLog(DLL_ALL,"Created PrioQueue"); + prio_val_2(Q_PRIO_VAL_2) + { + DebugCode(noMsgs=0); + //dssLog(DLL_MOST,"Created PrioQueue"); for (int i=0;i<5;i++) qs[i].first=qs[i].last=NULL; unackedMsgs.first=unackedMsgs.last=NULL; @@ -115,7 +116,7 @@ void PrioQueues::enqueue(MsgCnt *msgC, int prio) { Assert(prio >= 0); Assert(prio < 5); - noMsgs++; + DebugCode(noMsgs++); if_enqueue(msgC, qs[prio]); } @@ -161,7 +162,7 @@ } while(!if_isEmpty(qs[4-1]) || !if_isEmpty(qs[3-1]) || !if_isEmpty(qs[2-1])); } Assert(ret!=NULL || hasQueued()==false || !working); - if (ret!=NULL) noMsgs--; + DebugCode(if (ret!=NULL) noMsgs--); return ret; } @@ -170,7 +171,7 @@ } void PrioQueues::requeue(MsgCnt *msgC) { - noMsgs++; + DebugCode(noMsgs++); if_addFirst(msgC,curq); } int PrioQueues::msgAcked(int num,bool resend,bool calcrtt) { @@ -260,16 +261,12 @@ return hasQueued() || unackedMsgs.first!=NULL; } - int PrioQueues::getQueueStatus() { - return noMsgs; - } - void PrioQueues::clear5() { MsgCnt *list=qs[5-1].first; MsgCnt *tmp; qs[5-1].first=qs[5-1].last=NULL; while(list!=NULL) { - noMsgs--; + DebugCode(noMsgs--); tmp=list; list=list->a_next; // Assume for now that prio5 msgs are never in unackedList @@ -288,7 +285,7 @@ for(int i=0;i<4;i++) { msgC=qs[i].first; while(msgC!=NULL) { - noMsgs--; + DebugCode(noMsgs--); tmp = msgC->a_next; msgC->a_next = ans; ans = msgC; --- mozart-1.4.0.orig/platform/dss/src/msl_buffer.cc +++ mozart-1.4.0/platform/dss/src/msl_buffer.cc @@ -93,7 +93,7 @@ /************************* DssReadByteBuffer *************************/ - int DssReadByteBuffer::availableData() const { + size_t DssReadByteBuffer::availableData() const { return getUsed() - outerframe; } @@ -113,7 +113,7 @@ /************************* DssWriteByteBuffer *************************/ - int DssWriteByteBuffer::availableSpace() const { + size_t DssWriteByteBuffer::availableSpace() const { return getFree() - reserved; } @@ -149,7 +149,7 @@ // The only drawback of this method is that plain data must be // copied between the buffer and the decrypted frame. - const int FRAME_SIZE = 512; + const size_t FRAME_SIZE = 512; const int DATA_SIZE = 512 - 2 * SIZE_INT; static BYTE plain[FRAME_SIZE], cipher[FRAME_SIZE]; @@ -207,7 +207,8 @@ // read data length, and check data buffer space len = gf_char2integer(plain); - if (databuffer->getFree() < len) return true; + Assert(len >= 0); + if (databuffer->getFree() < static_cast(len)) return true; // finalize reading, and write data m_commitRead(FRAME_SIZE); --- mozart-1.4.0.orig/platform/dss/src/msl_msgContainer.hh +++ mozart-1.4.0/platform/dss/src/msl_msgContainer.hh @@ -77,7 +77,6 @@ FT_SITE, FT_DCT, FT_ADC, - FT_SDC, FT_MSGC }; @@ -205,7 +204,6 @@ virtual DSite* popDSiteVal(); virtual int popIntVal(); virtual ExtDataContainerInterface* popADC(); - virtual ExtDataContainerInterface* popSDC(); virtual PstInContainerInterface* popPstIn(); virtual MsgContainer* popMsgC(); @@ -214,7 +212,6 @@ virtual void pushDSiteVal(DSite* s); virtual void pushIntVal(int v); virtual void pushADC(ExtDataContainerInterface* v); - virtual void pushSDC(ExtDataContainerInterface* v); virtual void pushPstOut(PstOutContainerInterface*); virtual void pushMsgC(MsgContainer*); --- mozart-1.4.0.orig/platform/dss/src/dgc.cc +++ mozart-1.4.0/platform/dss/src/dgc.cc @@ -46,7 +46,8 @@ char * GCalgorithm::m_stringrep(){ - return "not implemented"; + static char rep[]="not implemented"; //Yves: Much better would be to make all m_stringrep return const char*. + return rep; } --- mozart-1.4.0.orig/platform/dss/src/protocols.hh +++ mozart-1.4.0/platform/dss/src/protocols.hh @@ -168,11 +168,6 @@ //located in dss_access.cc, the only placed accessed from virtual char *m_stringrep(); - // finalize remote callbacks and local resumptions - virtual void remoteInitatedOperationCompleted(DssOperationId*, - PstOutContainerInterface*)=0; - virtual void localInitatedOperationCompleted() = 0; - // basic protocol functionalities int getStatus() const { return a_status >> 2; } void setStatus(int v) { a_status = (v << 2) | (a_status & 3); } --- mozart-1.4.0.orig/platform/dss/src/protocol_transient_remote.cc +++ mozart-1.4.0/platform/dss/src/protocol_transient_remote.cc @@ -194,7 +194,7 @@ void ProtocolTransientRemoteManager::makeGCpreps() { ProtocolManager::makeGCpreps(); // mark all threads in buffered messages - for (Position p(a_requests); p(); p++) (*p).makeGCpreps(); + for (QueuePosition p(a_requests); p(); p++) (*p).makeGCpreps(); } // register a remote proxy at s @@ -203,7 +203,7 @@ // send an update for changes if necessary PstOutContainerInterface *ans; - a_coordinator->m_doe(AO_OO_CHANGES, NULL, NULL, NULL, ans); + a_coordinator->m_doe(AO_OO_CHANGES, NULL, NULL, ans); if (ans != NULL) sendToProxy(s, TR_UPDATE, ans); } @@ -238,7 +238,7 @@ static_cast(pp)->setToken(s == mySite); // forward buffered requests - for (Position p(a_requests); p(); p++) { + for (QueuePosition p(a_requests); p(); p++) { TR_request req = *p; if (req.type == PROT_PERMFAIL) sendToProxy(s, PROT_PERMFAIL); @@ -477,7 +477,7 @@ PstInContainerInterface *arg = gf_popPstIn(msg); GlobalThread* tid = (msg->m_isEmpty() ? NULL : popThreadId(msg)); PstOutContainerInterface* ans = NULL; - a_proxy->m_doe(AO_OO_BIND, tid, NULL, arg, ans); + a_proxy->m_doe(AO_OO_BIND, tid, arg, ans); setStatus(TRANS_STATUS_BOUND); if (a_proxy->m_isHomeProxy()) sendToManager(TR_BOUND); else sendToManager(TR_REDIRECT, a_proxy->retrieveEntityState()); @@ -494,7 +494,7 @@ Assert(msgType != TR_BOUND || a_proxy->m_isHomeProxy()); // the state has been installed, simply wake up suspensions setStatus(TRANS_STATUS_BOUND); - while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(NULL); + while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(); break; } case TR_UPDATE_REQUEST: { @@ -503,7 +503,7 @@ PstInContainerInterface *arg = gf_popPstIn(msg); GlobalThread *tid = (msg->m_isEmpty() ? NULL : popThreadId(msg)); PstOutContainerInterface *ans; - a_proxy->m_doe(AO_OO_UPDATE, tid, NULL, arg, ans); + a_proxy->m_doe(AO_OO_UPDATE, tid, arg, ans); // send TR_UPDATE_REPLY to manager if (tid) sendToManager(TR_UPDATE_REPLY, arg->loopBack2Out(), tid); else sendToManager(TR_UPDATE_REPLY, arg->loopBack2Out()); @@ -513,12 +513,12 @@ // do the update PstInContainerInterface* arg = gf_popPstIn(msg); PstOutContainerInterface* ans; - a_proxy->m_doe(AO_OO_UPDATE, NULL, NULL, arg, ans); + a_proxy->m_doe(AO_OO_UPDATE, NULL, arg, ans); // resume calling thread if present if (!msg->m_isEmpty()) { GlobalThread* tid = popThreadId(msg); a_susps.remove(tid); - tid->resumeDoLocal(NULL); + tid->resumeDoLocal(); } break; } --- mozart-1.4.0.orig/platform/dss/src/msl_dct.cc +++ mozart-1.4.0/platform/dss/src/msl_dct.cc @@ -30,9 +30,6 @@ #pragma implementation "msl_dct.hh" #endif -//#include "DKS_routingTable.hh" -//#include "DKS_dataItem.hh" -#include "msl_serialize.hh" #include "msl_dct.hh" #include "msl_buffer.hh" #include "dss_classes.hh" @@ -45,21 +42,6 @@ switch(type){ case DctT_DAC: return new DssSimpleDacDct(); - // case DctT_dksRoutingTable: - // return new RoutingTableDct(NULL); - // case DctT_dksMessage: - // return new DksMessageDct(e); - case DctT_intList: - return new IntListDct(); - // case DctT_dksSiteVec: - // return new DksSiteVecDct(); - // default: - // Assert(0); - // } - case DctT_appLayer: - return NULL; - case DctT_cscLayer: - return NULL; } return NULL; } @@ -69,24 +51,24 @@ bool DssSimpleDacDct::marshal(DssWriteBuffer *bb, MsgnLayerEnv*){ if(a_mode == DSDD_READ){// loopback - //printf("DssSimpleDacDct(%p)::",static_cast(this)); gf_printBuf("loopback",a_buf,a_size); + //printf("DssSimpleDacDct(%p)::",static_cast(this)); a_pos = a_buf; } a_mode = DSDD_WRITE; if(getPosDiff() == 0){ // haven't started yet if(bb->canWrite(4+1)){ //can marshal len + one byte at least - //printf("DssSimpleDacDct(%p)::",static_cast(this)); gf_printBuf("marshal",a_buf,a_size); + //printf("DssSimpleDacDct(%p)::",static_cast(this)); BYTE a_sizevec[4]; gf_integer2char(a_sizevec,a_size); bb->writeToBuffer(a_sizevec,4); } else return false; // not done } - int len = t_min(bb->availableSpace(), static_cast(a_size)); // how much can and want we to marshal + int len = t_min(bb->availableSpace(), a_size); // how much can and want we to marshal bb->writeToBuffer(a_pos, len); a_pos += len; - //printf("len:%d size:%d done:%s\n",len,a_size, gf_bool2string((getMarshaled() == a_size))); + //printf("len:%d size:%d done:%s\n",len,a_size, (getMarshaled() == a_size)?"TRUE":"FALSE"); return (getPosDiff() == a_size); // check if done } @@ -106,11 +88,11 @@ } else return false; } - int len = t_min(static_cast(bb->availableData()), (a_size - getPosDiff())); + int len = t_min(bb->availableData(), (a_size - getPosDiff())); bb->readFromBuffer(a_pos, len); bb->commitRead(len); a_pos += len; - //printf("DssSimpleDacDct(%p)::",static_cast(this)); gf_printBuf("unmarshal",a_buf,getPosDiff()); + //printf("DssSimpleDacDct(%p)::",static_cast(this)); if(getPosDiff() == a_size){ a_pos = a_buf; // automatically prepare for unmarshalling return true; @@ -132,7 +114,7 @@ int DssSimpleDacDct::getData(BYTE* pos, const int& max){ - //printf("DssSimpleDacDct::"); gf_printBuf("getData",a_buf,a_size); + //printf("DssSimpleDacDct::"); int tlen = t_min(max, static_cast( a_size - getPosDiff())); memcpy(pos, a_pos, tlen); a_pos += tlen; Assert(a_pos <= a_buf + a_size); return tlen; @@ -144,66 +126,5 @@ a_size = sz; a_buf = a_pos = new BYTE[sz]; memcpy(a_pos, pos, sz); } - - - // ******************************************************* - - SimpleList *IntListDct::getItems(){ - SimpleList *it = a_list; - a_list = NULL; - a_curPos = Position(); // reset to an invalid position - return it; - } - - IntListDct::IntListDct() : - a_list(new SimpleList()), a_curPos(a_list) {} - - IntListDct::IntListDct(SimpleList* data) : - a_list(data), a_curPos(data) { - Assert(data); - } - - -#define MIN_DI_SIZE 8 -#define DI_ENTRY 0 -#define DI_END 1 -#define DI_SUSP 2 - - bool IntListDct::marshal(DssWriteBuffer *bb, MsgnLayerEnv* env){ - while (a_curPos() && bb->canWrite(MIN_DI_SIZE+1)) { - gf_Marshal8bitInt(bb, DI_ENTRY); - gf_MarshalNumber(bb, *a_curPos); - a_curPos++; - } - if (a_curPos.isEmpty()) { - gf_Marshal8bitInt(bb,DI_END); return true; - } else { - gf_Marshal8bitInt(bb,DI_SUSP); return false; - } - } - - bool IntListDct::unmarshal(DssReadBuffer *bb,MsgnLayerEnv* env){ - while(true){ - switch(gf_Unmarshal8bitInt(bb)){ - case DI_END: - a_curPos.init(*a_list); // reinit position - return true; - case DI_SUSP: - return false; - case DI_ENTRY: - a_curPos.insert(gf_UnmarshalNumber(bb)); - } - } - } - - void IntListDct::dispose(){ - if (a_list) delete a_list; - delete this; - } - - void IntListDct::resetMarshaling(){ - a_curPos.init(*a_list); - } - } --- mozart-1.4.0.orig/platform/dss/src/protocol_immediate.hh +++ mozart-1.4.0/platform/dss/src/protocol_immediate.hh @@ -47,8 +47,6 @@ public: ProtocolImmediateProxy(); virtual void msgReceived(MsgContainer*,DSite*); - virtual void remoteInitatedOperationCompleted(DssOperationId*, PstOutContainerInterface*); - virtual void localInitatedOperationCompleted(); virtual bool marshal_protocol_info(DssWriteBuffer *buf, DSite *); virtual bool dispose_protocol_info(DssReadBuffer *buf); //töm bufferten --- mozart-1.4.0.orig/platform/dss/src/protocols.cc +++ mozart-1.4.0/platform/dss/src/protocols.cc @@ -31,9 +31,8 @@ #endif #include "protocols.hh" -#include "protocol_dksBroadcast.hh" #include "protocol_migratory.hh" -#include "protocol_eagerinvalid.hh" +#include "protocol_invalid.hh" #include "protocol_once_only.hh" #include "protocol_immediate.hh" #include "protocol_pilgrim.hh" @@ -41,7 +40,6 @@ #include "protocol_simple_channel.hh" #include "protocol_immutable_lazy.hh" #include "protocol_transient_remote.hh" -#include "protocol_lazyinvalid.hh" #include "protocol_sited.hh" namespace _dss_internal{ @@ -211,11 +209,6 @@ pman = new ProtocolImmediateManager(); pprox = new ProtocolImmediateProxy(); break; - case PN_DKSBROADCAST: - pman = new ProtocolDksBcManager(); - pprox = new ProtocolDksBcProxy(); - static_cast(pprox)->m_initHome(env); - break; case PN_SITED: pman = new ProtocolSitedManager(); pprox = new ProtocolSitedProxy(); @@ -240,7 +233,6 @@ case PN_IMMUTABLE_LAZY: return new ProtocolImmutableLazyProxy(); case PN_IMMUTABLE_EAGER: return new ProtocolImmutableEagerProxy(); case PN_IMMEDIATE: return new ProtocolImmediateProxy(); - case PN_DKSBROADCAST: return new ProtocolDksBcProxy(); case PN_SITED: return new ProtocolSitedProxy(); default: Assert(0); return NULL; } --- mozart-1.4.0.orig/platform/dss/src/protocol_once_only.cc +++ mozart-1.4.0/platform/dss/src/protocol_once_only.cc @@ -126,7 +126,7 @@ // send an update for changes if necessary ::PstOutContainerInterface *ans; - a_coordinator->m_doe(AO_OO_CHANGES, NULL, NULL, NULL, ans); + a_coordinator->m_doe(AO_OO_CHANGES, NULL, NULL, ans); if (ans != NULL) sendToProxy(s, OO_UPDATE, ans); } @@ -165,7 +165,7 @@ GlobalThread* tid = (msg->m_isEmpty() ? NULL : popThreadId(msg)); Assert(a_coordinator->m_getProxy() != NULL); PstOutContainerInterface* ans = NULL; - a_coordinator->m_doe(AO_OO_BIND, tid, NULL, arg, ans); + a_coordinator->m_doe(AO_OO_BIND, tid, arg, ans); setStatus(TRANS_STATUS_BOUND); // send OO_REDIRECT to all proxies while (!a_proxies.isEmpty()) sendRedirect(a_proxies.pop()); @@ -293,19 +293,19 @@ // already done by the manager... if (!a_proxy->m_isHomeProxy()) a_proxy->installEntityState(cont); // resume all suspensions (not really clear about the resumeDoLocal) - while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(NULL); + while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(); break; } case OO_UPDATE: { // do the callback in order to update PstInContainerInterface* cont = gf_popPstIn(msg); PstOutContainerInterface* ans; - a_proxy->m_doe(AO_OO_UPDATE, NULL, NULL, cont, ans); + a_proxy->m_doe(AO_OO_UPDATE, NULL, cont, ans); // resume calling thread if this is a confirmation if (!msg->m_isEmpty()) { GlobalThread* tid = popThreadId(msg); a_susps.remove(tid); - tid->resumeDoLocal(NULL); + tid->resumeDoLocal(); } break; } --- mozart-1.4.0.orig/platform/dss/src/msl_msgContainer.cc +++ mozart-1.4.0/platform/dss/src/msl_msgContainer.cc @@ -33,7 +33,6 @@ #include "msl_dsite.hh" #include "msl_buffer.hh" #include "msl_dct.hh" -#include "msl_serialize.hh" // borrowed from dss_msgLayerInterface.hh namespace _dss_internal { @@ -45,17 +44,12 @@ const int INITIAL_SIZE = 8; // initial size of a_fields - namespace{ - const int sz_MAX_DP_STRING = 4; // This is based on what?? - } - enum DataTag{ TYPE_INT, TYPE_SITE, TYPE_END, TYPE_DCT, TYPE_ADC, - TYPE_CDC, TYPE_MSG }; @@ -94,7 +88,6 @@ static_cast(a_fields[i].a_arg)->dispose(); break; case FT_ADC: - case FT_SDC: static_cast(a_fields[i].a_arg)->dispose(); break; case FT_MSGC: @@ -158,13 +151,13 @@ case TYPE_INT: { int i = bb->m_getInt(); m_pushVal(reinterpret_cast(i), FT_NUMBER); - dssLog(DLL_DEBUG, "MSGCONTAINER (%p): deserilize INT %d", this, i); + dssLog(DLL_TOO_MUCH, "MSGCONTAINER (%p): deserilize INT %d", this, i); continue; } case TYPE_SITE: { Site *s = env->a_siteHT->m_unmarshalSite(bb); pushSiteVal(s); - dssLog(DLL_DEBUG, "MSGCONTAINER (%p): deserilize SITE %s", this, + dssLog(DLL_TOO_MUCH, "MSGCONTAINER (%p): deserilize SITE %s", this, s->m_stringrep()); continue; } @@ -173,7 +166,7 @@ // it can choose to not pass information with an abstract // operation, or a result from an abstract operation. case TYPE_DCT: { - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): deserilizing DATA AREA",this); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): deserilizing DATA AREA",this); DssCompoundTerm *dac; checkSize(); @@ -218,28 +211,21 @@ return true; } } - case TYPE_CDC: case TYPE_ADC: { - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): deserilizing DATA AREA",this); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): deserilizing DATA AREA",this); ExtDataContainerInterface *dac; checkSize(); if (checkFlag(MSG_HAS_UNMARSHALCONT) && a_suspf){ - Assert(a_fields[a_nof_fields].a_ft == FT_ADC || - a_fields[a_nof_fields].a_ft == FT_SDC); + Assert(a_fields[a_nof_fields].a_ft == FT_ADC); // continue with current one dac = static_cast(a_fields[a_nof_fields].a_arg); // The marshaler always sets the DCT type. NOT USED bb->m_getByte(); } else { BYTE type = bb->m_getByte(); - if (msg_type == TYPE_ADC) { - dac = env->a_clbck->m_createExtDataContainer(type); - a_fields[a_nof_fields].a_ft = FT_ADC; - } else { - dac = env->a_comService->m_createExtDataContainer(type); - a_fields[a_nof_fields].a_ft = FT_SDC; - } + dac = env->a_clbck->m_createExtDataContainer(type); + a_fields[a_nof_fields].a_ft = FT_ADC; a_fields[a_nof_fields].a_arg = dac; } Assert(dac); @@ -255,7 +241,7 @@ } } case TYPE_END: - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): deserilizing done",this); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): deserilizing done",this); setFlag(MSG_CLEAR); return true; @@ -289,7 +275,7 @@ case FT_NUMBER: if (bb->canWrite(1+sz_MNumberMax)) { int i = reinterpret_cast(m_popVal()); - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): serilize INT %d", this, i); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): serilize INT %d", this, i); bb->m_putByte(TYPE_INT); bb->m_putInt(i); continue; // next field; @@ -299,7 +285,7 @@ Site* s = static_cast(m_nextVal()); if (bb->canWrite(1+s->m_getMarshaledSize())) { (void) m_popVal(); - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): serilize SITE %s", this, + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): serilize SITE %s", this, s->m_stringrep()); bb->m_putByte(TYPE_SITE); s->m_marshalDSite(bb); @@ -309,7 +295,7 @@ case FT_DCT: if (bb->canWrite(1+20)) { - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): serilize DATA_AREA", this); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): serilize DATA_AREA", this); DssCompoundTerm *dac = static_cast(a_fields[a_current].a_arg); bb->m_putByte(TYPE_DCT); @@ -323,7 +309,7 @@ case FT_ADC: if (bb->canWrite(1+20)) { - dssLog(DLL_DEBUG,"MSGCONTAINER (%p): serilize DATA_AREA", this); + dssLog(DLL_TOO_MUCH,"MSGCONTAINER (%p): serilize DATA_AREA", this); ExtDataContainerInterface *dac = static_cast(a_fields[a_current].a_arg); bb->m_putByte(TYPE_ADC); @@ -381,7 +367,6 @@ static_cast(a_fields[i].a_arg)->resetMarshaling(); break; case FT_ADC: - case FT_SDC: static_cast(a_fields[i].a_arg)->resetMarshaling(); break; case FT_MSGC: @@ -416,12 +401,6 @@ return static_cast(m_popVal()); } - ExtDataContainerInterface* - MsgCnt::popSDC(){ - Assert(checkCounters() && m_getFT() == FT_SDC); - return static_cast(m_popVal()); - } - PstInContainerInterface* MsgCnt::popPstIn() { return _dss_internal::gf_popPstIn(this); @@ -451,10 +430,6 @@ m_pushVal(static_cast(v), FT_ADC); } - void MsgCnt::pushSDC(ExtDataContainerInterface* v) { - m_pushVal(static_cast(v), FT_SDC); - } - void MsgCnt::pushPstOut(PstOutContainerInterface* v) { _dss_internal::gf_pushPstOut(this, v); } --- mozart-1.4.0.orig/platform/dss/src/protocol_invalid.hh +++ mozart-1.4.0/platform/dss/src/protocol_invalid.hh @@ -0,0 +1,168 @@ +/* + * Authors: + * Erik Klintskog + * + * Contributors: + * Raphael Collet (raph@info.ucl.ac.be) + * + * Copyright: + * Zacharias El Banna, 2002 + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ + +#ifndef __PROTOCOL_INVALID_HH +#define __PROTOCOL_INVALID_HH + +#ifdef INTERFACE +#pragma interface +#endif + +#include "dssBase.hh" +#include "protocols.hh" +#include "dss_templates.hh" + +namespace _dss_internal{ //Start namespace + + // generic classes for eager and lazy invalidation protocols + + class ProtocolInvalidManager : public ProtocolManager { + private: + // The status tells whether manager uses the lazy protocol. + + SimpleList a_readers; // reader proxies + unsigned int a_valid; // how many proxies not invalid yet + + // a_readers contains all reader proxies (all proxies if eager, + // strict readers if lazy). Those proxies are asked to invalidate + // their state once a write request must be served. a_valid + // proxies among a_readers have not notified invalidation. + + struct Request { // buffered write requests + GlobalThread* caller; PstInContainerInterface* arg; + Request(GlobalThread* t, PstInContainerInterface* a): caller(t), arg(a) {} + void makeGCpreps() { if (caller) caller->m_makeGCpreps(); } + void dispose() { if (arg) arg->dispose(); } + }; + + SimpleQueue a_requests; + + // a_requests contains the pending write operations requested by + // proxies. Those operations are performed by the manager once + // a_valid reaches zero. + + ProtocolInvalidManager(const ProtocolInvalidManager&) {} + ProtocolInvalidManager& operator=(const ProtocolInvalidManager&){ + return *this; } + + public: + ProtocolInvalidManager(DSite *mysite, bool isLazy); + void sendMigrateInfo(::MsgContainer*); + ProtocolInvalidManager(::MsgContainer*); + ~ProtocolInvalidManager(); + + void msgReceived(::MsgContainer*, DSite*); + void makeGCpreps(); + void m_siteStateChange(DSite*, const FaultState&); + + private: + bool m_isLazy() const { return getStatus(); } + void m_register(DSite* s); + void m_invalidate(); + void m_invalid(DSite* s, bool remove = false); + static const bool REMOVE = true; + void m_checkOperations(); + void m_commit(DSite*); + void m_failed(); + void printStatus(); + }; + + + class ProtocolInvalidProxy : public ProtocolProxy{ + private: + // The status of the proxy tells whether it uses the lazy + // protocol, whether the proxy is a reader, and whether the state + // is valid. a_susps contains all pending operations; the first + // a_numRead elements are read operations, the remaining ones are + // write operations. (The suspended writes operations are stored + // in order to keep the suspended thread alive in memory.) + unsigned int a_numRead; + + ProtocolInvalidProxy(const ProtocolInvalidProxy&): + ProtocolProxy(PN_EAGER_INVALID) {} + ProtocolInvalidProxy& operator=(const ProtocolInvalidProxy&){ + return *this; } + + public: + ProtocolInvalidProxy(bool isLazy); + bool m_initRemoteProt(DssReadBuffer*); + ~ProtocolInvalidProxy(); + + virtual OpRetVal operationRead(GlobalThread*, PstOutContainerInterface**&); + virtual OpRetVal operationWrite(GlobalThread*, PstOutContainerInterface**&); + virtual OpRetVal operationWrite(PstOutContainerInterface**&x){return ProtocolProxy::operationWrite(x);}; + + void msgReceived(::MsgContainer*,DSite*); + + virtual FaultState siteStateChanged(DSite*, const FaultState&); + + private: + bool m_isLazy() const { return getStatus() & 1; } + void m_setLazy() { setStatus(getStatus() | 1); } + bool m_isReader() const { return getStatus() & 2; } + void m_setReader(bool b) { setStatus((getStatus() & ~2) | (b ? 2 : 0)); } + bool m_isValid() const { return getStatus() & 4; } + void m_setValid(bool b) { setStatus((getStatus() & ~4) | (b ? 4 : 0)); } + void m_subscribe(); + }; + + + + // manager and proxy for the eager protocol + + class ProtocolEagerInvalidManager : public ProtocolInvalidManager { + public: + ProtocolEagerInvalidManager(DSite* s) : + ProtocolInvalidManager(s, false) {} + ProtocolEagerInvalidManager(MsgContainer* msg) : + ProtocolInvalidManager(msg) {} + }; + + class ProtocolEagerInvalidProxy : public ProtocolInvalidProxy { + public: + ProtocolEagerInvalidProxy() : ProtocolInvalidProxy(false) {} + }; + + + + // manager and proxy for the lazy protocol + + class ProtocolLazyInvalidManager : public ProtocolInvalidManager { + public: + ProtocolLazyInvalidManager(DSite* s) : + ProtocolInvalidManager(s, true) {} + ProtocolLazyInvalidManager(MsgContainer* msg) : + ProtocolInvalidManager(msg) {} + }; + + class ProtocolLazyInvalidProxy : public ProtocolInvalidProxy { + public: + ProtocolLazyInvalidProxy() : ProtocolInvalidProxy(true) {} + }; + +} //End namespace +#endif + --- mozart-1.4.0.orig/platform/dss/src/protocol_invalid.cc +++ mozart-1.4.0/platform/dss/src/protocol_invalid.cc @@ -0,0 +1,394 @@ +/* + * Authors: + * Zacharias El Banna (zeb@sics.se) + * + * Contributors: + * Raphael Collet (raph@info.ucl.ac.be) + * + * Copyright: + * Zacharias El Banna, 2002 + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ + +#if defined(INTERFACE) +#pragma implementation "protocol_invalid.hh" +#endif + +#include "protocol_invalid.hh" + +namespace _dss_internal{ //Start namespace + + // Quick description of the protocol. + // + // This protocol implements a two-phase commit scheme for updating a + // mutable entity. All proxies have a copy of the current state of + // the entity. Read operations are purely local, while write + // operations are performed by the manager. For the latter, the + // manager asks proxies to temporarily invalidate their state. This + // guarantees consistent causality between sites. + // + // Proxy P requests for reading (once in the eager case, required + // after invalidation in the lazy case): + // + // P M + // |----INV_READ--->| + // |<--INV_COMMIT---| if M is not in invalidation phase + // + // Proxy P requests a write operation: (1) P sends the operation to + // manager M. M starts an invalidation phase, if no other request + // is pending. (2) Once all proxies have invalidated their state, M + // performs all write operations, and sends results back to proxies. + // (3) Then M commits the new entity state to all reader proxies. + // + // (1) P M P' + // |-----INV_WRITE----->| | + // |<--INV_INVALIDATE---|---INV_INVALIDATE-->| + // | ... | + // (2) |----INV_INVALID---->|<----INV_INVALID----| + // |<----INV_RESULT-----| | M performs operation + // | ... | + // (3) |<----INV_COMMIT-----|-----INV_COMMIT---->| + // + // Proxies that fail are simply discarded by the manager, without + // affecting the entity's state. Write operations are performed by + // the manager in order to avoid proxy dependencies in terms of + // failures. + + namespace { + enum Invalid_Message { + INV_READ, // p2m: proxy asks for reading + INV_WRITE, // p2m: proxy requests write operation + INV_RETURN, // m2p: manager returns operation result + INV_INVALIDATE, // m2p: asks proxy to invalidate + INV_INVALID, // p2m: proxy notifies invalidation + INV_COMMIT // m2p: commit new entity state + }; + } + + // duplicate a PstInContainerInterface + inline + PstInContainerInterface* duplicate(PstInContainerInterface* pst) { + if (pst == NULL) return NULL; + PstOutContainerInterface* pst1 = pst->loopBack2Out(); + PstInContainerInterface* pst2 = pst1->loopBack2In(); + pst1->dispose(); + return pst2; + } + + + + /******************** ProtocolInvalidManager ********************/ + + ProtocolInvalidManager::ProtocolInvalidManager(DSite *s, bool isLazy) { + a_readers.push(s); + a_valid = 1; + setStatus(isLazy); + } + + void ProtocolInvalidManager::sendMigrateInfo(MsgContainer* msg) { + ProtocolManager::sendMigrateInfo(msg); + msgPush(msg, a_readers.size()); + for (Position p(a_readers); p(); p++) msgPush(msg, *p); + msgPush(msg, a_valid); + msgPush(msg, a_requests.size()); + for (QueuePosition p(a_requests); p(); p++) { + msgPush(msg, (*p).arg->loopBack2Out()); + if ((*p).caller) { + msgPush(msg, true); msgPush(msg, (*p).caller); + } else { + msgPush(msg, false); + } + } + } + + ProtocolInvalidManager::ProtocolInvalidManager(MsgContainer* msg) : + ProtocolManager(msg) + { + int len = msg->popIntVal(); + while (len--) a_readers.push(msg->popDSiteVal()); + a_valid = msg->popIntVal(); + len = msg->popIntVal(); + while (len--) { + PstInContainerInterface* arg = duplicate(gf_popPstIn(msg)); + GlobalThread* caller = msg->popIntVal() ? popThreadId(msg) : NULL; + a_requests.append(Request(caller, arg)); + } + } + + ProtocolInvalidManager::~ProtocolInvalidManager() { + while (!a_requests.isEmpty()) a_requests.pop().dispose(); + } + + void ProtocolInvalidManager::makeGCpreps() { + ProtocolManager::makeGCpreps(); + t_gcList(a_readers); + for (QueuePosition p(a_requests); p(); p++) (*p).makeGCpreps(); + } + + + void ProtocolInvalidManager::printStatus(){ + if (isPermFail()) { + printf("Failed\n"); + } else { + printf("Readers: %d valid among\n", a_valid); + for (Position p(a_readers); p(); p++) + printf(" %s\n", (*p)->m_stringrep()); + if (a_requests.isEmpty()) { + printf("No write request\n"); + } else { + printf("Write requests from\n"); + for (QueuePosition p(a_requests); p(); p++) + printf(" %s\n", (*p).caller ? + (*p).caller->m_getGUIdSite()->m_stringrep() : "unknown"); + } + } + } + + + // register a proxy as a reader + void + ProtocolInvalidManager::m_register(DSite* s) { + Assert(!a_readers.contains(s)); + a_readers.push(s); + if (a_requests.isEmpty()) m_commit(s); + } + + // ask all readers to invalidate their state + void + ProtocolInvalidManager::m_invalidate() { + Assert(!a_requests.isEmpty()); + for (Position p(a_readers); p(); p++) + sendToProxy(*p, INV_INVALIDATE); + // just in case we are ready already... + m_checkOperations(); + } + + // count a proxy as invalidated, remove it from a_readers if + // required, and check write operations + void + ProtocolInvalidManager::m_invalid(DSite* s, bool remove) { + Assert(remove || a_readers.contains(s)); + if (!remove || a_readers.remove(s)) { + a_valid--; m_checkOperations(); + } + } + + // perform operations if all proxies have invalidated their state + void + ProtocolInvalidManager::m_checkOperations(){ + if (a_valid > 0) return; + + // process all write requests + while (!a_requests.isEmpty()) { + Request req = a_requests.pop(); + + // perform operation, and return result + PstOutContainerInterface* ans = NULL; + a_coordinator->m_doe(AO_STATE_WRITE, req.caller, req.arg, ans); + if (req.caller) + sendToProxy(req.caller->m_getGUIdSite(), INV_RETURN, req.caller, ans); + + // dispose Psts + if (req.caller == NULL && ans) ans->dispose(); + req.dispose(); + } + // all requests have been served, commit new state + for (Position p(a_readers); p(); p++) m_commit(*p); + } + + // commit new state to one proxy + void + ProtocolInvalidManager::m_commit(DSite *s) { + sendToProxy(s, INV_COMMIT, a_coordinator->retrieveEntityState()); + a_valid++; + } + + // notify permfail to all registered proxies + void + ProtocolInvalidManager::m_failed() { + while (!a_readers.isEmpty()) a_readers.pop(); + while (!a_requests.isEmpty()) a_requests.pop().dispose(); + makePermFail(); + } + + + void + ProtocolInvalidManager::msgReceived(::MsgContainer* msg, DSite* sender){ + if (isPermFail()) { + sendToProxy(sender, PROT_PERMFAIL); return; + } + int message = msg->popIntVal(); + switch (message) { + case PROT_REGISTER: { + registerProxy(sender); + break; + } + case PROT_DEREGISTER: { + deregisterProxy(sender); + m_invalid(sender, REMOVE); + break; + } + case INV_READ: { + m_register(sender); + break; + } + case INV_WRITE: { + bool trigger = a_requests.isEmpty(); + PstInContainerInterface* arg = duplicate(gf_popPstIn(msg)); + GlobalThread* caller = msg->m_isEmpty() ? NULL : popThreadId(msg); + a_requests.append(Request(caller, arg)); + if (trigger) m_invalidate(); + break; + } + case INV_INVALID: { + m_invalid(sender, m_isLazy()); + break; + } + case PROT_PERMFAIL: { + m_failed(); + break; + } + default: + Assert(0); + } + } + + + // handle proxy failures + void + ProtocolInvalidManager::m_siteStateChange(DSite* s, + const FaultState& state) { + if (!isPermFail() && state == FS_GLOBAL_PERM) { + deregisterProxy(s); m_invalid(s, REMOVE); + } + } + + + + /******************** ProtocolInvalidProxy ********************/ + + ProtocolInvalidProxy::ProtocolInvalidProxy(bool isLazy): + ProtocolProxy(isLazy ? PN_LAZY_INVALID : PN_EAGER_INVALID), a_numRead(0) { + if (isLazy) m_setLazy(); + m_setReader(true); + m_setValid(true); // default for home proxy + } + + bool + ProtocolInvalidProxy::m_initRemoteProt(DssReadBuffer*) { + m_setReader(false); + m_setValid(false); + if (!m_isLazy()) m_subscribe(); // subscribe now if eager + return false; + } + + ProtocolInvalidProxy::~ProtocolInvalidProxy(){ + Assert(a_susps.isEmpty()); + if (!a_proxy->m_isHomeProxy()) protocol_Deregister(); + } + + + void ProtocolInvalidProxy::m_subscribe() { + sendToManager(INV_READ); + m_setReader(true); + } + + OpRetVal + ProtocolInvalidProxy::operationRead(GlobalThread* th_id, + PstOutContainerInterface**& msg){ + dssLog(DLL_BEHAVIOR,"InvalidProxy::Read"); + msg = NULL; + if (isPermFail()) return DSS_RAISE; + if (m_isValid()) return DSS_PROCEED; // state is valid + if (!m_isReader()) m_subscribe(); + a_susps.push(th_id); + a_numRead++; + return DSS_SUSPEND; + } + + OpRetVal + ProtocolInvalidProxy::operationWrite(GlobalThread* th_id, + PstOutContainerInterface**& msg){ + dssLog(DLL_BEHAVIOR,"InvalidProxy::Write"); + msg = NULL; + if (isPermFail()) return DSS_RAISE; + if (th_id) { + sendToManager(INV_WRITE, UnboundPst(msg), th_id); + a_susps.append(th_id); + } else { + sendToManager(INV_WRITE, UnboundPst(msg)); + } + return DSS_SUSPEND; + } + + + void + ProtocolInvalidProxy::msgReceived(::MsgContainer* msg, DSite*){ + if (isPermFail()) return; + int message = msg->popIntVal(); + switch (message) { + case INV_RETURN: { + GlobalThread* caller = popThreadId(msg); + PstInContainerInterface* ans = gf_popPstIn(msg); + caller->resumeRemoteDone(ans); + a_susps.remove(caller); + break; + } + case INV_INVALIDATE: { + m_setValid(false); + if (m_isLazy()) m_setReader(false); + sendToManager(INV_INVALID); + break; + } + case INV_COMMIT: { + PstInContainerInterface* val = gf_popPstIn(msg); + a_proxy->installEntityState(val); + m_setValid(true); + // wake up read operations + while (a_numRead > 0) { + a_susps.pop()->resumeDoLocal(); + a_numRead--; + } + break; + } + case PROT_PERMFAIL: { + makePermFail(); + break; + } + default: + Assert(0); + } + } + + + // interpret site failures + FaultState + ProtocolInvalidProxy::siteStateChanged(DSite* s, const FaultState& state) { + if (!isPermFail() && a_proxy->m_getCoordinatorSite() == s) { + switch (state) { + case FS_OK: return FS_STATE_OK; + case FS_TEMP: return FS_STATE_TEMP; + case FS_LOCAL_PERM: makePermFail(state); return FS_STATE_LOCAL_PERM; + case FS_GLOBAL_PERM: makePermFail(state); return FS_STATE_GLOBAL_PERM; + default: + dssError("Unknown DSite state %d for %s",state,s->m_stringrep()); + } + } + return 0; + } + +} //End namespace --- mozart-1.4.0.orig/platform/dss/src/dgc_tl.cc +++ mozart-1.4.0/platform/dss/src/dgc_tl.cc @@ -29,7 +29,6 @@ #include "dgc_tl.hh" #include "referenceConsistency.hh" -#include "msl_serialize.hh" namespace _dss_internal{ --- mozart-1.4.0.orig/platform/dss/src/msl_transObj.cc +++ mozart-1.4.0/platform/dss/src/msl_transObj.cc @@ -69,14 +69,14 @@ /******************** marshal/unmarshal ********************/ // useful sizes inside marshaled frames - const int HEADER1 = 1 + SIZE_INT + SIZE_INT; // byte + acknum + framesize + const unsigned int HEADER1 = 1 + SIZE_INT + SIZE_INT; // byte + acknum + framesize const int TRAILER = 1; // control flag void BufferedTransObj::marshal(MsgCnt *msgC, int acknum) { - int framesize; + size_t framesize; BYTE* pos; - dssLog(DLL_ALL,"TRANSOBJ (%p): Marshal ack:%d cont:%d", + dssLog(DLL_TOO_MUCH,"TRANSOBJ (%p): Marshal ack:%d cont:%d", this, acknum, msgC->checkFlag(MSG_HAS_MARSHALCONT)); framesize = a_marshalBuffer->getFree(); // max framesize @@ -131,7 +131,8 @@ if (a_unmarshalBuffer->getUsed() < HEADER1) return U_WAIT; // read header - BYTE b = a_unmarshalBuffer->m_getByte(); // control byte + DebugCode(BYTE b =) + a_unmarshalBuffer->m_getByte(); // control byte Assert(b == 0xFF); int acknum = a_unmarshalBuffer->m_getInt(); // ack number a_comObj->msgAcked(acknum); @@ -182,6 +183,7 @@ // Something must be seriously wrong in the transport layer. // Break the connection by telling the comObj it was lost. // The comObj can then decide on further actions. + dssLog(DLL_DEBUG,"Frame corrupted!"); a_comObj->connectionLost(); return U_CLOSED; } --- mozart-1.4.0.orig/platform/dss/src/msl_timers.cc +++ mozart-1.4.0/platform/dss/src/msl_timers.cc @@ -73,10 +73,10 @@ Position p(a_hourList); while (p.hasElement()) { if ((*p)->a_time < MSG) { - //dssLog(DLL_ALL,"TIMER (%p): Dropping hour timer %p",this,tmp); + //dssLog(DLL_MOST,"TIMER (%p): Dropping hour timer %p",this,tmp); m_min_insert(p.pop()); // Know we are talking about a_minutes (or seconds) } else { - //dssLog(DLL_ALL,"TIMER (%p): Postponing hour timer %p",this,(*iter)); + //dssLog(DLL_MOST,"TIMER (%p): Postponing hour timer %p",this,(*iter)); (*p)->a_time -= MSG; p.next(); } @@ -224,7 +224,7 @@ sprintf(buf,"WHEEL:%3d:%4d SUSP:%s CLOCK:%s", a_minutes, a_mseconds, - ::gf_bool2string(a_suspended), + a_suspended?"TRUE":"FALSE", a_clock.stringrep()); return buf; } --- mozart-1.4.0.orig/platform/dss/src/msl_timers.hh +++ mozart-1.4.0/platform/dss/src/msl_timers.hh @@ -164,5 +164,5 @@ char* m_stringrep(); }; -} // end _dss_internal +} // end _msl_internal #endif --- mozart-1.4.0.orig/platform/dss/src/msl_endRouter.cc +++ mozart-1.4.0/platform/dss/src/msl_endRouter.cc @@ -79,9 +79,8 @@ /**************************** handling connection ********************/ - DssChannel* EndRouter::m_closeConnection(){ + void EndRouter::m_closeConnection(){ dssLog(DLL_DEBUG,"EndRouter closing down"); - return NULL; } void EndRouter::deliver() { --- mozart-1.4.0.orig/platform/dss/src/msl_tcpTransObj.cc +++ mozart-1.4.0/platform/dss/src/msl_tcpTransObj.cc @@ -59,18 +59,17 @@ /**************************** handling connection ********************/ - DssChannel* TCPTransObj::m_closeConnection() { - DssChannel *ans = a_channel; - + void TCPTransObj::m_closeConnection() { dssLog(DLL_DEBUG,"TRANSOBJ (%p): closing down",this); if (a_channel != NULL) { a_channel->registerRead(false); // Sometimes done twice! a_channel->registerWrite(false); // Sometimes done twice! a_channel->setCallback(NULL); + a_channel->close(); + delete a_channel; a_channel = NULL; } - return ans; } void TCPTransObj::deliver() { @@ -121,19 +120,27 @@ // return false if done, and true if more has to be read bool TCPTransObj::readDataAvailable() { - int ret,len; - BYTE *pos; - Assert(a_channel != NULL); Assert(a_readBuffer->getFree() > 0); - // read from transport layer (loop twice if necessary) - do { - len = a_readBuffer->getWriteBlock(pos); - a_mslEnv->a_OSReadCounter++; - ret = a_channel->read(pos, len); - a_readBuffer->m_commitWrite(ret); - } while (ret == len && a_readBuffer->getFree() > 0); + // read from transport layer + a_mslEnv->a_OSReadCounter++; + BYTE *pos; + int len = a_readBuffer->getWriteBlock(pos); + int ret = a_channel->read(pos, len); + a_readBuffer->m_commitWrite(ret); + + // Note: The channel may still have data available to read at this + // point. This happens when 'len' is too small. In that case, it + // is up to the channel to make another callback later. + // + // There was an optimization in the past, which was reading the + // channel again in the case ret==len. We discarded it because it + // was the source of a bug when the channel was implemented with a + // socket. In the case when we read *exactly* the available data + // in the socket, the second call was blocking. There was no more + // data to read, but the system call read(2) could not return 0, + // because 0 means end-of-file. So it was blocking. // decode data to a_unmarshalBuffer if (a_readBuffer->decode()) { --- mozart-1.4.0.orig/platform/dss/src/protocol_pilgrim.hh +++ mozart-1.4.0/platform/dss/src/protocol_pilgrim.hh @@ -140,12 +140,9 @@ ::PstOutContainerInterface**&); virtual OpRetVal operationRead(GlobalThread*, PstOutContainerInterface**&); virtual OpRetVal operationWrite(GlobalThread*, PstOutContainerInterface**&); + virtual OpRetVal operationWrite(PstOutContainerInterface**&x){return ProtocolProxy::operationWrite(x);}; void msgReceived(::MsgContainer*,DSite*); - void remoteInitatedOperationCompleted(DssOperationId* opId, - ::PstOutContainerInterface* pstOut) { - Assert(0); } - void localInitatedOperationCompleted(); // check fault state virtual FaultState siteStateChanged(DSite*, const FaultState&); --- mozart-1.4.0.orig/platform/dss/src/protocol_immutable_eager.cc +++ mozart-1.4.0/platform/dss/src/protocol_immutable_eager.cc @@ -115,7 +115,7 @@ } else { setStatus(true); a_proxy->installEntityState(builder); - while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(NULL); + while (!a_susps.isEmpty()) a_susps.pop()->resumeDoLocal(); } } --- mozart-1.4.0.orig/platform/dss/src/coordinator_stationary.cc +++ mozart-1.4.0/platform/dss/src/coordinator_stationary.cc @@ -29,7 +29,6 @@ #endif #include "dssBase.hh" -#include "msl_serialize.hh" #include "coordinator.hh" #include "protocols.hh" #include "referenceConsistency.hh" --- mozart-1.4.0.orig/platform/dss/src/msl_dsite.hh +++ mozart-1.4.0/platform/dss/src/msl_dsite.hh @@ -143,7 +143,6 @@ virtual void m_connectionEstablished(DssChannel*); virtual void m_stateChange(FaultState newState); virtual void m_virtualCircuitEstablished(int len , DSite *route[]); - virtual void m_takeDownConnection(); virtual void m_monitorRTT(int maxrtt); // returns stringrep of id + length of string virtual BYTE* m_getId(int &len); --- mozart-1.4.0.orig/platform/dss/src/dgc_rl_siteHandler.cc +++ mozart-1.4.0/platform/dss/src/dgc_rl_siteHandler.cc @@ -0,0 +1,73 @@ +/* + * Authors: + * Erik Klintskog (erik@sics.se) + * + * Contributors: + * optional, Contributor's name (Contributor's email address) + * + * Copyright: + * Erik Klintskog, 2004 + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ +#if defined(INTERFACE) +#pragma implementation "dgc_rl_siteHandler.hh" +#endif + +#include "dgc_rl_siteHandler.hh" +#include "dss_comService.hh" + +namespace _dss_internal{ + + + // ******************************** SiteHandler2 ******************************** + + SiteHandler::SiteHandler() : a_siteList() {} + + bool SiteHandler::isEmpty() const { + return a_siteList.isEmpty(); + } + + + void SiteHandler::modifyDSite(DSite* site, int no){ + Position > pos(a_siteList); + if (pos.find(site)) { + // found site + (*pos).second += no; // decs < 0 => return of Site + if ((*pos).second == 0) pos.remove(); + } else { + // No site found, insert this one + a_siteList.push(makePair(site, no)); + } + } + + + void SiteHandler::gcPreps() { + //Markup sites and remove perms + Position > pos(a_siteList); + while (pos()) { + if (((*pos).first->m_getFaultState() & FS_PERM) == 0) { + (*pos).first->m_makeGCpreps(); + pos++; + } else { + dssLog(DLL_BEHAVIOR,"RL: Removing failed site: %s", + (*pos).first->m_stringrep()); + pos.remove(); + } + } + } + +} --- mozart-1.4.0.orig/platform/dss/src/coordinator_fwdchain.cc +++ mozart-1.4.0/platform/dss/src/coordinator_fwdchain.cc @@ -32,7 +32,6 @@ #endif #include "dssBase.hh" -#include "msl_serialize.hh" #include "coordinator.hh" #include "protocols.hh" #include "referenceConsistency.hh" @@ -42,8 +41,7 @@ #include "protocol_once_only.hh" #include "protocol_simple_channel.hh" #include "protocol_migratory.hh" -#include "protocol_eagerinvalid.hh" -#include "protocol_lazyinvalid.hh" +#include "protocol_invalid.hh" #include "dss_msgLayerInterface.hh" namespace _dss_internal{ //Start namespace @@ -162,7 +160,7 @@ void CoordinatorFwdChain::m_queueProtMessage(MsgContainer *m, DSite* fromsite){ - dssLog(DLL_ALL,"QUEUEING migratory message"); + dssLog(DLL_MOST,"QUEUEING migratory message"); a_deliverQueue.append(makePair(fromsite, m)); } @@ -172,19 +170,19 @@ // delivered localy. void CoordinatorFwdChain::m_deliverProtMessages(DSite* dest){ - dssLog(DLL_ALL,"DELIVERING migratory messages"); + dssLog(DLL_MOST,"DELIVERING migratory messages"); if (dest == m_getEnvironment()->a_myDSite) { // deliver locally dssLog(DLL_DEBUG,"Migratory protocol messages delivered locally"); while (!a_deliverQueue.isEmpty()) { Pair sm = a_deliverQueue.pop(); - dssLog(DLL_ALL,"delivering migratory message from %s",sm.first->m_stringrep()); + dssLog(DLL_MOST,"delivering migratory message from %s",sm.first->m_stringrep()); a_prot->msgReceived(sm.second, sm.first); } } else { // forward messages dssLog(DLL_DEBUG,"Migratory protocol messages forwarded"); while (!a_deliverQueue.isEmpty()) { Pair sm = a_deliverQueue.pop(); - dssLog(DLL_ALL,"delivering migratory message from %s",sm.first->m_stringrep()); + dssLog(DLL_MOST,"delivering migratory message from %s",sm.first->m_stringrep()); m_forwardMessage(sm.second, sm.first, dest); } } @@ -225,7 +223,8 @@ void CoordinatorFwdChain::m_receiveRefMsg(MsgContainer *msgC, DSite* fromsite){ - unsigned int e = msgC->popIntVal(); + int e = msgC->popIntVal(); + Assert(e>=0); // let's find the pair whose second element is e Position > pos(a_refList); while (pos() && (*pos).second != e) pos++; @@ -275,7 +274,7 @@ void CoordinatorFwdChain::m_receiveAsMsg(MsgContainer *msgC, DSite* fromsite){ int type = msgC->popIntVal(); - dssLog(DLL_ALL,"Received AS Message:%d",type); + dssLog(DLL_MOST,"Received AS Message:%d",type); switch(type){ case MA_REQUEST:{ // Initiate migration @@ -316,7 +315,7 @@ // raph: The former version of the push() below was dropping // the front element of a_refList (memory leak!) I guess it // was a bug... If not, add a "a_refList.pop()" before it. - a_refList.push(makePair(new HomeReference(this, a), (int) e)); + a_refList.push(makePair(new HomeReference(this, a), static_cast(e))); // send new reference m_sendRefUpdateCoord(fromsite); @@ -383,7 +382,7 @@ void CoordinatorFwdChain::m_makeGCpreps(){ t_gcList(a_refList); - for (Position > p(a_deliverQueue); p(); p++) + for (QueuePosition > p(a_deliverQueue); p(); p++) (*p).first->m_makeGCpreps(); a_prot->makeGCpreps(); } @@ -470,9 +469,9 @@ if(a_ref) a_ref->m_mergeReferenceInfo(bs); else { - CoordinatorFwdChain* coord = + CoordinatorFwdChain* coord2 = static_cast(a_coordinator); - coord->a_refList.front().element().first->m_mergeReferenceInfo(bs); + coord2->a_refList.front().element().first->m_mergeReferenceInfo(bs); } return; } @@ -583,7 +582,7 @@ ProxyFwdChain::m_initRemoteProxy(DssReadBuffer *bs){ a_ps = PROXY_STATUS_REMOTE; BYTE stat = bs->getByte(); - if(stat = FWDC_REFINFO){ + if(stat == FWDC_REFINFO){ a_epoch = gf_UnmarshalNumber(bs); a_coordSite = m_getEnvironment()->a_msgnLayer->m_UnmarshalDSite(bs); a_ref = new RemoteReference(this,bs); @@ -616,7 +615,8 @@ void ProxyFwdChain::m_receiveRefMsg(MsgContainer *msgC, DSite* fromsite){ - unsigned int epoch = msgC->popIntVal(); + int epoch = msgC->popIntVal(); + Assert(epoch>=0); if(a_ref && epoch == a_epoch){ RCalg remove = a_ref->m_msgToGcAlg(msgC,fromsite); if (remove != RC_ALG_PERSIST){ --- mozart-1.4.0.orig/platform/dss/src/dss_interface.cc +++ mozart-1.4.0/platform/dss/src/dss_interface.cc @@ -26,7 +26,7 @@ */ -#ifdef INTERFACE +#ifdef DSS_INTERFACE #pragma implementation "dss_object.hh" #endif @@ -34,14 +34,8 @@ /*************** DSS_INTERFACE PART I: THE ENVIRONMENT ***************/ -#include "msl_serialize.hh" #include "coordinator.hh" -#include "dss_global_name.hh" #include "protocols.hh" -#include "dss_psDKS.hh" - - -#include "dss_dksBackbone.hh" #ifndef WIN32 #include // for _exit() @@ -63,16 +57,13 @@ Mediation_Object* const mo, const bool& sec): a_map( mo), - a_dksInstHT( NULL), a_proxyTable( NULL), a_coordinatorTable( NULL), a_threadTable( NULL), - a_nameTable( NULL), a_myDSite( NULL), a_dssconf( DssConfigData()), a_dssMslClbk( NULL), a_msgnLayer( NULL), - a_dksBackbone( NULL), a_CreateXistRefCounter( 0), a_CreateNonXRefCounter( 0), a_DuplicateXistRefCounter( 0), @@ -87,11 +78,9 @@ a_myDSite = a_msgnLayer->a_myDSite; // at this point, the msgng layer is started and runnig. // Note that the DSIte is first initialized here, myDSite. - a_dksInstHT = new DksInstanceHT(10, this); a_proxyTable = new ProxyTable(a_dssconf.DEFAULT_PROXY_TABLE_SIZE, this); a_coordinatorTable = new CoordinatorTable(a_dssconf.DEFAULT_MANAGER_TABLE_SIZE, this); a_threadTable = new GlobalThreadTable(10, this); - a_nameTable = new GlobalNameTable(a_dssconf.DEFAULT_NAME_TABLE_SIZE, this); } DSS_Environment::~DSS_Environment(){ @@ -101,7 +90,6 @@ delete a_threadTable; delete a_coordinatorTable; delete a_proxyTable; - delete a_nameTable; } DSite* @@ -177,7 +165,6 @@ case AEN_RELAXED_MUTABLE: case AEN_TRANSIENT: case AEN_IMMUTABLE: - case AEN_IMMUTABLE_UNNAMED: ae_name = aen; break; default: @@ -211,12 +198,8 @@ //For resources connected to proxys (before also to markup the mediator) a_proxyTable->m_gcResources(); - a_dksInstHT->m_gcResources(); - a_threadTable->m_gcResources(); - a_nameTable->m_gcResources(); - a_msgnLayer->m_gcResources(); } @@ -265,6 +248,8 @@ g_dssLogLevel = static_cast(arg); dssLog(g_dssLogLevel,"<= New loglevel set"); break; +#endif +#ifdef DEBUG_CHECK case DSS_STATIC_MEMORY_ALLOCATION: printf("******* ALLOCATION STATUS *******\n"); Assert(0); //printf("DSites:%d ComObj:%d TCPtransObj:%d\n", @@ -328,55 +313,6 @@ Proxy* p2 = static_cast(ae2->getCoordinatorAssistant()); return p1->m_getNetId() < p2->m_getNetId(); } - - - - KbrInstance* - DSS_Environment::m_createKbr(int K, int Bits, int Fail, KbrCallbackInterface* inf){ - printf("Clculating the DKS K:%d bits:%d 2^%d = %d\n", K, Bits, Bits, 1 << (Bits)); - PS_DKS_userClass *interface = new PS_DKS_userClass( this, inf); - DksInstance* instance = new DksInstance(1 << (Bits), K, Fail, interface, this); - KbrInstanceImpl* kInst = new KbrInstanceImpl(instance, interface); - interface->m_setKbrInstance(kInst); - return kInst; - } - - bool - DSS_Environment::m_unmarshalKbr(DssReadBuffer* buf, KbrInstance* &inst){ - DksInstance* instance; - bool exists = a_dksInstHT->m_unmarshalDksInstance(buf, instance); - if(exists) { - PS_DKS_userClass *interface = static_cast(instance->getCallBackService()); - inst = interface->m_getKbrInstance(); - return true; - } - PS_DKS_userClass *interface = new PS_DKS_userClass(this, NULL); - instance->setCallBackService(interface); - KbrInstanceImpl* kInst = new KbrInstanceImpl(instance, interface); - interface->m_setKbrInstance(kInst); - inst = kInst; - return false; - } - - void - DSS_Environment::m_setupBackbone(DssWriteBuffer* buf){ - if(a_dksBackbone == NULL){ - a_dksBackbone = new DksBackbone(this); - DksInstance* instance = new DksInstance(1 << 16, 2, 1 , a_dksBackbone, this); - a_dksBackbone->a_instance = instance; - } - a_dksBackbone->a_instance->m_marshal(buf); - } - - void - DSS_Environment::m_joinBackbone(DssReadBuffer *buf){ - if(a_dksBackbone) return ; - DksInstance* instance = NULL; - Assert(a_dksInstHT->m_unmarshalDksInstance(buf, instance) == false); - a_dksBackbone = new DksBackbone(instance, this); - instance->setCallBackService(a_dksBackbone); - instance->m_joinDksRing(); - } } @@ -442,37 +378,3 @@ { return _a_env->m_orderEntities(ae_first,ae_second); } - - -// NEW IO interface - - -GlobalNameInterface* DSS_Object::createName(void* ref){ - return _a_env->a_nameTable->m_create(ref); -} - -GlobalNameInterface* DSS_Object::unmarshalName(DssReadBuffer* buf){ - return _a_env->a_nameTable->m_unmarshal(buf); -} - - - -KbrInstance* -DSS_Object::m_createKbr(int K, int Bits, int Fail, KbrCallbackInterface* intf){ - return _a_env->m_createKbr(K, Bits, Fail, intf); -} - -bool -DSS_Object::m_unmarshalKbr(DssReadBuffer* buf, KbrInstance*& inst){ - return _a_env->m_unmarshalKbr(buf, inst); -} - -void -DSS_Object::m_createBackboneTicket(DssWriteBuffer* buf){ - _a_env->m_setupBackbone(buf); -} - -void -DSS_Object::m_joinBackbone(DssReadBuffer *buf){ - _a_env->m_joinBackbone(buf); -} --- mozart-1.4.0.orig/platform/dss/src/msl_buffer.hh +++ mozart-1.4.0/platform/dss/src/msl_buffer.hh @@ -33,7 +33,9 @@ #include "msl_crypto.hh" #include "dss_classes.hh" + namespace _msl_internal{ //Start namespace + const int SIZE_INT = 4; /************************* SimpleBuffer *************************/ @@ -94,11 +96,11 @@ class DssSimpleReadBuffer : public DssReadBuffer, public SimpleBuffer { public: DssSimpleReadBuffer() : SimpleBuffer() {} - DssSimpleReadBuffer(BYTE* const &buf, size_t const &len) - : SimpleBuffer(buf, len) {} + DssSimpleReadBuffer(BYTE* const &buffer, size_t const &len) + : SimpleBuffer(buffer, len) {} // implementation of DssReadBuffer - virtual int availableData() const { return getFree(); } + virtual size_t availableData() const { return getFree(); } virtual bool canRead(size_t len) const {return getFree()>=len;} virtual void readFromBuffer(BYTE* ptr, size_t len) { m_read(ptr, len); } virtual void commitRead(size_t len) { m_commit(len); } @@ -116,11 +118,11 @@ // a SimpleBuffer dressed as a DssWriteBuffer class DssSimpleWriteBuffer : public DssWriteBuffer, public SimpleBuffer { public: - DssSimpleWriteBuffer(BYTE* const &buf, size_t const &len) - : SimpleBuffer(buf, len) {} + DssSimpleWriteBuffer(BYTE* const &buffer, size_t const &len) + : SimpleBuffer(buffer, len) {} // implementation of DssWriteBuffer - virtual int availableSpace() const { return getFree(); } + virtual size_t availableSpace() const { return getFree(); } virtual bool canWrite(size_t len) const {return getFree()>=len;} virtual void writeToBuffer(const BYTE* ptr, size_t len) { m_write(ptr, len); m_commit(len); @@ -239,7 +241,7 @@ void resetFrame() { outerframe = 0; } // implementation of DssReadBuffer - virtual int availableData() const; + virtual size_t availableData() const; virtual bool canRead(size_t len) const {return this->availableData()>=len;} virtual void readFromBuffer(BYTE* ptr, size_t len); virtual void commitRead(size_t len); @@ -260,8 +262,8 @@ public: DssCryptoReadByteBuffer(BYTE* const key, const u32& keylen, const u32& iv1, const u32& iv2, - DssReadByteBuffer* const &buf) - : DssReadByteBuffer(buf->getSize()), databuffer(buf), + DssReadByteBuffer* const &buffer) + : DssReadByteBuffer(buffer->getSize()), databuffer(buffer), crypto(key, keylen, iv1, iv2) {} @@ -285,7 +287,7 @@ void resetReserve() { reserved = 0; } // implementation of DssWriteBuffer - virtual int availableSpace() const; + virtual size_t availableSpace() const; virtual bool canWrite(size_t len) const {return this->availableSpace()>=len;} virtual void writeToBuffer(const BYTE* ptr, size_t len); virtual void putByte(const BYTE& b); @@ -305,8 +307,8 @@ public: DssCryptoWriteByteBuffer(BYTE* const key, const u32& keylen, const u32& iv1, const u32& iv2, - DssWriteByteBuffer* const &buf) - : DssWriteByteBuffer(buf->getSize()), databuffer(buf), + DssWriteByteBuffer* const &buffer) + : DssWriteByteBuffer(buffer->getSize()), databuffer(buffer), crypto(key, keylen, iv1, iv2) {} --- mozart-1.4.0.orig/platform/dss/src/abstractEntityImplementations.cc +++ mozart-1.4.0/platform/dss/src/abstractEntityImplementations.cc @@ -32,8 +32,8 @@ #include "abstractEntityImplementations.hh" #include "coordinator.hh" #include "protocols.hh" -#include "protocol_eagerinvalid.hh" -#include "protocol_lazyinvalid.hh" +//Yves: Do we need to include all the protocols headers here? +#include "protocol_invalid.hh" #include "protocol_migratory.hh" #include "protocol_once_only.hh" #include "protocol_transient_remote.hh" @@ -42,7 +42,6 @@ #include "protocol_immutable_lazy.hh" #include "protocol_immutable_eager.hh" #include "protocol_immediate.hh" -#include "protocol_dksBroadcast.hh" using namespace _dss_internal; @@ -62,20 +61,6 @@ if (a_proxy) static_cast(a_proxy)->setAbstractEntity(this); } -void -AbstractEntity::remoteInitatedOperationCompleted(DssOperationId* opId, - PstOutContainerInterface* pstOut){ - Assert(a_proxy); - ProtocolProxy* pp = static_cast(a_proxy)->m_getProtocol(); - pp->remoteInitatedOperationCompleted(opId, pstOut); -} - -void AbstractEntity::localInitatedOperationCompleted() { - Assert(a_proxy); - ProtocolProxy* pp = static_cast(a_proxy)->m_getProtocol(); - pp->localInitatedOperationCompleted(); -} - OpRetVal AbstractEntity::abstractOperation_Kill() { if (!a_proxy) return DSS_INTERNAL_ERROR_NO_PROXY; ProtocolProxy* pp = static_cast(a_proxy)->m_getProtocol(); @@ -179,47 +164,66 @@ /******************** applyAbstractOperation ********************/ - AOcallback applyAbstractOperation(AbstractEntity* ae, const AbsOp& aop, - DssThreadId* tid, DssOperationId* oid, - PstInContainerInterface* pstin, - PstOutContainerInterface*& pstout) { + void applyAbstractOperation(AbstractEntity* ae, const AbsOp& aop, + DssThreadId* tid, + PstInContainerInterface* pstin, + PstOutContainerInterface*& pstout) { pstout = NULL; switch (ae->getAEName()) { case AEN_MUTABLE: { MutableAbstractEntity* mae = dynamic_cast(ae); switch (aop) { - case AO_STATE_WRITE: return mae->callback_Write(tid, oid, pstin, pstout); - case AO_STATE_READ: return mae->callback_Read(tid, oid, pstin, pstout); - default: Assert(0); return AOCB_FINISH; + case AO_STATE_WRITE: + mae->callback_Write(tid, pstin, pstout); + break; + case AO_STATE_READ: + mae->callback_Read(tid, pstin, pstout); + break; + default: + Assert(0); } + break; } case AEN_RELAXED_MUTABLE: { RelaxedMutableAbstractEntity* rmae = dynamic_cast(ae); switch (aop) { - case AO_STATE_WRITE: return rmae->callback_Write(tid, oid, pstin); - case AO_STATE_READ: return rmae->callback_Read(tid, oid, pstin, pstout); - default: Assert(0); return AOCB_FINISH; + case AO_STATE_WRITE: + rmae->callback_Write(tid, pstin); + break; + case AO_STATE_READ: + rmae->callback_Read(tid, pstin, pstout); + break; + default: Assert(0); } + break; } case AEN_TRANSIENT: { MonotonicAbstractEntity* mae = dynamic_cast(ae); switch (aop) { - case AO_OO_BIND: return mae->callback_Bind(oid, pstin); - case AO_OO_UPDATE: return mae->callback_Append(oid, pstin); - case AO_OO_CHANGES: return mae->callback_Changes(oid, pstout); - default: Assert(0); return AOCB_FINISH; + case AO_OO_BIND: + mae->callback_Bind(pstin); + break; + case AO_OO_UPDATE: + mae->callback_Append(pstin); + break; + case AO_OO_CHANGES: + mae->callback_Changes(pstout); + break; + default: + Assert(0); } + break; } - case AEN_IMMUTABLE: - case AEN_IMMUTABLE_UNNAMED: { + case AEN_IMMUTABLE: { ImmutableAbstractEntity* iae = dynamic_cast(ae); - return iae->callback_Read(tid, oid, pstin, pstout); + iae->callback_Read(tid, pstin, pstout); + break; } default: - Assert(0); return AOCB_FINISH; + Assert(0); } } --- mozart-1.4.0.orig/platform/dss/src/coordinator.cc +++ mozart-1.4.0/platform/dss/src/coordinator.cc @@ -29,11 +29,9 @@ #endif #include "dssBase.hh" -#include "msl_serialize.hh" #include "coordinator.hh" #include "coordinator_stationary.hh" #include "coordinator_fwdchain.hh" -#include "coordinator_mobile.hh" #include "protocols.hh" @@ -102,9 +100,9 @@ } - AOcallback - Coordinator::m_doe(const AbsOp& aop, DssThreadId* thid, DssOperationId* oId, PstInContainerInterface* builder, PstOutContainerInterface*& ans){ - return a_proxy->m_doe(aop, thid, oId, builder, ans); + void + Coordinator::m_doe(const AbsOp& aop, DssThreadId* thid, PstInContainerInterface* builder, PstOutContainerInterface*& ans){ + return a_proxy->m_doe(aop, thid, builder, ans); } ::PstOutContainerInterface* @@ -182,13 +180,12 @@ } - AOcallback - Proxy::m_doe(const AbsOp& aop, DssThreadId* thid, DssOperationId* oId, - PstInContainerInterface* builder, - PstOutContainerInterface*& ans) + void Proxy::m_doe(const AbsOp& aop, DssThreadId* thid, + PstInContainerInterface* builder, + PstOutContainerInterface*& ans) { return applyAbstractOperation(a_abstractEntity, aop, - thid, oId, builder, ans); + thid, builder, ans); } ::PstOutContainerInterface* @@ -223,7 +220,7 @@ }; break; case PMF_FREE: - dssLog(DLL_ALL,"PROXY (%p): Persistent (Free marshalling) proxy",this); + dssLog(DLL_MOST,"PROXY (%p): Persistent (Free marshalling) proxy",this); m_makePersistent(); break; default: Assert(0); @@ -247,8 +244,7 @@ m_getReferenceInfo(buf, dest); // up to 48 (often ~10, WRC) // Returns true when the protocol is immediate, i.e., when the - // whole node should be distributed. The protocol using DKS - // marshals a NetId + 3 numbers + a DSite. The other protocols + // whole node should be distributed. Normal protocols // marshal at most 1 byte. return m_getProtocol()->marshal_protocol_info(buf, dest); } @@ -414,7 +410,6 @@ switch(type){ case AA_STATIONARY_MANAGER: return new ProxyStationary(ni, prox, env); case AA_MIGRATORY_MANAGER: return new ProxyFwdChain(ni, prox, env); - case AA_MOBILE_COORDINATOR: return new ProxyMobile(ni, prox, env); default: Assert(0); } return NULL; @@ -427,7 +422,6 @@ switch(type){ case AA_STATIONARY_MANAGER: return new CoordinatorStationary(pman,GC_annot,env); case AA_MIGRATORY_MANAGER: return new CoordinatorFwdChain(pman,GC_annot, env); - case AA_MOBILE_COORDINATOR: return new CoordinatorMobile(pman, GC_annot, env); default: Assert(0); } return NULL; --- mozart-1.4.0.orig/platform/dss/src/protocol_transient_remote.hh +++ mozart-1.4.0/platform/dss/src/protocol_transient_remote.hh @@ -113,11 +113,6 @@ virtual int getMarshaledSize() const { return 1; } virtual bool m_initRemoteProt(DssReadBuffer*); - virtual void - remoteInitatedOperationCompleted(DssOperationId*, - PstOutContainerInterface*) { Assert(0); } - virtual void localInitatedOperationCompleted() { Assert(0); } - // check fault state virtual FaultState siteStateChanged(DSite*, const FaultState&); }; --- mozart-1.4.0.orig/platform/dss/src/msl_comObj.hh +++ mozart-1.4.0/platform/dss/src/msl_comObj.hh @@ -90,7 +90,6 @@ class ComObj{ - friend class ComController; private: MsgnLayerEnv * a_mslEnv; TransObj *a_transObj; @@ -107,7 +106,7 @@ int a_sentLrgMsg; int a_receivedLrgMsg; - // One timer to be used for opening/closing/acking (one at a time) + // One timer to be used for reopening //Yves: What's the goal of this reopening business? TimerElement *a_reopentimer; // Special timers for probing and acking @@ -125,21 +124,15 @@ int a_msgAckTimeOut; int a_msgAckLength; - // Statistics - int a_lastrtt; - CState a_state; - bool a_closeHardFlag; + bool a_closeHardFlag; //Yves: This is always false! Error in m_CLOSED_2_OPENING_WF_HANDOVER() ? // For probing bool a_probing; - bool a_msgSentDuringProbeInterval; bool a_msgReceivedDuringProbeInterval; bool a_localRef; bool a_remoteRef; bool a_sentClearRef; - EndRouter* a_pred; // the transObj preceding this comObj.!!! change it - void m_setCState(const CState& s){ a_state = s; if (s == WORKING && a_site->m_getCsSite()) { @@ -148,7 +141,6 @@ a_site->m_getCsSite()->working(); } } - CState m_getCState() const { return a_state; } // throw a State vector to check if in one of a set of states -> // (WORKING | CLOSED | ... ) @@ -162,8 +154,6 @@ void setAckTimer(); void clearAckTimer(); void setProbeIntervalTimer(); - void setProbeFaultTimer(); - // private methods void m_open(); @@ -171,7 +161,6 @@ bool hasNeed(); void createCI(DssSimpleWriteBuffer*, int); bool extractCI(DssSimpleReadBuffer*,int&); - bool adoptCI(DssSimpleReadBuffer*); bool m_merge(ComObj *old); @@ -209,7 +198,6 @@ static int a_allocated; #endif - void m_closeDownConnection(); void m_closeErroneousConnection(); ComObj(Site *site, MsgnLayerEnv* env); @@ -221,7 +209,6 @@ CState getState() const {return a_state;} void m_setLocalRef(); - void setTransObj(TransObj *transObj) { a_transObj = transObj; } TransObj *getTransObj() const { return a_transObj; } void m_send(MsgCnt *, int prio); @@ -229,7 +216,6 @@ // Should this be moved to the comController? bool canBeFreed(); // A question that implicitly tells the comObj // that no local references exist. - int getQueueStatus(); void m_makeGCpreps(); bool hasQueued(); @@ -272,12 +258,8 @@ void handoverRoute(DSite *vec[], int); void m_acceptAnonConnection(TransObj *); - // Statistics - inline int getLastRTT() { return a_lastrtt; } - // Extras for internal use (must be public anyway) inline unsigned int sendProbePing(); - inline unsigned int probeFault(); unsigned int sendAckTimer(); void reopen(); --- mozart-1.4.0.orig/platform/dss/src/msl_dsite.cc +++ mozart-1.4.0/platform/dss/src/msl_dsite.cc @@ -36,7 +36,6 @@ #include "msl_transObj.hh" #include "msl_buffer.hh" #include "msl_dct.hh" -#include "msl_serialize.hh" #include "mslBase.hh" #include "msl_crypto.hh" #include "dss_enums.hh" @@ -94,7 +93,7 @@ a_isRemote(true), a_isGcMarked(false) { - dssLog(DLL_ALL,"REMOTE SITE: created %p",this); + dssLog(DLL_MOST,"REMOTE SITE: created %p",this); DebugCode(a_allocated++); } @@ -121,10 +120,8 @@ Assert(d->canWrite(static_cast(MD5_SIZE))); int inlen = d->getUsed(); BYTE* plain = d->unhook(); - //gf_printBuf("Site:encrypt",plain,inlen); int retlen; BYTE* cipher; m_encrypt(retlen,cipher,inlen,plain); - //gf_printBuf("Site:encrypted",cipher,retlen); delete [] plain; return new DssSimpleDacDct(retlen,cipher); // write } @@ -344,7 +341,7 @@ buf.m_putInt(a_version); buf.writeToBuffer(a_key->getStringRep(), RSA_MARSHALED_REPRESENTATION); a_csSite->marshalCsSite(&buf); - Assert(buf.getUsed() == body_len); + Assert(buf.getUsed() <= body_len); buf.drop(); // detach buffer from body (to avoid deallocation) // compute body signature (and pad with random data) @@ -364,11 +361,6 @@ a_comObj->handoverRoute(dstSite, len); } - void Site::m_takeDownConnection(){ - if (a_comObj) - a_comObj->m_closeDownConnection(); - } - unsigned char* Site::m_getId(int &len){ BYTE* p = a_key->getStringRep(); BYTE* ret = new BYTE[RSA_MARSHALED_REPRESENTATION]; @@ -386,8 +378,8 @@ // ************************* Site lookup table ************************ - SiteHT::SiteHT(const int& size, MsgnLayerEnv* const env ): - BucketHashTable(size), + SiteHT::SiteHT(const int& _size, MsgnLayerEnv* const env ): + BucketHashTable(_size), #ifdef DEBUG_CHECK has_mySite(false), #endif @@ -439,9 +431,10 @@ int key_len = body.m_getByte(); bool sec = body.m_getByte(); u32 version = body.m_getInt(); + Assert(body_len>=0); Assert(key_len == RSA_MARSHALED_REPRESENTATION); - if (body.availableData() + 2 + 2*SIZE_INT == body_len && + if (body.availableData() + 2 + 2*SIZE_INT == static_cast(body_len) && body_len > RSA_MARSHALED_REPRESENTATION + SIZE_INT && key_len == RSA_MARSHALED_REPRESENTATION) { --- mozart-1.4.0.orig/platform/dss/src/dgc_fwrc.cc +++ mozart-1.4.0/platform/dss/src/dgc_fwrc.cc @@ -30,7 +30,6 @@ #include "dgc_fwrc.hh" #include "referenceConsistency.hh" #include -#include "msl_serialize.hh" namespace _dss_internal{ --- mozart-1.4.0.orig/platform/dss/src/msl_transObj.hh +++ mozart-1.4.0/platform/dss/src/msl_transObj.hh @@ -50,7 +50,7 @@ TransObj& operator=(const TransObj&){ return *this; } public: - virtual DssChannel* m_closeConnection() = 0; + virtual void m_closeConnection() = 0; // ComObj keeps track of its deliver calls so that as long as // it has called deliver, and TransObj has not pulled all of its // messages with getNextMsgContainer, it will not say deliver again. @@ -77,7 +77,7 @@ class BufferedTransObj: public TransObj { protected: // Minimal size required in buffer to even consider marshaling - static const int T_MIN_FOR_HEADER = 100; + static const unsigned int T_MIN_FOR_HEADER = 100; enum unmarshalReturn { U_MORE, @@ -122,8 +122,8 @@ private: // should not be used BufferedTransObj(const BufferedTransObj&) - : TransObj(0,NULL), a_readBuffer(NULL), a_writeBuffer(NULL), - a_unmarshalBuffer(NULL), a_marshalBuffer(NULL) {} + : TransObj(0,NULL), a_readBuffer(NULL), a_unmarshalBuffer(NULL), + a_writeBuffer(NULL), a_marshalBuffer(NULL) {} BufferedTransObj& operator=(const BufferedTransObj&){ return *this; } public: --- mozart-1.4.0.orig/platform/dss/src/base.hh +++ mozart-1.4.0/platform/dss/src/base.hh @@ -71,8 +71,6 @@ #include "dss_enums.hh" -char *gf_bool2string(const bool& b); - // Create an integer2char, taking int and BYTE* inline void gf_integer2char(BYTE* const buf, const u32& e){ #ifdef BIG_ENDIAN_HOST @@ -90,11 +88,6 @@ #endif } - -void gf_printBuf(const char* const format, BYTE* const buf, int len); - - - void dssError(const char* const format, ...); void dssAssert(const char* const file, const int& line, const char* const condition); @@ -134,20 +127,4 @@ #endif // DSS_LOG - -#ifdef EXCEPTIONS -inline void Exception(const bool& cond, const ExceptionType& et){ - if(cond) throw et; -} -#else -inline void Exception(const bool&, const ExceptionType&){} -#endif // EXCEPTIONS - -// ******************************* ENUMS AND CONSTANTS **************************** - -const int sz_M8bitInt = 1; -const int sz_MNumberMax = 5; -const int sz_MEM_COPY = 8; // faster to loop copy than to invoke memcpy - - #endif --- mozart-1.4.0.orig/platform/dss/src/dgc_rl2.hh +++ mozart-1.4.0/platform/dss/src/dgc_rl2.hh @@ -31,7 +31,7 @@ #endif #include "dgc.hh" -#include "dss_rl_siteHandler.hh" +#include "dgc_rl_siteHandler.hh" namespace _dss_internal{ // Start namespace // --- mozart-1.4.0.orig/platform/dss/src/dgc_tl.hh +++ mozart-1.4.0/platform/dss/src/dgc_tl.hh @@ -33,9 +33,6 @@ #include "dgc.hh" namespace _dss_internal{ // Start namespace - class ::TimerElementInterface; - // - const int LEAST_PERIOD = 1000; // ******************** TL HOME *********************** --- mozart-1.4.0.orig/platform/dss/src/referenceConsistency.hh +++ mozart-1.4.0/platform/dss/src/referenceConsistency.hh @@ -66,7 +66,7 @@ inline GCalgorithm* m_takeAlg(const RCalg& alg) { GCalgorithm** curPtr = &a_algs; GCalgorithm* cur; - while (cur = *curPtr) { + while ((cur = *curPtr)) { if (cur->a_type == alg) { *curPtr = cur->a_next; return cur; } curPtr = &(cur->a_next); } --- mozart-1.4.0.orig/platform/dss/src/dgc_rl1.hh +++ mozart-1.4.0/platform/dss/src/dgc_rl1.hh @@ -31,7 +31,7 @@ #endif #include "dgc.hh" -#include "dss_rl_siteHandler.hh" +#include "dgc_rl_siteHandler.hh" namespace _dss_internal{ // Start namespace // // Reference Listing Version 1 --- mozart-1.4.0.orig/platform/dss/src/protocol_immediate.cc +++ mozart-1.4.0/platform/dss/src/protocol_immediate.cc @@ -57,11 +57,6 @@ } void - ProtocolImmediateProxy::remoteInitatedOperationCompleted(DssOperationId* opId, - PstOutContainerInterface* pstOut) - {;} - - void ProtocolImmediateProxy::msgReceived(MsgContainer *msg, DSite* u) {} OpRetVal @@ -72,7 +67,4 @@ ProtocolImmediateProxy::ProtocolImmediateProxy():ProtocolProxy(PN_IMMEDIATE){;} - void - ProtocolImmediateProxy::localInitatedOperationCompleted(){ ; } - } //end namespace --- mozart-1.4.0.orig/platform/dss/src/msl_comObj.cc +++ mozart-1.4.0/platform/dss/src/msl_comObj.cc @@ -57,7 +57,7 @@ namespace _msl_internal { //Start namespace - char *msl_mess_names[C_LAST] = { + const char *msl_mess_names[C_LAST] = { "conn_first_NOT_A_VALID_MESSAGETYPE", "conn_anon_present", "conn_init_present", @@ -138,18 +138,16 @@ e_timers(env->a_timers), a_msgAckTimeOut(0xFFFFFFFF), a_msgAckLength(0xFFFFFFFF), - a_lastrtt(-1), a_state(CLOSED), a_closeHardFlag(false), a_probing(false), - a_msgSentDuringProbeInterval(false), a_msgReceivedDuringProbeInterval(false), a_localRef(false), // Will be set true by the first send and false by gc a_remoteRef(false), - a_sentClearRef(false), // Introduced to correspond to the same variable as in the old DL - a_pred(NULL){ + a_sentClearRef(false) // Introduced to correspond to the same variable as in the old DL + { a_sec.a_ticket = 0; - dssLog(DLL_ALL,"COMMUNICATION: ComObject created"); + dssLog(DLL_MOST,"COMMUNICATION: ComObject created"); //printf("ComObject %p created\n",static_cast(this)); DebugCode(a_allocated++); } @@ -194,10 +192,8 @@ void ComObj::m_close() { clearTimers(); - a_lastrtt=-1; if(a_transObj){ - DssChannel* ch = a_transObj->m_closeConnection(); - ch->close(); // the channel object can be freed + a_transObj->m_closeConnection(); delete a_transObj; a_transObj=NULL; @@ -206,13 +202,6 @@ m_setCState(CLOSED); } - void ComObj::m_closeDownConnection() { // ZACHARIAS: Is this code correct?? - if(m_inState(OPENING_WF_PRESENT | OPENING_WF_NEGOTIATE | CLOSING_WEAK)) - a_closeHardFlag = true; - else if(m_inState(WORKING)) - m_WORKING_2_CLOSING_HARD(); - } - void ComObj::m_closeErroneousConnection(){ // What about the queues?: // a_queues->clearAll(); @@ -227,7 +216,6 @@ // So continue probing, and make sure that at least one message // is exchanged during the next probe interval. Send a ping if // necessary. - a_msgSentDuringProbeInterval = false; a_msgReceivedDuringProbeInterval = false; if (!a_queues->hasNeed()) { // possibly no communication m_send(new MsgCnt(C_PING, false), MSG_PRIO_LAZY); @@ -302,7 +290,6 @@ // Specials to opt imer management inline void ComObj::setProbeIntervalTimer(){ - a_msgSentDuringProbeInterval = false; a_msgReceivedDuringProbeInterval = true; sendProbePing(); if(a_probeIntervalTimer == NULL){ @@ -341,9 +328,6 @@ a_ackCanceled = true; } - - // Specifying priority -1 means accepting the default as in msgFormat.m4 and - // should allways be used. void ComObj::m_send(MsgCnt *msgC, int priority){ if(msgC == NULL) return ; @@ -399,14 +383,15 @@ // The returnvalue indicates whether it is wanted or not void ComObj::handover(DssChannel* tc) { if(a_state!=OPENING_WF_HANDOVER) { - tc->close(); // the channel object can be freed + tc->close(); + delete tc; return; } m_OPENING_WF_HANDOVER_2_OPENING_WF_PRESENT(tc); } void ComObj::handoverRoute(DSite *succSite[], int len) { - if (getState() != OPENING_WF_HANDOVER) { + if (a_state != OPENING_WF_HANDOVER) { printf("Ooops, route not taken, aborted by com\n"); return ; } @@ -758,6 +743,7 @@ m_open(); CLOSE: FAILURE: + dssLog(DLL_DEBUG,"Unexpected message type %d in state %d",mt,a_state); delete msgC; // A bit dangerous return false; } @@ -789,7 +775,6 @@ void ComObj::msgAcked(int num) { int rtt = a_queues->msgAcked(num, false, a_probing && a_state==WORKING); if (rtt != -1) { - a_lastrtt = rtt; a_site->m_getCsSite()->reportRTT(t_max(rtt, MSG_ACK_TIMEOUT)); } if (a_probing && a_state==WORKING) { // we are probing @@ -807,7 +792,6 @@ if(a_probing && !msgC->m_isInternalMsg()) { msgC->setSendTime(e_timers->currTime()); - a_msgSentDuringProbeInterval = true; } if(a_state==WORKING && !a_ackCanceled) // Acknowledgement is being sent clearAckTimer(); @@ -853,7 +837,7 @@ } void ComObj::connectionLost() { - dssLog(DLL_ALL,"COMMUNICATION (%p): Connection lost, state=%d",this, a_state); + dssLog(DLL_MOST,"COMMUNICATION (%p): Connection lost, state=%d",this, a_state); switch(a_state) { case CLOSING_HARD: case OPENING_WF_PRESENT: @@ -895,8 +879,6 @@ } } - int ComObj::getQueueStatus(){return a_queues->getQueueStatus();} - void ComObj::m_makeGCpreps(){ a_queues->gcMsgCs(); } bool ComObj::hasQueued() { return a_queues->hasQueued(); } @@ -910,7 +892,6 @@ void ComObj::clearTimers() { - //printf("clearTimers! %p, %p ,%p, %p\n", a_reopentimer, a_ackTimer ,a_probeIntervalTimer, a_probeFaultTimer ); e_timers->clearTimer(a_reopentimer); // here we could destroy the expiration times too. @@ -1044,7 +1025,7 @@ u32 ticket = dsrb->m_getInt(); Assert(a_sec.a_ticket == 0); - if(strncmp((char*) version2, (char*) dss_version, 3) == 0){ // ok send our data + if(memcmp(version2, dss_version, 3) == 0){ // ok send our data m_setCState(OPENING_WF_NEGOTIATE); @@ -1216,13 +1197,14 @@ if(dsrb != NULL && dsrb->canRead(1+3)){ dsrb->m_readOutBuffer(version2,3); - if(strncmp((char*) version2, (char*) dss_version, 3) == 0 && + if(memcmp(version2, dss_version, 3) == 0 && (dsrb->canRead(1+4)) && // SIZE OF DSITE ((s1 = a_mslEnv->a_siteHT->m_unmarshalSite(dsrb)) != NULL) && (s1->m_getFaultState() != FS_GLOBAL_PERM) ){ len = dsrb->m_getInt(); - if(dsrb->availableData() == len){ + Assert(len >= 0); + if(dsrb->availableData() == static_cast(len)){ cipher = new BYTE[len]; dsrb->readFromBuffer(cipher,len); dsrb->commitRead(len); @@ -1368,7 +1350,7 @@ void ComObj::m_CLOSING_WF_DISCONNECT_2_CLOSING_WF_REMOTE(){ m_close(); m_setCState(CLOSED_WF_REMOTE); - dssLog(DLL_ALL,"COMMUNICATION (%p): Closed remote, setting timer", this); + dssLog(DLL_MOST,"COMMUNICATION (%p): Closed remote, setting timer", this); e_timers->setTimer(a_reopentimer, (a_mslEnv->a_ipIsbehindFW)?a_mslEnv->m_getFirewallReopenTimeout():a_mslEnv->m_getReopenRemoteTimeout(), if_comObj_reopen, this); --- mozart-1.4.0.orig/platform/dss/src/protocol_migratory.cc +++ mozart-1.4.0/platform/dss/src/protocol_migratory.cc @@ -117,7 +117,7 @@ void ProtocolMigratoryManager::sendMigrateInfo(::MsgContainer* msg) { ProtocolManager::sendMigrateInfo(msg); - for (Position > p(a_chain); p(); p++) { + for (QueuePosition > p(a_chain); p(); p++) { msg->pushDSiteVal((*p).first); msg->pushIntVal((*p).second); } @@ -162,7 +162,7 @@ } case MIGM_TOKEN_HERE: { if (!isPermFail() && a_chain.front().find(sender)) { - Position > p(a_chain); + QueuePosition > p(a_chain); // remove all elements before sender while ((*p).first != sender) p.pop(); } @@ -180,7 +180,7 @@ case MIGM_FAILED_SUCC: { // a proxy notifies that its successor has failed if (!isPermFail()) { - Position > p(a_chain); + QueuePosition > p(a_chain); p.find(sender); p++; // p is on the sender's successor Assert(p()); p.remove(); // remove the successor @@ -206,7 +206,7 @@ // state (for the given request). if (!isPermFail()) { int reqid = msg->popIntVal(); - Position > p(a_chain); + QueuePosition > p(a_chain); if (p.find(sender) && (*p).second == reqid) { // drop all elements up to sender while (a_chain.pop().first != sender) ; @@ -227,9 +227,9 @@ // inquiry protocol around a failed proxy void ProtocolMigratoryManager::inquire(DSite* s) { - Position > cur(a_chain); + QueuePosition > cur(a_chain); bool found = false; - Position > other; + QueuePosition > other; // first try to find the closest non-failed predecessor while ((*cur).first != s) { @@ -330,7 +330,7 @@ Assert(!a_susps.isEmpty() || a_proxy->m_isHomeProxy()); // wake up all suspended threads while (!a_susps.isEmpty()) - a_susps.pop()->resumeDoLocal(NULL); // NULL is not cool... + a_susps.pop()->resumeDoLocal(); // forward the token if (a_successor) forwardToken(); --- mozart-1.4.0.orig/platform/dss/src/dss_templates.hh +++ mozart-1.4.0/platform/dss/src/dss_templates.hh @@ -47,136 +47,10 @@ template T1 t_min(const T1& t1, const T1& t2){ return ((t1 < t2) ? t1 : t2); } - - -// Note. OneContainer, TwoContainer, and their variants are not used -// anymore. They have been replaced by SimpleList and SimpleQueue, -// which are much less bug-prone. See below. - -// -// The Oncecontainer should be extended with non-defined functions such as -// - m_makeGCpreps() -// - Destructor -// - m_stringrep() - - // **************** One element Containers ********** - // - template - class OneContainer{ - public: - T1* const a_contain1; - OneContainer* a_next; - - public: - OneContainer(T1* const t, OneContainer* const n): - a_contain1(t), - a_next(n){ - }; - inline void m_makeGCpreps(){ a_contain1->m_makeGCpreps(); } - - MACRO_NO_DEFAULT_CONSTRUCTORS(OneContainer); - }; - - template - class OneTypeContainer{ - public: - T1 a_contain1; - OneTypeContainer* a_next; - - public: - OneTypeContainer(const T1& t, OneTypeContainer* const n): - a_contain1(t), - a_next(n){ - }; - inline void m_makeGCpreps(){}; - - MACRO_NO_DEFAULT_CONSTRUCTORS(OneTypeContainer); - }; - - - // **************** Two element Containers ********** - // - template - class TwoContainer{ - public: - T1* a_contain1; - T2 a_contain2; - TwoContainer* a_next; - - public: - - - TwoContainer(T1* const t1, const T2& t2, TwoContainer* const n): - a_contain1(t1), - a_contain2(t2), - a_next(n){ - }; - - inline bool operator==(const TwoContainer*& tc){ - return (tc->a_contain1 == a_contain1 && tc->a_contain2 == a_contain2); } - - inline void m_makeGCpreps(){ a_contain1->m_makeGCpreps(); } - ~TwoContainer(){}; - - MACRO_NO_DEFAULT_CONSTRUCTORS(TwoContainer); - }; - -template -class TwoClassContainer{ - public: - T1* a_contain1; - T2* a_contain2; - TwoClassContainer* a_next; - TwoClassContainer(T1* const t1, T2* const t2, TwoClassContainer* const n): - a_contain1(t1), - a_contain2(t2), - a_next(n){ - }; - inline void m_makeGCpreps(){ a_contain1->m_makeGCpreps(); a_contain2->m_makeGCpreps(); } - ~TwoClassContainer(){}; - }; - - template - class TwoTypeContainer{ - public: - T1 a_contain1; - T2 a_contain2; - TwoTypeContainer* a_next; - TwoTypeContainer(const T1& t1, const T2& t2, TwoTypeContainer* const n): - a_contain1(t1), - a_contain2(t2), - a_next(n){ - }; - inline void m_makeGCpreps(){} - ~TwoTypeContainer(){} - - MACRO_NO_DEFAULT_CONSTRUCTORS(TwoTypeContainer); - }; - - // ************* List Operators ***************** - // - - template - void t_forAllMeth(T1* head, void (T1::*fptr)()){ - while(head){ - (head->*fptr)(); - head = head->a_next; - } - } - - template - T2 t_foldMeth(T1* head, void (T1::*fptr)(T2), T2 arg){ - while(head){ - arg = (head->*fptr)(arg); - head = head->a_next; - } - return arg; - } - + //Yves: The two following procedures are still used by MsgCnt and by GCalgorithm. (2009.1.13) // ************* Garbage collect a list ************ // - template void t_gcList(T1* const head){ T1* tmp = head; @@ -202,156 +76,6 @@ } } - - template - void t_deleteListCont(T1*& head){ - while(head){ - T1* tmp = head; - head = head->a_next; - delete tmp->a_contain1; - delete tmp; - } - } - - - template - void t_deleteListAction(T1*& head, void (T1::*fptr)()){ - while(head){ - T1* tmp = head; - head = head->a_next; - (tmp->*fptr)(); - delete tmp; - } - } - - - // ************* Delete element from list ******************** - // - // - return whether the object was found in the list or not - // - safe to call with any pointer since it's const guarded - // - - template - bool t_deleteElement(T1** const headptr, T1* elem){ - T1** tmp = headptr; - while((*tmp) != NULL){ - if ((*tmp) != elem){ - tmp = &((*tmp)->a_next); - }else { - T1* tmpdel = (*tmp); - (*tmp) = (*tmp)->a_next; - delete tmpdel; - return true; - } - } - return false; - } - - // *********** Delete Element with container equal to ****** - // - // - return whether the object was found in the list or not - // - safe to call with any pointer since it's const guarded - // - - template - bool t_deleteCompare(T1** const headptr, T2* const compare){ - T1** tmp = headptr; - while((*tmp) != NULL){ - if ((*tmp)->a_contain1 != compare){ - tmp = &((*tmp)->a_next); - } else { - T1* tmpdel = (*tmp); - (*tmp) = (*tmp)->a_next; - delete tmpdel; - return true; - } - } - return false; - } - - // - // Same as above except that it removes all occurances with same - // element - // - -template -void t_deleteAllCompare(T1** const headptr, T2* const compare){ - T1** tmp = headptr; - while((*tmp) != NULL){ - if (compare != (*tmp)->a_contain){ - tmp = &((*tmp)->a_next); - } else { - T1* tmpdel = (*tmp); - (*tmp) = (*tmp)->a_next; - delete tmpdel; - } - } -} - - - - - - - - // ******************* SIMPLE FIFO QUEUE ***************** - // - // - Uses elements which has a "a_next" pointer and might do - // m_makeGCpreps() (if method not invoked this isn't tested either) - // - // !! Remember, the last elements "next"-ptr is never touched !! - // !! We say last element is when back and front is equal !! - // - template - class FifoQueue{ - private: - T1* a_front; - T1* a_back; - - FifoQueue& operator=(const FifoQueue& f); - public: - FifoQueue( FifoQueue& f): - a_front(f.a_front),a_back(f.a_back){ - f.a_back = NULL; - f.a_front = NULL; - }; - FifoQueue():a_front(NULL),a_back(NULL){}; - - - void append(T1* const t){ - if (a_front != NULL){ // empty - a_back->a_next = t; - a_back = t; - }else { - a_front = a_back = t; - } - t->a_next = NULL; - } - - T1* drop(){ - T1* tmp = a_front; - if(a_front == a_back) a_front = a_back = NULL; // tmp is last element - else a_front = a_front->a_next; // at least one element left (besides tmp) - return tmp; // Yes this might return NULL if the queue is empty - } - - T1* peek(){ return a_front;} - - bool isEmpty(){ return (a_front == NULL); } - - unsigned int m_size() { - int i = 0; - for (T1* tmp = a_front; tmp != NULL; tmp = tmp->a_next) i++; - return i; - } - - void m_makeGCpreps(){ t_gcList(a_front); } - - ~FifoQueue(){ t_deleteList(a_front); }; - }; - - - /******************** Templates added by raph ********************/ // Pairs can be used to make a list of tuples in general. The @@ -447,6 +171,7 @@ // in l; pos() returns true if pos is nonempty; *pos returns the // element; ++pos and pos++ shift to next position. void operator() (SimpleList &s) { init(s); } + void operator() (SimpleNode** p) { curPtr=p; } bool operator() () const { return hasElement(); } T& operator* () const { return element(); } Position operator++ (int) { next(); return *this; } @@ -461,9 +186,10 @@ class SimpleList { friend class Position; -private: +protected: SimpleNode* first; // the first node +private: SimpleList& operator=(const SimpleList&); SimpleList(const SimpleList&); @@ -517,11 +243,70 @@ (*p).first->m_makeGCpreps(); } +template +void t_gcList(SimpleQueue &list) { + t_gcList(static_cast&>(list)); +} + +template +class QueuePosition { +private: + SimpleNode** curPtr; // a pointer to a pointer to the current node + Position* afterlastP; +public: + void init(SimpleQueue &s) { curPtr = &(s.first); afterlastP=&(s.afterlast);} + + QueuePosition() : curPtr(NULL) {} + QueuePosition(SimpleQueue &s) : curPtr(&(s.first)), afterlastP(&(s.afterlast)) {} + QueuePosition(SimpleQueue *s) : curPtr(&(s->first)), afterlastP(&(s->afterlast)) {} + + // check whether the position is empty, and return the element + bool hasElement() const { return *curPtr; } + bool isEmpty() const { return !hasElement(); } + T& element() const { return (*curPtr)->elem; } + + // jump to next position + void next() { curPtr = &((*curPtr)->next); } + // remove the element at the current position + void remove() { + SimpleNode* node = *curPtr; + *curPtr = node->next; + if(!*curPtr){ + (*afterlastP)(curPtr); + } + delete node; + } + // remove and return the element at the current position + T pop() { T e = element(); remove(); return e; } + // find the position of an element (after-last position if not found) + bool find(T const &e) { + while (hasElement() && !(element() == e)) next(); + return hasElement(); + } + + // similar to the one above, but more convenient for pairs + template + bool find(T1 const &e1) { // find the pair whose first element is e1 + while (hasElement() && !(element().first == e1)) next(); + return hasElement(); + } + // basic operator overloading: pos(l) sets pos at the first position + // in l; pos() returns true if pos is nonempty; *pos returns the + // element; ++pos and pos++ shift to next position. + void operator() (SimpleQueue &s) { init(s); } + bool operator() () const { return hasElement(); } + T& operator* () const { return element(); } + QueuePosition operator++ (int) { next(); return *this; } + QueuePosition& operator++ () { next(); return *this; } + bool operator== (QueuePosition const &p) { return curPtr == p.curPtr; } +}; // An implementation of a FIFO queue template -class SimpleQueue : public SimpleList { +class SimpleQueue : private SimpleList { + friend void t_gcList<>(SimpleQueue&); + friend class QueuePosition; private: Position afterlast; // the after-last position, for appending @@ -537,6 +322,9 @@ Position rear() { return afterlast; } // queue operations: append(), peek(), and pop(). + void push(T const &e) { SimpleList::push(e); check();} + bool remove(T const &e) { bool ret=SimpleList::remove(e); check(); return ret;} + void append(T const &e) { afterlast.insert(e); } T& peek() { return front().element(); } T pop() { --- mozart-1.4.0.orig/platform/dss/src/dgc_rl_siteHandler.hh +++ mozart-1.4.0/platform/dss/src/dgc_rl_siteHandler.hh @@ -0,0 +1,65 @@ +/* + * Authors: + * Erik Klintskog (erikd@sics.se) + * + * Contributors: + * optional, Contributor's name (Contributor's email address) + * + * Copyright: + * Erik Klintskog, 1998 + * + * Last change: + * $Date: 2008-06-26 15:39:31 +0200 (Thu, 26 Jun 2008) $ by $Author: raph $ + * $Revision: 17003 $ + * + * This file is part of Mozart, an implementation + * of Oz 3: + * http://www.mozart-oz.org + * + * See the file "LICENSE" or + * http://www.mozart-oz.org/LICENSE.html + * for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL + * WARRANTIES. + * + */ +#ifndef __RL_SITE_HANDLER_HH +#define __RL_SITE_HANDLER_HH + +#ifdef INTERFACE +#pragma interface +#endif + +#include "dss_templates.hh" +#include "dssBase.hh" + +namespace _dss_internal{ // Start namespace + + // + // The siteHandler takes care of dsites for the two RL versions + // + + class SiteHandler{ + private: + SimpleList > a_siteList; + + SiteHandler(const SiteHandler&):a_siteList(){} + SiteHandler& operator=(const SiteHandler&){ return *this; } + + public: + SiteHandler(); + bool isEmpty() const; + + void modifyDSite(DSite* site, int no); + + void insertDSite(DSite* site) { modifyDSite(site,1); } + void removeDSite(DSite* site, int dec) { modifyDSite(site,0-dec); } + + void gcPreps(); // Must be run before gc-ing of sites + + virtual ~SiteHandler() {} + }; + +} + +#endif --- mozart-1.4.0.orig/platform/dss/src/msl_endRouter.hh +++ mozart-1.4.0/platform/dss/src/msl_endRouter.hh @@ -37,7 +37,6 @@ namespace _msl_internal{ //Start namespace class RouteTransController; - class DataAreaContainer; class EndRouterDeliver; class EndRouter: public BufferedTransObj { @@ -58,7 +57,7 @@ EndRouter(MsgnLayerEnv*); virtual ~EndRouter() {} - virtual DssChannel *m_closeConnection(); + virtual void m_closeConnection(); virtual void deliver(); virtual void readyToReceive(); --- mozart-1.4.0.orig/platform/dss/src/protocol_once_only.hh +++ mozart-1.4.0/platform/dss/src/protocol_once_only.hh @@ -98,11 +98,6 @@ virtual int getMarshaledSize() const { return 1; } virtual bool m_initRemoteProt(DssReadBuffer*); - virtual void - remoteInitatedOperationCompleted(DssOperationId* opId, - ::PstOutContainerInterface* pstOut) {} - virtual void localInitatedOperationCompleted() { Assert(0); } - // check fault state virtual FaultState siteStateChanged(DSite*, const FaultState&); }; --- mozart-1.4.0.orig/platform/dss/src/referenceConsistency.cc +++ mozart-1.4.0/platform/dss/src/referenceConsistency.cc @@ -28,15 +28,12 @@ #pragma implementation "referenceConsistency.hh" #endif -#include "msl_serialize.hh" #include "referenceConsistency.hh" #include "coordinator.hh" #include "dss_templates.hh" // Include algs #include "dgc_fwrc.hh" -#include "dgc_irc.hh" -#include "dgc_rc.hh" #include "dgc_rl1.hh" #include "dgc_rl2.hh" #include "dgc_tl.hh" @@ -89,42 +86,19 @@ case RC_ALG_TL: gf_UnmarshalNumber(bs); break; case RC_ALG_RLV1: break; case RC_ALG_RLV2: break; - case RC_ALG_RC: break; - case RC_ALG_IRC: gf_Unmarshal8bitInt(bs); break; default: Assert(0); dssError("cleanType got illegal type (%d)\n",type); break; } } - -// void Reference::sf_cleanBuffer( DSS_Environment* env, DssReadBuffer* bs) { -// env->a_msgnLayer->m_UnmarshalDSite(bs); -// gf_UnmarshalNumber(bs); -// int len = gf_Unmarshal8bitInt(bs); // 1: load length -// for(int i = 0; i < len; i++){ // For all marshaled algorithms -// RCalg type = static_cast(gf_Unmarshal8bitInt(bs) << 8); // 2: load type, see m_buildAlgs -// Assert((type == RC_ALG_WRC) || -// (type == RC_ALG_TL) || -// (type == RC_ALG_RC) || -// (type == RC_ALG_RLV1)|| -// (type == RC_ALG_RLV2)|| -// (type == RC_ALG_IRC) -// ); -// sf_cleanType(type,bs); -// } -// } - - RCalg Reference::m_msgToGcAlg(MsgContainer *msgC, DSite* fromsite) { RCalg type = static_cast(msgC->popIntVal()); // need type for pushing alg_removed Assert((type == RC_ALG_WRC) || (type == RC_ALG_TL) || - (type == RC_ALG_RC) || (type == RC_ALG_RLV1)|| - (type == RC_ALG_RLV2)|| - (type == RC_ALG_IRC) + (type == RC_ALG_RLV2) ); GCalgorithm *tmp = m_findAlg(type); if (tmp){ @@ -146,10 +120,8 @@ Reference::m_removeAlgorithmType(const RCalg& atype){ Assert((atype == RC_ALG_WRC) || (atype == RC_ALG_TL) || - (atype == RC_ALG_RC) || (atype == RC_ALG_RLV1)|| - (atype == RC_ALG_RLV2)|| - (atype == RC_ALG_IRC) + (atype == RC_ALG_RLV2) ); GCalgorithm **tmp = &a_algs; while((*tmp)!=NULL) { @@ -183,10 +155,8 @@ if(!(gc_annot & RC_ALG_PERSIST)){ // If not persistent, add algs if(gc_annot & RC_ALG_WRC) a_algs = new WRC_Home(this,a_algs,m_getEnvironment()->a_dssconf.gc_wrc_alpha); if(gc_annot & RC_ALG_TL) a_algs = new TL_Home(this,a_algs,m_getEnvironment()->a_dssconf.gc_tl_leaseTime); - if(gc_annot & RC_ALG_RC) a_algs = new RC_Home(this,a_algs); if(gc_annot & RC_ALG_RLV1) a_algs = new RLV1_Home(this,a_algs); if(gc_annot & RC_ALG_RLV2) a_algs = new RLV2_Home(this,a_algs); - if(gc_annot & RC_ALG_IRC) a_algs = new IRC_Home(this,a_algs); Assert(a_algs != NULL); //Else the glue made us persistent "accidentaly" } } @@ -197,7 +167,7 @@ HomeReference::m_isRoot(){ dssLog(DLL_DEBUG,"HomeReference::isRoot"); for(GCalgorithm *tmp = a_algs; tmp != NULL; tmp = tmp->a_next){ - dssLog(DLL_ALL," checking alg %d",tmp->a_type); + dssLog(DLL_MOST," checking alg %d",tmp->a_type); if (!tmp->m_isRoot()) return false; } dssLog(DLL_DEBUG," ROOT!\n"); @@ -320,10 +290,8 @@ switch(type){ case RC_ALG_WRC: a_algs = new WRC_Remote(this,bs,a_algs, m_getEnvironment()->a_dssconf.gc_wrc_alpha); break; case RC_ALG_TL: a_algs = new TL_Remote(this,bs,a_algs, m_getEnvironment()->a_dssconf.gc_tl_updateTime); break; - case RC_ALG_RC: a_algs = new RC_Remote(this,bs,a_algs); break; case RC_ALG_RLV1: a_algs = new RLV1_Remote(this,bs,a_algs); break; case RC_ALG_RLV2: a_algs = new RLV2_Remote(this,bs,a_algs); break; - case RC_ALG_IRC: a_algs = new IRC_Remote(this,bs,a_algs); break; default: dssError("Remote Reference found illegal type (%d), check buffer space\n",type); Assert(0); --- mozart-1.4.0.orig/platform/dss/src/msl_crypto.cc +++ mozart-1.4.0/platform/dss/src/msl_crypto.cc @@ -47,13 +47,6 @@ T tmp = t1; t1 = t2; t2 = tmp; } - inline void gf_printBuf(BYTE* const buf, size_t len){ - for(unsigned int i = 0; i< len; ++i){ - printf("%02x",static_cast(buf[i])); - } - printf("\n"); - } - // Create an integer2char, taking int and BYTE* inline void gf_integer2char(BYTE* const buf, const u32& e){ #ifdef BIG_ENDIAN_HOST @@ -482,7 +475,6 @@ gf_integer2char(ptr, len); ptr += 4; // store length //printf("ENCRYPTION(%02d): %d data into %d frames and %d padding\n",ctr,len,frames,padding); - //gf_printBuf("inbuf",inbuf,len); if (frames > 1){ --frames; @@ -503,7 +495,6 @@ generate_garbage(ptr, padding); scramble(endptr,plain); endptr += CIPHER_BLOCK_BYTES; - //gf_printBuf("outbuf",outbuf,(endptr - outbuf)); return (endptr - outbuf); } @@ -523,7 +514,7 @@ padding = frames * PLAIN_BLOCK_BYTES - (len + 4); - //printf("DECRYPTION(%02d) %d data, from %d buffer, into %d frames and %d padding\n",ctr, len,inlen,frames,padding); gf_printBuf("inbuf",inbuf - CIPHER_BLOCK_BYTES,inlen); + //printf("DECRYPTION(%02d) %d data, from %d buffer, into %d frames and %d padding\n",ctr, len,inlen,frames,padding); //test that it seems to contain correct length if (len > inlen || static_cast(frames) != frame_est(len)) return -1; --- mozart-1.4.0.orig/platform/dss/src/dss_msgLayerInterface.hh +++ mozart-1.4.0/platform/dss/src/dss_msgLayerInterface.hh @@ -58,7 +58,6 @@ M_PROXY_COORD_NODEST, M_COORD_COORD_NODEST, - M_DKS_MSG, M_LAST }; @@ -112,9 +111,6 @@ PstContainer(const PstContainer&):DSS_Environment_Base(NULL), a_pstOut(NULL), a_pstIn(NULL){} PstContainer& operator=(const PstContainer&){ return *this; } }; - - - class RefCntdBuffer; class SimpleBlockBuffer{ public: @@ -131,37 +127,6 @@ MACRO_NO_DEFAULT_CONSTRUCTORS(SimpleBlockBuffer); }; - // A container class that takes a pstout as argument and isntantly masrhals it into - // a serialzied representation. Replicas of the container can be created, that all - // uses the same serilized representation. Thus the cost of marshaling is keept to O(1) - // even if multiple copies of the pst is to be sent to remote nodes(i.e. broadcast). - // However, the current version marshals in "file" mode, i.e. all entities are made - // persistent. - // - // Unmarshaling is only done when the m_getPstIn method is called. It is thus - // safe to receive a container withot building a structure on the PS-heap. - - class PstDataContainer:public ExtDataContainerInterface, public DSS_Environment_Base{ - public: - PstDataContainer(DSS_Environment*, PstOutContainerInterface**&); - PstDataContainer(DSS_Environment*, RefCntdBuffer*); - PstDataContainer(DSS_Environment*); - virtual ~PstDataContainer(); - PstInContainerInterface* m_getPstIn(); - PstDataContainer* m_createReplica(); - public: - virtual BYTE getType(); - virtual bool marshal(DssWriteBuffer *bb); - virtual bool unmarshal(DssReadBuffer *bb); - virtual void dispose(); - virtual void resetMarshaling(); - private: - RefCntdBuffer *a_cntdBuf; - BYTE* a_cur; - MACRO_NO_DEFAULT_CONSTRUCTORS(PstDataContainer); - }; - - class EdcByteArea:public ExtDataContainerInterface{ public: EdcByteArea(SimpleBlockBuffer*); @@ -184,7 +149,7 @@ SimpleBlockBuffer *a_curBuf; BYTE *a_cur; public: - virtual int availableSpace() const; + virtual size_t availableSpace() const; virtual bool canWrite(size_t len) const {return this->availableSpace()>=len;} virtual void writeToBuffer(const BYTE* ptr, size_t len); virtual void putByte(const BYTE& b); @@ -194,19 +159,10 @@ MACRO_NO_DEFAULT_CONSTRUCTORS(InfiniteWriteBuffer); }; - - - - - enum AppDataContainerType{ ADCT_PST, - ADCT_PDC, - ADCT_LMC, ADCT_EBA }; - - void gf_pushEBA(MsgContainer*, EdcByteArea* ); EdcByteArea* gf_popEBA(MsgContainer*); --- mozart-1.4.0.orig/platform/dss/src/msl_crypto.hh +++ mozart-1.4.0/platform/dss/src/msl_crypto.hh @@ -33,7 +33,7 @@ // comment this line to disable actual encryption //#define CRYPTO_ENABLED - +#include #include #include #include --- mozart-1.4.0.orig/platform/dss/src/protocol_migratory.hh +++ mozart-1.4.0/platform/dss/src/protocol_migratory.hh @@ -116,14 +116,11 @@ ::PstOutContainerInterface**&); virtual OpRetVal operationRead(GlobalThread*, PstOutContainerInterface**&); virtual OpRetVal operationWrite(GlobalThread*, PstOutContainerInterface**&); + virtual OpRetVal operationWrite(PstOutContainerInterface**&x){return ProtocolProxy::operationWrite(x);}; void makeGCpreps(); void msgReceived(::MsgContainer*,DSite*); - void remoteInitatedOperationCompleted(DssOperationId* opId, - ::PstOutContainerInterface* pstOut){} - void localInitatedOperationCompleted(){ Assert(0); } - // check fault state virtual FaultState siteStateChanged(DSite*, const FaultState&); }; --- mozart-1.4.0.orig/platform/dss/src/protocol_simple_channel.cc +++ mozart-1.4.0/platform/dss/src/protocol_simple_channel.cc @@ -129,32 +129,14 @@ return false; } - // used for resuming callbacks when they are not atomic - class RemoteOperation : public DssOperationId { - public: - DSite* sender; - GlobalThread* caller; - RemoteOperation(DSite* s, GlobalThread* t) : sender(s), caller(t) {} - }; - // perform an operation for a remote proxy (use NULL as sender for // asynchronuous operations) void ProtocolSimpleChannelProxy::do_operation(DSite* sender, GlobalThread* caller, AbsOp aop, PstInContainerInterface* arg) { - RemoteOperation* op = new RemoteOperation(sender, caller); PstOutContainerInterface* ans = NULL; - if (a_proxy->m_doe(aop, caller, op, arg, ans) == AOCB_FINISH) - ProtocolSimpleChannelProxy::remoteInitatedOperationCompleted(op, ans); - } - - void - ProtocolSimpleChannelProxy::remoteInitatedOperationCompleted(DssOperationId* opId, - ::PstOutContainerInterface* pstOut) - { - RemoteOperation* op = static_cast(opId); - if (op->sender) sendToProxy(op->sender, SC_RETURN, op->caller, pstOut); - delete op; + a_proxy->m_doe(aop, caller, arg, ans); + if (sender) sendToProxy(sender, SC_RETURN, caller, ans); } void --- mozart-1.4.0.orig/platform/dss/src/coordinator.hh +++ mozart-1.4.0/platform/dss/src/coordinator.hh @@ -116,9 +116,9 @@ inline Proxy *m_getProxy() const { return a_proxy; } // ************* DOE Abstraction* *************** // used to shortcut the coordinator-proxy connection when at the same process. - AOcallback m_doe(const AbsOp& aop, DssThreadId* thid, DssOperationId*, - ::PstInContainerInterface* builder, - ::PstOutContainerInterface*& ); + void m_doe(const AbsOp& aop, DssThreadId* thid, + ::PstInContainerInterface* builder, + ::PstOutContainerInterface*& ); ::PstOutContainerInterface* retrieveEntityState(); ::PstOutContainerInterface* deinstallEntityState(); @@ -253,9 +253,9 @@ // ************* DOE Abstraction* *************** - AOcallback m_doe(const AbsOp& aop, DssThreadId* thid, - DssOperationId*, ::PstInContainerInterface* builder, - ::PstOutContainerInterface*& ); + void m_doe(const AbsOp& aop, DssThreadId* thid, + ::PstInContainerInterface* builder, + ::PstOutContainerInterface*& ); ::PstOutContainerInterface* retrieveEntityState(); ::PstOutContainerInterface* deinstallEntityState(); --- mozart-1.4.0.orig/platform/dss/src/protocol_sited.hh +++ mozart-1.4.0/platform/dss/src/protocol_sited.hh @@ -64,9 +64,6 @@ virtual OpRetVal operationWrite(GlobalThread*, PstOutContainerInterface**&); virtual OpRetVal operationWrite(PstOutContainerInterface**&); - void remoteInitatedOperationCompleted(DssOperationId*, PstOutContainerInterface*) { Assert(0); } - void localInitatedOperationCompleted() { Assert(0); } - void msgReceived(::MsgContainer*,DSite*) {} // check fault state --- mozart-1.4.0.orig/platform/dss/src/dss_msgLayerInterface.cc +++ mozart-1.4.0/platform/dss/src/dss_msgLayerInterface.cc @@ -30,12 +30,9 @@ #include "dss_comService.hh" #include "dssBase.hh" #include "coordinator.hh" -#include "DKSNode.hh" #include "dss_msgLayerInterface.hh" #include "dss_threads.hh" -#include "dss_psDKS.hh" #include -#include "msl_serialize.hh" namespace _dss_internal{ @@ -202,12 +199,6 @@ if(me) me->m_noCoordAtDest(sender, mtt, msg); break; } - - case M_DKS_MSG: - { - m_getEnvironment()->a_dksInstHT->m_redirectMessage(msgC, sender); - break; - } default: m_getEnvironment()->a_map->GL_error("siteReceive: unknown message %d",mt); break; @@ -221,30 +212,17 @@ DssMslClbk::m_stateChange(DSite* s, const FaultState& state){ m_getEnvironment()->a_proxyTable->m_siteStateChange(s, state); m_getEnvironment()->a_coordinatorTable->m_siteStateChange(s, state); - - // printf("DKS - SiteStateChange comment out\n"); - // m_getEnvironment()->a_dksInstHT->m_siteStateChane(s, state); } void DssMslClbk::m_unsentMessages(DSite* s, MsgContainer* msgs){ - MsgContainer *tmp; //, *dks_msgs = NULL; + MsgContainer *tmp; while(msgs!=NULL) { - // if(msgs->popIntVal() == M_DKS_MSG) - // { - // tmp = msgs->a_next; - // msgs->a_next = dks_msgs; - // dks_msgs = msgs; - // } - // else - // { tmp = msgs->m_getNext(); delete msgs; - // } msgs = tmp; } - //m_getEnvironment()->a_kbrService->m_unsentMessages(s, dks_msgs); } DssMslClbk::DssMslClbk(DSS_Environment *env):DSS_Environment_Base(env){ @@ -252,9 +230,6 @@ } DssMslClbk::~DssMslClbk(){;} - - ExtDataContainerInterface* createLrgMsgContainer(DSS_Environment*); - ExtDataContainerInterface* DssMslClbk::m_createExtDataContainer(BYTE type){ switch(type){ @@ -262,22 +237,6 @@ { return new PstContainer(m_getEnvironment()); } - case ADCT_DKS_RT: - { - return createDksRoutingTableContainer(m_getEnvironment()->a_msgnLayer); - } - case ADCT_DKS_SV: - { - return createDksSiteVecContainer(m_getEnvironment()->a_msgnLayer); - } - case ADCT_PDC: - { - return new PstDataContainer(m_getEnvironment()); - } - case ADCT_LMC: - { - return createLrgMsgContainer(m_getEnvironment()); - } case ADCT_EBA: { return new EdcByteArea(NULL); @@ -379,14 +338,7 @@ } - // ******************* PstDataContainer ************************ - // RefCntdBuffer* a_buffer; - // BYTE* a_curr; - - - - - int + size_t InfiniteWriteBuffer::availableSpace() const { return 10000; // he, he, he } @@ -433,60 +385,6 @@ return a_curBuf; } - - class RefCntdBuffer{ - int a_refCnt; - static int allocated; - SimpleBlockBuffer* a_buf; - PstOutContainerInterface* a_out; - public: - - RefCntdBuffer(int sz): - a_refCnt(1), a_buf(new SimpleBlockBuffer(sz)), a_out(NULL) - { - ; - } - - RefCntdBuffer(PstOutContainerInterface**& out): - a_refCnt(1), a_buf(NULL), a_out(reinterpret_cast(0xbedda)) - { - printf("Creating rcb:%p tot:%d\n", this, ++allocated); - out = &a_out; - } - - ~RefCntdBuffer(){ - printf("Deleteing rcb:%p tot:%d\n", this, --allocated); - if(a_buf) delete a_buf; - a_buf = NULL; - } - - - SimpleBlockBuffer* m_getBuffer(){ - if(a_buf == NULL) - { - InfiniteWriteBuffer *iw = new InfiniteWriteBuffer(); - bool done = a_out->marshal(iw); - Assert(done); - a_buf = iw->m_getBuffer(); - printf("marshalDone size:%d\n", a_buf->a_end- a_buf->a_vec); - - delete iw; - } - return a_buf; - } - - void m_addRef(){ a_refCnt++;} - void m_delRef(){ if(--a_refCnt == 0) delete this;} - }; - - - - - int RefCntdBuffer::allocated = 0; - - - - class ReadBlockBuffer: public DssReadBuffer{ BYTE* a_cur; BYTE* a_end; @@ -496,11 +394,12 @@ } ~ReadBlockBuffer(){;} - virtual int availableData() const{ + virtual size_t availableData() const{ return a_end - a_cur; } virtual bool canRead(size_t len) const{ - return a_end - a_cur>=len; + Assert(a_end >= a_cur); + return static_cast(a_end - a_cur)>=len; } virtual void readFromBuffer(BYTE* ptr, size_t len){ memcpy(ptr,a_cur,len); @@ -514,89 +413,6 @@ }; - // Called when creating a completly new container - PstDataContainer::PstDataContainer(DSS_Environment* env, PstOutContainerInterface** &pst): - DSS_Environment_Base(env),a_cntdBuf(new RefCntdBuffer(pst)), a_cur(NULL){ - } - - // Called when creating a replica - PstDataContainer::PstDataContainer(DSS_Environment* env, RefCntdBuffer* buf): - DSS_Environment_Base(env), a_cntdBuf(buf),a_cur(NULL){ - buf->m_addRef(); - } - - // Called when unmarshaling a container - PstDataContainer::PstDataContainer(DSS_Environment* env): - DSS_Environment_Base(env), a_cntdBuf(NULL), a_cur(NULL){ - ; - } - - PstDataContainer::~PstDataContainer(){ - if(a_cntdBuf) - a_cntdBuf->m_delRef(); - a_cntdBuf = NULL; - } - - PstInContainerInterface* PstDataContainer::m_getPstIn(){ - // raph: this operation might leak memory (the returned - // PstInContainerInterface will not be disposed). - Assert(0); - PstInContainerInterface* pstIn = m_getEnvironment()->a_map->createPstInContainer(); - ReadBlockBuffer rb(a_cntdBuf->m_getBuffer()); - pstIn->unmarshal(&rb); - return pstIn; -} - - PstDataContainer* PstDataContainer::m_createReplica(){ - return new PstDataContainer(m_getEnvironment(), a_cntdBuf); - } - - BYTE PstDataContainer::getType(){ - return ADCT_PDC; - } - - bool PstDataContainer::marshal(DssWriteBuffer *bb){ - // We could potentially check the value of the pst pointer - // if set to a dummy value, we could suspend serialization and - // continue when teh pst is completley filled in.... Coool!!! - SimpleBlockBuffer *buf = a_cntdBuf->m_getBuffer(); - if (a_cur == NULL){ - a_cur = buf->a_vec; - gf_MarshalNumber(bb, buf->a_end-buf->a_vec); - printf("marshaling, RCB totSize %d\n", buf->a_end-buf->a_vec); - } - - int marshalSize = t_min(bb->availableSpace() - 40, buf->a_end- a_cur); - printf("marshaling, RCB blockSize %d\n", marshalSize); - gf_MarshalNumber(bb, marshalSize); - bb->writeToBuffer(a_cur, marshalSize); - a_cur+=marshalSize; - return a_cur == buf->a_end; - } - - bool PstDataContainer::unmarshal(DssReadBuffer *bb){ - if(a_cur == NULL){ - int size = gf_UnmarshalNumber(bb); - printf("unmarshaling, RCB totSize %d\n", size); - a_cntdBuf = new RefCntdBuffer(size); - a_cur = a_cntdBuf->m_getBuffer()->a_vec; - } - int marshalSize = gf_UnmarshalNumber(bb); - printf("unmarshaling, RCB blockSize %d\n", marshalSize); - bb->readFromBuffer(a_cur, marshalSize); - bb->commitRead(marshalSize); - a_cur += marshalSize; - return (a_cur == a_cntdBuf->m_getBuffer()->a_end) ; - } - - void PstDataContainer::dispose(){ - delete this; - } - void PstDataContainer::resetMarshaling(){ - a_cur = NULL; - } - - // ********************** EdcByteArea ********************** EdcByteArea::EdcByteArea(SimpleBlockBuffer *bb):a_buffer(bb), a_cur(NULL){;} @@ -614,9 +430,11 @@ gf_MarshalNumber(bb, a_buffer->a_end - a_buffer->a_vec); printf("marshaling, EBA totSize %d\n", a_buffer->a_end - a_buffer->a_vec); } - - int marshalSize = t_max(0, t_min(bb->availableSpace() - 40, a_buffer->a_end- a_cur)); - printf("marshaling, EBC blockSize %d\n", marshalSize); + size_t marshalSize = (bb->availableSpace() > 40 ? + t_min(bb->availableSpace() - 40, + static_cast(a_buffer->a_end- a_cur)) : + 0); + printf("marshaling, EBC blockSize %zu\n", marshalSize); gf_MarshalNumber(bb, marshalSize); bb->writeToBuffer(a_cur, marshalSize); a_cur+=marshalSize; --- mozart-1.4.0.orig/platform/dss/include/dss_classes.hh +++ mozart-1.4.0/platform/dss/include/dss_classes.hh @@ -28,7 +28,7 @@ #ifndef __DSS_CLASSES_HH #define __DSS_CLASSES_HH -#ifdef INTERFACE +#ifdef DSS_INTERFACE #pragma interface #endif @@ -59,15 +59,6 @@ //****************************** Not in the documantation yet ************************* - - -// Used to identify an operation -class DSSDLLSPEC DssOperationId { -public: - DssOperationId() {} -}; - - // A ThreadMediator is used to provide the DSS an interface to a // suspended operation in the programming system. The operation can // be resumed in one of three ways: @@ -78,9 +69,9 @@ public: ThreadMediator(); virtual ~ThreadMediator() {} - virtual WakeRetVal resumeDoLocal(DssOperationId*)=0; - virtual WakeRetVal resumeRemoteDone(PstInContainerInterface* pstin)=0; - virtual WakeRetVal resumeFailed()=0; + virtual void resumeDoLocal()=0; + virtual void resumeRemoteDone(PstInContainerInterface* pstin)=0; + virtual void resumeFailed()=0; }; @@ -134,11 +125,6 @@ CoordinatorAssistant* getCoordinatorAssistant() const { return a_proxy; } void setCoordinatorAssistant(CoordinatorAssistant*); - // notify the resumption of programming system operations to the DSS - void remoteInitatedOperationCompleted(DssOperationId*, - PstOutContainerInterface*); - void localInitatedOperationCompleted(); - // abstract operation Kill - try to make the fault state permfail. // This operation is asynchronous, and not guaranteed to succeed. // Monitor requests to notify failures eagerly to this proxy. @@ -199,14 +185,12 @@ OpRetVal abstractOperation_Write(DssThreadId*, PstOutContainerInterface**&); /************************* SUPPLIED BY USER *************************/ - virtual AOcallback callback_Write(DssThreadId* id_of_calling_thread, - DssOperationId* operation_id, - PstInContainerInterface* operation, - PstOutContainerInterface*& answer)=0; - virtual AOcallback callback_Read(DssThreadId* id_of_calling_thread, - DssOperationId* operation_id, - PstInContainerInterface* operation, - PstOutContainerInterface*& answer)=0; + virtual void callback_Write(DssThreadId* id_of_calling_thread, + PstInContainerInterface* operation, + PstOutContainerInterface*& answer)=0; + virtual void callback_Read(DssThreadId* id_of_calling_thread, + PstInContainerInterface* operation, + PstOutContainerInterface*& answer)=0; }; @@ -220,13 +204,11 @@ OpRetVal abstractOperation_Write(PstOutContainerInterface**&); /************************* SUPPLIED BY USER *************************/ - virtual AOcallback callback_Write(DssThreadId* id_of_calling_thread, - DssOperationId* operation_id, - PstInContainerInterface* operation)=0; - virtual AOcallback callback_Read(DssThreadId* id_of_calling_thread, - DssOperationId* operation_id, - PstInContainerInterface* operation, - PstOutContainerInterface*& answer)=0; + virtual void callback_Write(DssThreadId* id_of_calling_thread, + PstInContainerInterface* operation)=0; + virtual void callback_Read(DssThreadId* id_of_calling_thread, + PstInContainerInterface* operation, + PstOutContainerInterface*& answer)=0; }; @@ -240,14 +222,11 @@ OpRetVal abstractOperation_Append(DssThreadId*, PstOutContainerInterface**&); /************************* SUPPLIED BY USER *************************/ - virtual AOcallback callback_Bind(DssOperationId* operation_id, - PstInContainerInterface* operation) = 0; - virtual AOcallback callback_Append(DssOperationId* operation_id, - PstInContainerInterface* operation) = 0; + virtual void callback_Bind(PstInContainerInterface* operation) = 0; + virtual void callback_Append(PstInContainerInterface* operation) = 0; // summarize past Append operations; the answer (if given) is sent // to a new proxy as one single Append operation. - virtual AOcallback callback_Changes(DssOperationId* operation_id, - PstOutContainerInterface*& answer)=0; + virtual void callback_Changes(PstOutContainerInterface*& answer)=0; }; @@ -260,11 +239,10 @@ OpRetVal abstractOperation_Read(DssThreadId*, PstOutContainerInterface**&); /************************* SUPPLIED BY USER *************************/ - virtual AOcallback callback_Read(DssThreadId* id_of_calling_thread, - DssOperationId* operation_id, - PstInContainerInterface* operation, - PstOutContainerInterface*& answer)=0; - + virtual void callback_Read(DssThreadId* id_of_calling_thread, + PstInContainerInterface* operation, + PstOutContainerInterface*& answer)=0; + // Note. The programming system may want to localize the entity // once its state has been installed. However it should not delete // the abstract entity before all suspended read operations have @@ -364,44 +342,5 @@ }; - -class DSSDLLSPEC GlobalNameInterface{ -protected: - void* a_ref; - virtual ~GlobalNameInterface() {} -public: - GlobalNameInterface(void*& ref) : a_ref(ref) {} - void setRef(void* ref) { a_ref = ref;} - void* getRef(){ return a_ref; } - virtual void marshal(DssWriteBuffer* bb)=0; - - MACRO_NO_DEFAULT_CONSTRUCTORS(GlobalNameInterface); -}; - - -class DSSDLLSPEC KbrCallbackInterface{ -public: - virtual ~KbrCallbackInterface() {} - virtual void m_kbrMessage(int key, PstInContainerInterface*) = 0; - virtual PstOutContainerInterface* m_kbrDivideResp(int start, int stop, int n) = 0; - virtual void m_kbrNewResp(int start, int stop, int n, PstInContainerInterface*) = 0; - virtual void m_kbrFunctional() = 0; - virtual void m_bcMessage(PstInContainerInterface*) = 0; -}; - -class DSSDLLSPEC KbrInstance{ -protected: - virtual ~KbrInstance() {} -public: - virtual void m_setCallback(KbrCallbackInterface*) = 0; - virtual KbrCallbackInterface* m_getCallback() = 0; - virtual KbrResult m_route(int, PstOutContainerInterface*) = 0; - virtual KbrResult m_broadcast(PstOutContainerInterface*) = 0; - virtual int m_getId() = 0; - virtual void m_join() = 0; - virtual void m_leave() = 0; - virtual void m_marshal(DssWriteBuffer*) = 0; -}; - #endif --- mozart-1.4.0.orig/platform/dss/include/dss_comService.hh +++ mozart-1.4.0/platform/dss/include/dss_comService.hh @@ -28,7 +28,7 @@ #ifndef __DSS_COMSERVICE_HH #define __DSS_COMSERVICE_HH -#ifdef INTERFACE +#ifdef DSS_INTERFACE #pragma interface #endif @@ -74,7 +74,7 @@ virtual ~DssReadBuffer() {} public: - virtual int availableData() const = 0; + virtual size_t availableData() const = 0; virtual bool canRead(size_t wanted) const = 0; // Read out data which should be deserialized. Assumes available @@ -90,7 +90,7 @@ virtual ~DssWriteBuffer() {} public: - virtual int availableSpace() const = 0; + virtual size_t availableSpace() const = 0; virtual bool canWrite(size_t wanted) const = 0; // ZACHARIAS: Check available space before writing, I know it did @@ -103,30 +103,52 @@ // ************** BUFFER METHODS ************** -const int SIZE_INT = 4; +#ifdef DEBUG_CHECK +#define DSSAssert(Cond) if(!(Cond)){ dssAssert(__FILE__,__LINE__,#Cond); } +//Copied from src/base.hh +void dssAssert(const char* const file, const int& line, const char* const condition); +#endif -inline void putInt(DssWriteBuffer* const buf, int i){ - for (int k=0; kputByte((i & 0xFF)); - i = i>>8; - } +inline void gf_Marshal8bitInt(DssWriteBuffer *bs, unsigned int i){ +#ifdef DEBUG_CHECK + DSSAssert((i & 0xFF) == i); +#endif + bs->putByte(static_cast(i)); } -inline int getInt(DssReadBuffer* const buf){ - int i = 0; - for (int k=0; k < SIZE_INT; ++k) { - i = i + ((buf->getByte())<<(k*8)); +inline int gf_Unmarshal8bitInt(DssReadBuffer *bs){ + return static_cast(bs->getByte()); +} + +const int sz_MNumberMax = 5; + +static const unsigned int SSBit = 1<<7; +inline int gf_UnmarshalNumber(DssReadBuffer *bs){ + unsigned int ret = 0, shft = 0; + unsigned int c = bs->getByte(); + while (c >= SSBit) { + ret += ((c-SSBit) << shft); + c = bs->getByte(); + shft += 7; } - return static_cast(i); + ret |= (c<= SSBit) { + bs->putByte((i%SSBit)|SSBit); + i /= SSBit; + } + bs->putByte(i); +} const int MSG_PRIO_EAGER = 4; -const int MSG_PRIO_LAZY = 0; -const int MSG_PRIO_HIGH = 3; +const int MSG_PRIO_HIGH = 3; //Used only for routing messages (indirect connections) const int MSG_PRIO_MEDIUM = 2; -const int MSG_PRIO_LOW = 1; +const int MSG_PRIO_LOW = 1; //Not used for now/anymore +const int MSG_PRIO_LAZY = 0; @@ -147,7 +169,7 @@ virtual int read(void* buf, const unsigned int& len) = 0; virtual int write(void* buf, const unsigned int& len) = 0; - // close the channel; the object can be deleted at this point + // close the channel virtual void close() = 0; }; @@ -192,7 +214,6 @@ virtual void m_monitorRTT(int maxrtt) = 0; virtual void m_stateChange(FaultState newState) = 0; - virtual void m_takeDownConnection() = 0; virtual ConnectivityStatus m_getChannelStatus() = 0; // instruct DSite that CsSite has changed M-R virtual void m_invalidateMarshaledRepresentation() = 0; @@ -255,14 +276,12 @@ virtual void pushDSiteVal(DSite*) = 0; virtual void pushIntVal(int) = 0; virtual void pushADC(ExtDataContainerInterface*) = 0; - virtual void pushSDC(ExtDataContainerInterface*) = 0; virtual void pushPstOut(PstOutContainerInterface*) = 0; virtual void pushMsgC(MsgContainer*) = 0; virtual DSite* popDSiteVal() = 0; virtual int popIntVal() = 0; virtual ExtDataContainerInterface* popADC() = 0; - virtual ExtDataContainerInterface* popSDC() = 0; virtual PstInContainerInterface* popPstIn() = 0; virtual MsgContainer* popMsgC() = 0; @@ -297,7 +316,6 @@ // The CsSite Object virtual CsSiteInterface* unmarshalCsSite(DSite* Ds, DssReadBuffer* const buf) = 0; virtual CsSiteInterface *connectSelfReps(MsgnLayer* ,DSite*) = 0; - virtual ExtDataContainerInterface* m_createExtDataContainer(BYTE) = 0; // Mark all DSites used by the CSC. virtual void m_gcSweep() = 0; --- mozart-1.4.0.orig/platform/dss/include/dss_object.hh +++ mozart-1.4.0/platform/dss/include/dss_object.hh @@ -28,7 +28,7 @@ #ifndef __DSS_OBJECT_HH #define __DSS_OBJECT_HH -#ifdef INTERFACE +#ifdef DSS_INTERFACE #pragma interface #endif @@ -61,7 +61,6 @@ // - DEBUG_CHECK, trigger asserts. // - DSS_LOG, enables the logging utility // - INTERFACE, enables pragma directives when debug compiling ("no inline"-ing) -// - EXCEPTIONS, enables exceptions. // *************** Imported by the DSS from the MAP *********************** @@ -118,26 +117,6 @@ const int& param, const char* const str); - - // KBR-Interface - - - // ************** Global Names ************** - GlobalNameInterface* createName(void* ref); - // unmarshalName() automatically performs a lookup in the name table - GlobalNameInterface* unmarshalName(DssReadBuffer*); - - // names are automatically removed from the name table once deleted - - // ************** KBR management ********************' - KbrInstance* m_createKbr(int K, int Bits, int Fail, KbrCallbackInterface*); - bool m_unmarshalKbr(DssReadBuffer* buf, KbrInstance*&); - - - // ************** Backbone management ***************** - void m_createBackboneTicket(DssWriteBuffer* buf); - void m_joinBackbone(DssReadBuffer *buf); - MACRO_NO_DEFAULT_CONSTRUCTORS(DSS_Object); }; --- mozart-1.4.0.orig/platform/dss/include/dss_enums.hh +++ mozart-1.4.0/platform/dss/include/dss_enums.hh @@ -26,23 +26,6 @@ aclass(const aclass &); \ aclass &operator = (const aclass&) - -#define MACRO_NO_DEFAULT_EQUALITY(aclass) \ -private: \ - aclass &operator = (const aclass&) - - -// ****************** Exceptions ******************** -// Exceptions are used in various functions to declare something wrong -// has happened. -// - -enum ExceptionType{ - EXCEPTION_NO_DATA = 1 // Thrown by DssReadBuffer.getByte() -}; - - - // ************ Abstract operation return values ******** // The return values for the doAbstractOperation pair signals to the // caller how it should act. @@ -63,7 +46,6 @@ DSS_SUSPEND, DSS_INTERNAL_ERROR_NO_PROXY, DSS_INTERNAL_ERROR_NO_OP, - DSS_INTERNAL_ERROR_THREAD_OP, DSS_INTERNAL_ERROR_SEVERE }; @@ -71,31 +53,9 @@ enum ProxyMarshalFlag{ PMF_ORDINARY, PMF_PUSH, - PMF_FREE, - PMF_MASK = 0xF // bit mask -}; -const int PMF_NBITS = 4; // must be consistent with PMF_MASK - - -enum ASop{ - ASO_MIGRATE, - ASO_PUSH + PMF_FREE }; - - -// ****************** DSS_GC ****************** -// The return values of the Proxy::manipulatAS function are not very -// thorough, either the action succeded (OK) ( is successfully -// initiated) or it failed because the argument wasn't (ARG_FAIL) -// valid, or the operation could not be executed for the current -// Resolver protocol (OP_FAIL). - -enum MASretVal{ - MAS_OK, - MAS_ARG_FAIL, - MAS_OP_FAIL -}; - +const int PMF_NBITS = 4; // ****************** DSS_GC ****************** // DSS_GC is the value returned from getDssGCStatus @@ -165,7 +125,6 @@ AEN_RELAXED_MUTABLE = 2, AEN_TRANSIENT = 3, AEN_IMMUTABLE = 4, - AEN_IMMUTABLE_UNNAMED = 5, AEN_MASK = 0xF // bit mask }; const int AEN_NBITS = 4; // must be consistent with AE_MASK @@ -185,8 +144,7 @@ PN_IMMUTABLE_LAZY = 8, PN_IMMUTABLE_EAGER = 9, PN_IMMEDIATE = 10, - PN_DKSBROADCAST = 11, - PN_SITED = 12, + PN_SITED = 11, PN_MASK = 0xF // bit mask }; const int PN_NBITS = 4; // must be consistent with PN_MASK @@ -212,7 +170,6 @@ AA_NO_ARCHITECTURE = 0x0, // Don't use, only here for internal debugging AA_STATIONARY_MANAGER = 0x1, AA_MIGRATORY_MANAGER = 0x2, - AA_MOBILE_COORDINATOR = 0x4, AA_MASK = 0xF // bit mask }; const int AA_NBITS = 4; // must be consistent with AA_MASK @@ -228,24 +185,18 @@ // is used, the proxy will always be a root at the home // - WRC, fractional WRC // - TL, time lease, uses a timer to keep track of external refs. -// - RC, reference counting (don't use) // - RLV1, Reference Listing version 1, keeps a list of external refs's sites // - RLV2, version 2 of above. -// - IRC, indirectional RC (don't use) enum RCalg{ RC_ALG_NONE = 0x00, // Don't use, only here for internal debugging RC_ALG_PERSIST = 0x01, // should not be combined with others! RC_ALG_WRC = 0x02, RC_ALG_TL = 0x04, - RC_ALG_RC = 0x08, - RC_ALG_RLV1 = 0x10, - RC_ALG_RLV2 = 0x20, - RC_ALG_IRC = 0x40, - RC_ALG_ERROR = 0x80, - RC_ALG_MASK = 0xFF // bit mask + RC_ALG_RLV1 = 0x08, //Yves: unused! + RC_ALG_RLV2 = 0x10 //Yves: unused! }; -const int RC_ALG_NBITS = 8; // must be consistent with RC_ALG_MASK +const int RC_ALG_NBITS = 8; @@ -263,6 +214,7 @@ // lease. The better a connection is the shorter period needed. // +//Yves:unused for now enum RCop{ RC_OP_REMOVE_ALG, RC_OP_SET_WRC_ALPHA, @@ -282,75 +234,9 @@ enum ProxyUnmarshalFlag{ PUF_ORDINARY, - PUF_FREE -}; - -enum AOcallback{ - AOCB_FINISH, - AOCB_CONTINUE -}; - -enum ResumeCode{ - TRC_CONTINUE, - TRC_REDO, - TRC_RAISE, - TRC_ATOMIC -}; - - -enum WakeRetVal{ - WRV_DONE, // The operation was completed, an atomoc operation - WRV_CONTINUING, // The operation is scheduled to be executed - WRV_NO_THREAD, // The operation is not executed, the thread is busy elsewhere - WRV_NO_OP // ? + PUF_FREE //Yves:unused! }; - -enum BufOpRet{ - BOR_OP_OK, - BOR_SPACE_UNAWAIL -}; - - -enum ErrorClass { - EC_OK, - EC_GO_AHEAD, - EC_CONTINUE_LATER, - EC_LOST // This perm only means the transObj should give up -}; - - -enum ConGrantReturn{ - CGR_CONTINUE, - CGR_SUSPENDED, - CGR_FAILED, - CGR_STATE_ERROR -}; - - -enum ConnectionType{ - CT_TCP_CONNECTION, - CT_ROUTE_CONNECTION -}; - - -enum ConnectionFailType{ - CFT_CONNECTION_LOST, - CFT_SITE_GLOBAL_PERM, - CFT_SITE_LOCAL_PERM -}; - - -enum SiteFaultInterest{ - SFI_NOTDEFINEDYET -}; - - -enum SiteFaultState{ - SFS_NOTDEFINEDYET -}; - - enum DSS_AREA{ DSS_STATIC, DSS_AREA_TABLES, @@ -360,7 +246,6 @@ enum DSS_AREA_ID{ - DSS_AREA_NO_OP, DSS_STATIC_LOG_PARAMETER, DSS_STATIC_DEBUG_TABLES, DSS_STATIC_MEMORY_ALLOCATION, @@ -370,9 +255,7 @@ enum ParamRetVal{ PRV_OK, - PRV_TYPE_ERROR, PRV_AREA_NOT_FOUND, - PRV_DYN_PARAM_NOT_FOUND, PRV_STAT_PARAM_NOT_FOUND }; @@ -388,8 +271,9 @@ // - DLL_BEHAVIOR Characteristic behavior of the DSS like connections and such // - DLL_DEBUG Debugging info like internal messages, typically the // necessesary info when creating a MAP. -// - DLL_ALL Loads of information, from internal function behavior +// - DLL_MOST Loads of information, from internal function behavior // to unmarshaled fields. +// - DLL_TOO_MUCH Messages are triggered continuously by the failure detector (RTT measure) enum DSS_LOG_LEVEL{ DLL_NOTHING = 0, // The loglevel is set to output nothing (i.e. no one should use the level) @@ -397,7 +281,8 @@ DLL_IMPORTANT = 2, DLL_BEHAVIOR = 3, DLL_DEBUG = 4, - DLL_ALL = 5 + DLL_MOST = 5, + DLL_TOO_MUCH = 6 }; // The new bunch! @@ -407,31 +292,5 @@ const ConnectivityStatus CS_COMMUNICATING = 0x001; const ConnectivityStatus CS_CHANNEL = 0x002; const ConnectivityStatus CS_CIRCUIT = 0x004; -const ConnectivityStatus CS_OPENING = 0x008; -const ConnectivityStatus CS_CLOSING = 0x010; -const ConnectivityStatus CS_OPEN = 0x020; -const ConnectivityStatus CS_UNACKED = 0x040; -const ConnectivityStatus CS_FRAGMENTED = 0x080; -const ConnectivityStatus CS_QUEUED = 0x100; -const ConnectivityStatus CS_EXTNEED = 0x200; -const ConnectivityStatus CS_ROUTER = 0x400; -const ConnectivityStatus CS_CLOSED = 0x800; - -enum ConnectionFailReason{ - CFR_TIMEOUT, - CFR_NO_ROUTE, - CFR_NO_HOST, - CFR_NO_RESOURCE, - CFR_INVALID_ADDRESS -}; - - -enum KbrResult{ - KBR_LOCAL, - KBR_REMOTE, - KBR_FAILED_OPENING, - KBR_FAILED_CLOSING, - KBR_FAILED_INVALIDKEY -}; #endif --- mozart-1.4.0.orig/platform/mswindows/configure +++ mozart-1.4.0/platform/mswindows/configure @@ -588,7 +588,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1242,9 +1242,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1247: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1248: checking for OZLOADSEP" >&5 +echo "configure:1261: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1264,7 +1277,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1268: checking for OZLOADWIN" >&5 +echo "configure:1281: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1320,7 +1333,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1324: checking for $ac_word" >&5 +echo "configure:1337: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1352,7 +1365,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1356: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1369: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1363,12 +1376,12 @@ cat > conftest.$ac_ext << EOF -#line 1367 "configure" +#line 1380 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1394,12 +1407,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1398: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1411: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1403: checking whether we are using GNU C++" >&5 +echo "configure:1416: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1408,7 +1421,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1427,7 +1440,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1431: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1444: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1465,7 +1478,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1469: checking $CXX version is at least 3.3.2" >&5 +echo "configure:1482: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1598,7 +1611,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1602: checking c++ compiler option $ozm_opt" >&5 +echo "configure:1615: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1629,7 +1642,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1633: checking how to run the C++ preprocessor" >&5 +echo "configure:1646: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1642,12 +1655,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1664: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1679,23 +1692,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:1683: checking for C++ compiler" >&5 +echo "configure:1696: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1688: checking whether we are using GNU C++" >&5 +echo "configure:1701: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1693: checking for C++ preprocessor" >&5 +echo "configure:1706: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:1699: checking for default CXXFLAGS" >&5 +echo "configure:1712: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1725,7 +1738,7 @@ echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1729: checking build system type" >&5 +echo "configure:1742: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1751,7 +1764,7 @@ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1755: checking for $ac_word" >&5 +echo "configure:1768: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1783,7 +1796,7 @@ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. set dummy ${ac_tool_prefix}windres; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1787: checking for $ac_word" >&5 +echo "configure:1800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1814,7 +1827,7 @@ echo $ac_n "checking for --enable-opt""... $ac_c" 1>&6 -echo "configure:1818: checking for --enable-opt" >&5 +echo "configure:1831: checking for --enable-opt" >&5 # Check whether --enable-opt or --disable-opt was given. if test "${enable_opt+set}" = set; then enableval="$enable_opt" @@ -2008,6 +2021,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/platform/wish/unixMain.cc +++ mozart-1.4.0/platform/wish/unixMain.cc @@ -94,19 +94,23 @@ static char *display = NULL; static char *geometry = NULL; +static char fileOpt[]="-file"; +static char fileHelp[]="File from which to read commands"; +static char geometryOpt[]="-geometry"; +static char geometryHelp[]="Initial geometry for window"; +static char displayOpt[]="-display"; +static char displayHelp[]="Display to use"; +static char nameOpt[]="-name"; +static char nameHelp[]="Name to use for application"; +static char syncOpt[]="-sync"; +static char syncHelp[]="Use synchronous mode for display server"; static Tk_ArgvInfo argTable[] = { - {"-file", TK_ARGV_STRING, (char *) NULL, (char *) &fileName, - "File from which to read commands"}, - {"-geometry", TK_ARGV_STRING, (char *) NULL, (char *) &geometry, - "Initial geometry for window"}, - {"-display", TK_ARGV_STRING, (char *) NULL, (char *) &display, - "Display to use"}, - {"-name", TK_ARGV_STRING, (char *) NULL, (char *) &name, - "Name to use for application"}, - {"-sync", TK_ARGV_CONSTANT, (char *) 1, (char *) &synchronize, - "Use synchronous mode for display server"}, - {(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL, - (char *) NULL} + {fileOpt, TK_ARGV_STRING, (char *) NULL, (char *) &fileName, fileHelp}, + {geometryOpt, TK_ARGV_STRING, (char *) NULL, (char *) &geometry, geometryHelp}, + {displayOpt, TK_ARGV_STRING, (char *) NULL, (char *) &display, displayHelp}, + {nameOpt, TK_ARGV_STRING, (char *) NULL, (char *) &name, nameHelp}, + {syncOpt, TK_ARGV_CONSTANT, (char *) 1, (char *) &synchronize, syncHelp}, + {(char *) NULL, TK_ARGV_END, (char *) NULL, (char *) NULL, (char *) NULL} }; /* --- mozart-1.4.0.orig/platform/wish/configure +++ mozart-1.4.0/platform/wish/configure @@ -600,7 +600,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1254,9 +1254,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1259: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1260: checking for OZLOADSEP" >&5 +echo "configure:1273: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1276,7 +1289,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1280: checking for OZLOADWIN" >&5 +echo "configure:1293: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1319,7 +1332,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1323: checking for $ac_word" >&5 +echo "configure:1336: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1349,7 +1362,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1353: checking for $ac_word" >&5 +echo "configure:1366: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1400,7 +1413,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1404: checking for $ac_word" >&5 +echo "configure:1417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1432,7 +1445,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1436: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1449: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1443,12 +1456,12 @@ cat > conftest.$ac_ext << EOF -#line 1447 "configure" +#line 1460 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1474,12 +1487,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1478: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1491: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1483: checking whether we are using GNU C" >&5 +echo "configure:1496: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1488,7 +1501,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1507,7 +1520,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1511: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1524: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1545,7 +1558,7 @@ else echo $ac_n "checking $CC version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1549: checking $CC version is at least 3.3.2" >&5 +echo "configure:1562: checking $CC version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CC -dumpversion || $CC --version 2>/dev/null`; then # first we try to locate the string "version" @@ -1678,7 +1691,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking cc compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:1682: checking cc compiler option $ozm_opt" >&5 +echo "configure:1695: checking cc compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gccopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1709,7 +1722,7 @@ ;; esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1713: checking how to run the C preprocessor" >&5 +echo "configure:1726: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1724,13 +1737,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1741,13 +1754,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1758,13 +1771,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1796,23 +1809,23 @@ else echo $ac_n "checking for C compiler""... $ac_c" 1>&6 -echo "configure:1800: checking for C compiler" >&5 +echo "configure:1813: checking for C compiler" >&5 CC=$oz_cv_CC echo "$ac_t""(cached) $CC" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1805: checking whether we are using GNU C" >&5 +echo "configure:1818: checking whether we are using GNU C" >&5 GCC=$oz_cv_GCC echo "$ac_t""(cached) $GCC" 1>&6 echo $ac_n "checking for C preprocessor""... $ac_c" 1>&6 -echo "configure:1810: checking for C preprocessor" >&5 +echo "configure:1823: checking for C preprocessor" >&5 CPP=$oz_cv_CPP echo "$ac_t""(cached) $CPP" 1>&6 if test "${CFLAGS+set}" != set ; then echo $ac_n "checking for default CFLAGS""... $ac_c" 1>&6 -echo "configure:1816: checking for default CFLAGS" >&5 +echo "configure:1829: checking for default CFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -1838,7 +1851,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1842: checking for $ac_word" >&5 +echo "configure:1855: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1870,7 +1883,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1874: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1887: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1881,12 +1894,12 @@ cat > conftest.$ac_ext << EOF -#line 1885 "configure" +#line 1898 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1912,12 +1925,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1916: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1929: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1921: checking whether we are using GNU C++" >&5 +echo "configure:1934: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1926,7 +1939,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1945,7 +1958,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1949: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1962: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1983,7 +1996,7 @@ else echo $ac_n "checking $CXX version is at least 3.3.2""... $ac_c" 1>&6 -echo "configure:1987: checking $CXX version is at least 3.3.2" >&5 +echo "configure:2000: checking $CXX version is at least 3.3.2" >&5 oz_tmp_ok=no if oz_tmp_version1=`$CXX -dumpversion || $CXX --version 2>/dev/null`; then # first we try to locate the string "version" @@ -2116,7 +2129,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:2120: checking c++ compiler option $ozm_opt" >&5 +echo "configure:2133: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2147,7 +2160,7 @@ ;; esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2151: checking how to run the C++ preprocessor" >&5 +echo "configure:2164: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2160,12 +2173,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2197,23 +2210,23 @@ else echo $ac_n "checking for C++ compiler""... $ac_c" 1>&6 -echo "configure:2201: checking for C++ compiler" >&5 +echo "configure:2214: checking for C++ compiler" >&5 CXX=$oz_cv_CXX echo "$ac_t""(cached) $CXX" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2206: checking whether we are using GNU C++" >&5 +echo "configure:2219: checking whether we are using GNU C++" >&5 GXX=$oz_cv_GXX echo "$ac_t""(cached) $GXX" 1>&6 echo $ac_n "checking for C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2211: checking for C++ preprocessor" >&5 +echo "configure:2224: checking for C++ preprocessor" >&5 CXXCPP=$oz_cv_CXXCPP echo "$ac_t""(cached) $CXXCPP" 1>&6 if test "${CXXFLAGS+set}" != set; then echo $ac_n "checking for default CXXFLAGS""... $ac_c" 1>&6 -echo "configure:2217: checking for default CXXFLAGS" >&5 +echo "configure:2230: checking for default CXXFLAGS" >&5 CFLAGS=$oz_cv_CFLAGS echo "$ac_t""(cached) $CFLAGS" 1>&6 fi @@ -2222,7 +2235,7 @@ echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2226: checking whether ln -s works" >&5 +echo "configure:2239: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2256,7 +2269,7 @@ for i in tcl84.dll tk84.dll msvcrt.dll; do dll=$WINDLLDIR/$i echo $ac_n "checking for DLL $dll""... $ac_c" 1>&6 -echo "configure:2260: checking for DLL $dll" >&5 +echo "configure:2273: checking for DLL $dll" >&5 if test -f $dll then echo "$ac_t""yes" 1>&6 else { echo "configure: error: required DLL $dll not found" 1>&2; exit 1; } @@ -2280,7 +2293,7 @@ echo $ac_n "checking whether to build with AquaTk""... $ac_c" 1>&6 -echo "configure:2284: checking whether to build with AquaTk" >&5 +echo "configure:2297: checking whether to build with AquaTk" >&5 # Check whether --with-tk-aqua or --without-tk-aqua was given. if test "${with_tk_aqua+set}" = set; then withval="$with_tk_aqua" @@ -2300,7 +2313,7 @@ echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:2304: checking for tclConfig.sh" >&5 +echo "configure:2317: checking for tclConfig.sh" >&5 # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" @@ -2339,7 +2352,7 @@ echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:2343: checking for tkConfig.sh" >&5 +echo "configure:2356: checking for tkConfig.sh" >&5 # Check whether --with-tk or --without-tk was given. if test "${with_tk+set}" = set; then withval="$with_tk" @@ -2387,7 +2400,7 @@ for ozm_opt in $oz_for do echo $ac_n "checking c++ compiler option $ozm_opt""... $ac_c" 1>&6 -echo "configure:2391: checking c++ compiler option $ozm_opt" >&5 +echo "configure:2404: checking c++ compiler option $ozm_opt" >&5 ozm_ropt=`echo $ozm_opt | sed -e 's/[^a-zA-Z0-9_]/_/g'` if eval "test \"`echo '$''{'oz_cv_gxxopt_$ozm_ropt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2412,7 +2425,7 @@ if test -n "$PERMISSIVEOPT"; then echo $ac_n "checking whether we need -fpermissive for Xlib.h""... $ac_c" 1>&6 -echo "configure:2416: checking whether we need -fpermissive for Xlib.h" >&5 +echo "configure:2429: checking whether we need -fpermissive for Xlib.h" >&5 if eval "test \"`echo '$''{'ac_cv_xlib_permissive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2427,7 +2440,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -2438,7 +2451,7 @@ ; return 0; } EOF -if { (eval echo configure:2442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_xlib_permissive=no @@ -2471,7 +2484,7 @@ echo $ac_n "checking for Tcl public headers""... $ac_c" 1>&6 -echo "configure:2475: checking for Tcl public headers" >&5 +echo "configure:2488: checking for Tcl public headers" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then @@ -2508,7 +2521,7 @@ echo $ac_n "checking for Tk public headers""... $ac_c" 1>&6 -echo "configure:2512: checking for Tk public headers" >&5 +echo "configure:2525: checking for Tk public headers" >&5 # Check whether --with-tkinclude or --without-tkinclude was given. if test "${with_tkinclude+set}" = set; then @@ -2548,7 +2561,7 @@ echo $ac_n "checking for --enable-copy-tcl-libs""... $ac_c" 1>&6 -echo "configure:2552: checking for --enable-copy-tcl-libs" >&5 +echo "configure:2565: checking for --enable-copy-tcl-libs" >&5 # Check whether --enable-copy-tcl-libs or --disable-copy-tcl-libs was given. if test "${enable_copy_tcl_libs+set}" = set; then enableval="$enable_copy_tcl_libs" @@ -2589,7 +2602,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2593: checking for $ac_word" >&5 +echo "configure:2606: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PROJECTBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2776,6 +2789,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/doc/configure +++ mozart-1.4.0/doc/configure @@ -609,7 +609,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1263,9 +1263,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1268: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1269: checking for OZLOADSEP" >&5 +echo "configure:1282: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1285,7 +1298,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1289: checking for OZLOADWIN" >&5 +echo "configure:1302: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1325,7 +1338,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1329: checking for --with-global-oz" >&5 +echo "configure:1342: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1359,7 +1372,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1363: checking for $ac_word" >&5 +echo "configure:1376: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZENGINE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1407,7 +1420,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1411: checking for $ac_word" >&5 +echo "configure:1424: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_THEEMACS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1441,7 +1454,7 @@ echo $ac_n "checking for --with-emacs-options""... $ac_c" 1>&6 -echo "configure:1445: checking for --with-emacs-options" >&5 +echo "configure:1458: checking for --with-emacs-options" >&5 # Check whether --with-emacs-options or --without-emacs-options was given. if test "${with_emacs_options+set}" = set; then withval="$with_emacs_options" @@ -1474,7 +1487,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1478: checking for --with-global-oz" >&5 +echo "configure:1491: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1508,7 +1521,7 @@ # Extract the first word of "ozdoc", so it can be a program name with args. set dummy ozdoc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1512: checking for $ac_word" >&5 +echo "configure:1525: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZDOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1555,7 +1568,7 @@ echo $ac_n "checking for --with-java-bin""... $ac_c" 1>&6 -echo "configure:1559: checking for --with-java-bin" >&5 +echo "configure:1572: checking for --with-java-bin" >&5 # Check whether --with-java-bin or --without-java-bin was given. if test "${with_java_bin+set}" = set; then withval="$with_java_bin" @@ -1582,7 +1595,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1586: checking for --with-global-oz" >&5 +echo "configure:1599: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1616,7 +1629,7 @@ # Extract the first word of "java", so it can be a program name with args. set dummy java; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_word" >&5 +echo "configure:1633: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1663,7 +1676,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1667: checking for --with-global-oz" >&5 +echo "configure:1680: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1697,7 +1710,7 @@ # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1701: checking for $ac_word" >&5 +echo "configure:1714: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1743,7 +1756,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1747: checking for --with-global-oz" >&5 +echo "configure:1760: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1777,7 +1790,7 @@ # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1781: checking for $ac_word" >&5 +echo "configure:1794: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1820,14 +1833,14 @@ fi echo $ac_n "checking for class path option""... $ac_c" 1>&6 -echo "configure:1824: checking for class path option" >&5 +echo "configure:1837: checking for class path option" >&5 case `$JAVA -version 2>&1` in Kaffe*) JAVACP=-addclasspath;; *) JAVACP=-classpath;; esac echo "$ac_t""$JAVACP" 1>&6 echo $ac_n "checking for --with-java-threads""... $ac_c" 1>&6 -echo "configure:1831: checking for --with-java-threads" >&5 +echo "configure:1844: checking for --with-java-threads" >&5 # Check whether --with-java-threads or --without-java-threads was given. if test "${with_java_threads+set}" = set; then withval="$with_java_threads" @@ -1846,7 +1859,7 @@ echo $ac_n "checking for --with-documents""... $ac_c" 1>&6 -echo "configure:1850: checking for --with-documents" >&5 +echo "configure:1863: checking for --with-documents" >&5 # Check whether --with-documents or --without-documents was given. if test "${with_documents+set}" = set; then withval="$with_documents" @@ -1864,7 +1877,7 @@ echo $ac_n "checking for --enable-chm""... $ac_c" 1>&6 -echo "configure:1868: checking for --enable-chm" >&5 +echo "configure:1881: checking for --enable-chm" >&5 # Check whether --enable-chm or --disable-chm was given. if test "${enable_chm+set}" = set; then enableval="$enable_chm" @@ -1885,7 +1898,7 @@ echo $ac_n "checking for --with-ozhome""... $ac_c" 1>&6 -echo "configure:1889: checking for --with-ozhome" >&5 +echo "configure:1902: checking for --with-ozhome" >&5 # Check whether --with-ozhome or --without-ozhome was given. if test "${with_ozhome+set}" = set; then withval="$with_ozhome" @@ -2073,6 +2086,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/doc/Makefile.in +++ mozart-1.4.0/doc/Makefile.in @@ -99,6 +99,7 @@ dirs="$(SUBDIRS)"; \ for i in $$dirs; do (cd $$i && $(MAKE) boot1st) || exit 1; done; \ for i in $$dirs; do (cd $$i && $(MAKE) boot2nd) || exit 1; done + $(MAKE) boot-THEINDEX boot-1st boot1st: -rm -f xref.db index.db @@ -114,7 +115,6 @@ # index/x-ref files got changed, the 2nd stage needs to run again # COMPLETELY. -bootstrap:: boot-THEINDEX all:: THEINDEX THEINDEX: idx/index.html --- mozart-1.4.0.orig/doc/cpiref/r_aux.sgml +++ mozart-1.4.0/doc/cpiref/r_aux.sgml @@ -183,9 +183,9 @@ <> <<< -OZ_Return OZ_typeErrorCPI(char * __typeString, +OZ_Return OZ_typeErrorCPI(const char * __typeString, int pos, - char * comment); + const char * comment); >>> --- mozart-1.4.0.orig/doc/utilities/Main.oz +++ mozart-1.4.0/doc/utilities/Main.oz @@ -123,7 +123,8 @@ OZDOC_HOME = case Args.'ozdoc-home' of unit then case {OS.getEnv 'OZDOC_HOME'} of false then - {Property.get 'oz.home'}#'/share/doc' + %% Changed for Debian/GNU + '/usr/share/mozart/share/doc' elseof X then X end elseof X then X end {Property.put 'ozdoc.home' OZDOC_HOME} @@ -151,7 +152,8 @@ ELISP_PATH = case Args.'elisp-path' of unit then case {OS.getEnv 'OZDOC_ELISP_PATH'} of false then - SRC_DIR#':'#{Property.get 'oz.home'}#'/share/elisp' + %% Changed for Debian/GNU: elisp files are found on default path + SRC_DIR elseof X then X end elseof X then X end {Property.put 'ozdoc.elisp.path' ELISP_PATH} @@ -165,7 +167,8 @@ CSS = case Args.'stylesheet' of unit then case {OS.getEnv 'OZDOC_STYLESHEET'} of false then - {Property.get 'oz.home'}#'/share/doc' + %% Changed for Debian/GNU + '/usr/share/mozart/share/doc' elseof X then X end elseof X then X end {Property.put 'ozdoc.stylesheet' CSS} --- mozart-1.4.0.orig/doc/utilities/configure +++ mozart-1.4.0/doc/utilities/configure @@ -589,7 +589,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1243,9 +1243,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1248: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1249: checking for OZLOADSEP" >&5 +echo "configure:1262: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1265,7 +1278,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1269: checking for OZLOADWIN" >&5 +echo "configure:1282: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1305,7 +1318,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1309: checking for --with-global-oz" >&5 +echo "configure:1322: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1339,7 +1352,7 @@ # Extract the first word of "ozengine", so it can be a program name with args. set dummy ozengine; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1343: checking for $ac_word" >&5 +echo "configure:1356: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZENGINE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1385,7 +1398,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1389: checking for --with-global-oz" >&5 +echo "configure:1402: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1419,7 +1432,7 @@ # Extract the first word of "ozc", so it can be a program name with args. set dummy ozc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1423: checking for $ac_word" >&5 +echo "configure:1436: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1465,7 +1478,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1469: checking for --with-global-oz" >&5 +echo "configure:1482: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1499,7 +1512,7 @@ # Extract the first word of "ozl", so it can be a program name with args. set dummy ozl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1503: checking for $ac_word" >&5 +echo "configure:1516: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_OZL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1709,6 +1722,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/doc/utilities/Makefile.in +++ mozart-1.4.0/doc/utilities/Makefile.in @@ -85,6 +85,9 @@ install: $(DOCDIR) $(DOCBINFILES) $(DOCFILES) installps: +$(BINFILES): $(BINDIR) +$(DOCFILES): $(DOCBINFILES) + $(BINDIR) $(DOCDIR): $(INSTALL_DIR) $@ --- mozart-1.4.0.orig/doc/compiler/directives.sgml +++ mozart-1.4.0/doc/compiler/directives.sgml @@ -51,6 +51,7 @@ top-level Oz statements.

All compilation units in a file are processed sequentially. +

@@ -98,6 +99,8 @@ resides, then against all directories named in the <Var type=env/OZPATH/ environment variable (which has standard <Var type=env/PATH/ syntax). + <P> + Note that surrounding the filename by single quotes avoids indentation problems of the OPI. </List> <Para class=apropos><Title/Macro Names/ Note that although macro names have the same syntax as Oz variables, --- mozart-1.4.0.orig/doc/system/pictures/faultstates.eps +++ mozart-1.4.0/doc/system/pictures/faultstates.eps @@ -1,3793 +1,664 @@ %!PS-Adobe-3.0 EPSF-3.0 -%%HiResBoundingBox: 0.000000 0.000000 202.000000 247.000000 -%APL_DSC_Encoding: UTF8 -%%Title: (Unknown) -%%Creator: (Unknown) -%%CreationDate: (Unknown) -%%For: (Unknown) +%%Pages: 1 +%%BoundingBox: 0 0 286 347 %%DocumentData: Clean7Bit %%LanguageLevel: 2 -%%Pages: 1 -%%BoundingBox: 0 0 202 247 %%EndComments -%%BeginProlog -%%BeginFile: cg-pdf.ps -%%Copyright: Copyright 2000-2004 Apple Computer Incorporated. -%%Copyright: All Rights Reserved. -currentpacking true setpacking -/cg_md 141 dict def -cg_md begin -/L3? languagelevel 3 ge def -/bd{bind def}bind def -/ld{load def}bd -/xs{exch store}bd -/xd{exch def}bd -/cmmtx matrix def -mark -/sc/setcolor -/scs/setcolorspace -/dr/defineresource -/fr/findresource -/T/true -/F/false -/d/setdash -/w/setlinewidth -/J/setlinecap -/j/setlinejoin -/M/setmiterlimit -/i/setflat -/rc/rectclip -/rf/rectfill -/rs/rectstroke -/f/fill -/f*/eofill -/sf/selectfont -/s/show -/xS/xshow -/yS/yshow -/xyS/xyshow -/S/stroke -/m/moveto -/l/lineto -/c/curveto -/h/closepath -/n/newpath -/q/gsave -/Q/grestore -counttomark 2 idiv -{ld}repeat pop -/SC{ - /ColorSpace fr scs -}bd -/sopr /setoverprint where{pop/setoverprint}{/pop}ifelse ld -/soprm /setoverprintmode where{pop/setoverprintmode}{/pop}ifelse ld -/cgmtx matrix def -/sdmtx{cgmtx currentmatrix pop}bd -/CM {cgmtx setmatrix}bd -/cm {cmmtx astore CM concat}bd -/W{clip newpath}bd -/W*{eoclip newpath}bd -statusdict begin product end dup (HP) anchorsearch{ - pop pop pop - true -}{ - pop - (hp) anchorsearch{ - pop pop true - }{ - pop false - }ifelse -}ifelse -{ - { - { - pop pop - (0)dup 0 4 -1 roll put - F charpath - }cshow - } -}{ - {F charpath} -}ifelse -/cply exch bd -/cps {cply stroke}bd -/pgsave 0 def -/bp{/pgsave save store}bd -/ep{pgsave restore showpage}def -/re{4 2 roll m 1 index 0 rlineto 0 exch rlineto neg 0 rlineto h}bd -/scrdict 10 dict def -/scrmtx matrix def -/patarray 0 def -/createpat{patarray 3 1 roll put}bd -/makepat{ -scrmtx astore pop -gsave -initgraphics -CM -patarray exch get -scrmtx -makepattern -grestore -setpattern -}bd -/cg_BeginEPSF{ - userdict save/cg_b4_Inc_state exch put - userdict/cg_endepsf/cg_EndEPSF load put - count userdict/cg_op_count 3 -1 roll put - countdictstack dup array dictstack userdict/cg_dict_array 3 -1 roll put - 3 sub{end}repeat - /showpage {} def - 0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin - 10 setmiterlimit [] 0 setdash newpath - false setstrokeadjust false setoverprint -}bd -/cg_EndEPSF{ - countdictstack 3 sub { end } repeat - cg_dict_array 3 1 index length 3 sub getinterval - {begin}forall - count userdict/cg_op_count get sub{pop}repeat - userdict/cg_b4_Inc_state get restore - F setpacking -}bd -/cg_biproc{currentfile/RunLengthDecode filter}bd -/cg_aiproc{currentfile/ASCII85Decode filter/RunLengthDecode filter}bd -/ImageDataSource 0 def -L3?{ - /cg_mibiproc{pop pop/ImageDataSource{cg_biproc}def}bd - /cg_miaiproc{pop pop/ImageDataSource{cg_aiproc}def}bd -}{ - /ImageBandMask 0 def - /ImageBandData 0 def - /cg_mibiproc{ - string/ImageBandMask xs - string/ImageBandData xs - /ImageDataSource{[currentfile/RunLengthDecode filter dup ImageBandMask/readstring cvx - /pop cvx dup ImageBandData/readstring cvx/pop cvx]cvx bind}bd - }bd - /cg_miaiproc{ - string/ImageBandMask xs - string/ImageBandData xs - /ImageDataSource{[currentfile/ASCII85Decode filter/RunLengthDecode filter - dup ImageBandMask/readstring cvx - /pop cvx dup ImageBandData/readstring cvx/pop cvx]cvx bind}bd - }bd -}ifelse -/imsave 0 def -/BI{save/imsave xd mark}bd -/EI{imsave restore}bd -/ID{ -counttomark 2 idiv -dup 2 add -dict begin -{def} repeat -pop -/ImageType 1 def -/ImageMatrix[Width 0 0 Height neg 0 Height]def -currentdict dup/ImageMask known{ImageMask}{F}ifelse exch -L3?{ - dup/MaskedImage known - { - pop - << - /ImageType 3 - /InterleaveType 2 - /DataDict currentdict - /MaskDict - << /ImageType 1 - /Width Width - /Height Height - /ImageMatrix ImageMatrix - /BitsPerComponent 1 - /Decode [0 1] - currentdict/Interpolate known - {/Interpolate Interpolate}if - >> - >> - }if -}if -exch -{imagemask}{image}ifelse -end -}bd -/cguidfix{statusdict begin mark version end -{cvr}stopped{cleartomark 0}{exch pop}ifelse -2012 lt{dup findfont dup length dict begin -{1 index/FID ne 2 index/UniqueID ne and -{def} {pop pop} ifelse}forall -currentdict end definefont pop -}{pop}ifelse -}bd -/t_array 0 def -/t_i 0 def -/t_c 1 string def -/x_proc{ - exch t_array t_i get add exch moveto - /t_i t_i 1 add store -}bd -/y_proc{ - t_array t_i get add moveto - /t_i t_i 1 add store -}bd -/xy_proc{ - - t_array t_i 2 copy 1 add get 3 1 roll get - 4 -1 roll add 3 1 roll add moveto - /t_i t_i 2 add store -}bd -/sop 0 def -/cp_proc/x_proc ld -/base_charpath -{ - /t_array xs - /t_i 0 def - { - t_c 0 3 -1 roll put - currentpoint - t_c cply sop - cp_proc - }forall - /t_array 0 def -}bd -/sop/stroke ld -/nop{}def -/xsp/base_charpath ld -/ysp{/cp_proc/y_proc ld base_charpath/cp_proc/x_proc ld}bd -/xysp{/cp_proc/xy_proc ld base_charpath/cp_proc/x_proc ld}bd -/xmp{/sop/nop ld /cp_proc/x_proc ld base_charpath/sop/stroke ld}bd -/ymp{/sop/nop ld /cp_proc/y_proc ld base_charpath/sop/stroke ld}bd -/xymp{/sop/nop ld /cp_proc/xy_proc ld base_charpath/sop/stroke ld}bd -/refnt{ -findfont dup length dict copy dup -/Encoding 4 -1 roll put -definefont pop -}bd -/renmfont{ -findfont dup length dict copy definefont pop -}bd -L3? dup dup{save exch}if -/Range 0 def -/DataSource 0 def -/val 0 def -/nRange 0 def -/mulRange 0 def -/d0 0 def -/r0 0 def -/di 0 def -/ri 0 def -/a0 0 def -/a1 0 def -/r1 0 def -/r2 0 def -/dx 0 def -/Nsteps 0 def -/sh3tp 0 def -/ymax 0 def -/ymin 0 def -/xmax 0 def -/xmin 0 def -/setupFunEval -{ - begin - /nRange Range length 2 idiv store - /mulRange - - [ - 0 1 nRange 1 sub - { - 2 mul/nDim2 xd - Range nDim2 get - Range nDim2 1 add get - 1 index sub - - 255 div - exch - }for - ]store - end -}bd -/FunEval -{ - begin - - nRange mul /val xd - - 0 1 nRange 1 sub - { - dup 2 mul/nDim2 xd - val - add DataSource exch get - mulRange nDim2 get mul - mulRange nDim2 1 add get - add - }for - end -}bd -/max -{ - 2 copy lt - {exch pop}{pop}ifelse -}bd -/sh2 -{ - /Coords load aload pop - 3 index 3 index translate - - 3 -1 roll sub - 3 1 roll exch - sub - 2 copy - dup mul exch dup mul add sqrt - dup - scale - atan - - rotate - - /Function load setupFunEval - - - clippath {pathbbox}stopped {0 0 0 0}if newpath - /ymax xs - /xmax xs - /ymin xs - /xmin xs - currentdict/Extend known - { - /Extend load 0 get - { - 0/Function load FunEval sc - xmin ymin xmin abs ymax ymin sub rectfill - }if - }if - - /Nsteps/Function load/Size get 0 get 1 sub store - /dx 1 Nsteps div store - gsave - /di ymax ymin sub store - /Function load - - 0 1 Nsteps - { - 1 index FunEval sc - 0 ymin dx di rectfill - dx 0 translate - }for - pop - grestore - currentdict/Extend known - { - /Extend load 1 get - { - Nsteps/Function load FunEval sc - 1 ymin xmax 1 sub abs ymax ymin sub rectfill - }if - }if -}bd -/shp -{ - 4 copy - - dup 0 gt{ - 0 exch a1 a0 arc - }{ - pop 0 moveto - }ifelse - dup 0 gt{ - 0 exch a0 a1 arcn - }{ - pop 0 lineto - }ifelse - - fill - - dup 0 gt{ - 0 exch a0 a1 arc - }{ - pop 0 moveto - }ifelse - dup 0 gt{ - 0 exch a1 a0 arcn - }{ - pop 0 lineto - }ifelse - - fill -}bd -/calcmaxs -{ - - xmin dup mul ymin dup mul add sqrt - xmax dup mul ymin dup mul add sqrt - xmin dup mul ymax dup mul add sqrt - xmax dup mul ymax dup mul add sqrt - max max max -}bd -/sh3 -{ - /Coords load aload pop - 5 index 5 index translate - 3 -1 roll 6 -1 roll sub - 3 -1 roll 5 -1 roll sub - 2 copy dup mul exch dup mul add sqrt - /dx xs - 2 copy 0 ne exch 0 ne or - { - - exch atan rotate - }{ - pop pop - }ifelse - - /r2 xs - /r1 xs - /Function load - dup/Size get 0 get 1 sub - /Nsteps xs - setupFunEval - - - - - - dx r2 add r1 lt{ - - 0 - }{ - dx r1 add r2 le - { - 1 - }{ - r1 r2 eq - { - 2 - }{ - 3 - }ifelse - }ifelse - }ifelse - /sh3tp xs - clippath {pathbbox}stopped {0 0 0 0}if - newpath - /ymax xs - /xmax xs - /ymin xs - /xmin xs - - dx dup mul r2 r1 sub dup mul sub dup 0 gt - { - sqrt r2 r1 sub atan - /a0 exch 180 exch sub store - /a1 a0 neg store - }{ - pop - /a0 0 store - /a1 360 store - }ifelse - currentdict/Extend known - { - /Extend load 0 get r1 0 gt and - { - 0/Function load FunEval sc - - - - - { - { - dx 0 r1 360 0 arcn - xmin ymin moveto - xmax ymin lineto - xmax ymax lineto - xmin ymax lineto - xmin ymin lineto - eofill - } - { - r1 0 gt{0 0 r1 0 360 arc fill}if - } - { - - - - - 0 r1 xmin abs r1 add neg r1 shp - } - { - - - r2 r1 gt{ - - 0 r1 - r1 neg r2 r1 sub div dx mul - 0 - shp - }{ - - - - 0 r1 calcmaxs - dup - - r2 add dx mul dx r1 r2 sub sub div - neg - exch 1 index - abs exch sub - shp - }ifelse - } - }sh3tp get exec - }if - }if - - /d0 0 store - /r0 r1 store - /di dx Nsteps div store - /ri r2 r1 sub Nsteps div store - /Function load - 0 1 Nsteps - { - 1 index FunEval sc - d0 di add r0 ri add d0 r0 shp - { - - d0 0 r0 a1 a0 arc - d0 di add 0 r0 ri add a0 a1 arcn - fill - - - d0 0 r0 a0 a1 arc - d0 di add 0 r0 ri add a1 a0 arcn - fill - }pop - - - /d0 d0 di add store - /r0 r0 ri add store - }for - pop - - currentdict/Extend known - { - /Extend load 1 get r2 0 gt and - { - Nsteps/Function load FunEval sc - - - - - { - { - dx 0 r2 0 360 arc fill - } - { - dx 0 r2 360 0 arcn - xmin ymin moveto - xmax ymin lineto - xmax ymax lineto - xmin ymax lineto - xmin ymin lineto - eofill - } - { - - - xmax abs r1 add r1 dx r1 shp - } - { - - r2 r1 gt{ - - - - calcmaxs dup - - r1 add dx mul dx r2 r1 sub sub div - exch 1 index - exch sub - dx r2 - shp - }{ - - r1 neg r2 r1 sub div dx mul - 0 - dx - r2 - shp - }ifelse - } - } - sh3tp get exec - }if - }if -}bd -/sh -{ - begin - /ShadingType load dup dup 2 eq exch 3 eq or - { - gsave - newpath - /ColorSpace load scs - currentdict/BBox known - { - /BBox load aload pop - 2 index sub - 3 index - 3 -1 roll exch sub - exch rectclip - }if - 2 eq - {sh2}{sh3}ifelse - grestore - }{ - - pop - (DEBUG: shading type unimplemented\n)print flush - }ifelse - end -}bd -{restore}if not dup{save exch}if - L3?{ - /sh/shfill ld - /csq/clipsave ld - /csQ/cliprestore ld - }if -{restore}if -end -setpacking -%%EndFile -%%EndProlog -%%BeginSetup -%%EndSetup %%Page: 1 1 -%%PageBoundingBox: 0 0 202 247 -%%BeginPageSetup -cg_md begin -bp -sdmtx -%RBIBeginFontSubset: Helvetica -%!FontType1-1.0: Helvetica 1.0000.0.0000 - 14 dict begin/FontName /Helvetica def - /PaintType 0 def - /Encoding 256 array 0 1 255{1 index exch/.notdef put}for - dup 33 /o put - dup 34 /k put - dup 35 /t put - dup 36 /e put - dup 37 /m put - dup 38 /p put - dup 39 /F put - dup 40 /a put - dup 41 /i put - dup 42 /l put - dup 43 /c put - dup 44 /r put - readonly def - 42/FontType resourcestatus{pop pop false}{true}ifelse - %APLsfntBegin - {currentfile 0(%APLsfntEnd\n)/SubFileDecode filter flushfile}if - /FontType 42 def - /FontMatrix matrix def - /FontBBox[2048 -399 1 index div -909 2 index div 2961 3 index div 2470 5 -1 roll div]cvx def - /sfnts [< - 74727565000900000000000063767420000000000000009C0000036A6670676D0000000000000408000008AA676C79660000000000000CB400000A706865616400000000000017240000003868686561000000000000175C00000024686D74780000000000001780000000346C6F636100000000000017B40000001C6D61787000000000000017D0000000207072657000000000000017F0000003CB05C0001005BD00280580001A042F001F0000FFD90000FFDA0000FFD9FE55FFE605C70010FE6DFFF1033B000000B9000000B902FE3F3C00C0008D009B00AF000600A800C00028005E009800C9016A00B9015C00B400D6011E002E0080000400B8004C00CC01FFFFD1006600A400AF007400C2009500B1000C0028006D0015004C008E0125FF7A000C0040004C00620084FFA200240038008600BD0039005E008E00EDFFA9FFB300400052005500AA00AB00C200CB012302B10413FFAEFFE4000800510074008400AA00D1FF4CFFAF0012002C004200500051008400BE012503DAFF680018003B0098009C009F00A100C100EC018201B4FF68FF76FFD0FFE100020018001C00530053007D01B401E103AF0486FF9CFFEAFFFE001F0028002A00520060009300A300AA00AF00AF00C001000145016B0174019301950240028202B404850517FEFD00060029004700470048006F008800B400B900C400F200F901EF02180310037403C5FF35FFF3000B004B004C0052005500650076007600870087008E00AB00BB0106013001430150017D0194019501D3022A025502580277027802E6034E035C037903D3047304B2058C0598060BFEF5FFBBFFC7FFD50017001D005B0072007E009C00C200D000F400FA01030106011C0125013B0142015E015E0180019B02B901A101B9025001C001D002AA01DF01E301EF01FB0205020C0215022B0274029302AB02C202CE03690395039903DF03F5043E050205A105E5062507DBFE62FE89FECEFF3BFFE1FFF800030008002100390042004E005F0061006F00700034007F008E00AD00AD00AF00BD00C400C500C900C900C900E3011C00ED00F800F901000112011A0132014D014D014E014F01660169019E01BA01BA01BE01E301EF01F602000200020902110217021C02530262026D028002D50280031B032A034A035A03AF03AF03C803D603FB03FB04050413041504470449008C046D049A049A04A604A804B204CF0539053E054E055605800589058C036305D105D6067E068E06B206EF06F00728074C076F078C00B400C900C000C10000000000000000000000000004012400AF0032006E0063014401620096014301A10161008A00740064018801EF01700028FF5D037E0347023000AA00BE007B0062009A007D0089035C00A1FFD803AA00D70093006C0000008000A70442001D0597001D00820030002A - 002A002A002A000040292A292827262524232221201F1E1D1C1B1A191817161514131211100D0C0B0A090807060504030201002C4523466020B02660B004262348482D2C452346236120B02661B004262348482D2C45234660B0206120B04660B004262348482D2C4523462361B0206020B02661B02061B004262348482D2C45234660B0406120B06660B004262348482D2C4523462361B0406020B02661B04061B004262348482D2C0110203C003C2D2C20452320B0CD442320B8015A51582320B08D44235920B0ED51582320B04D44235920B09051582320B00D44235921212D2C20204518684420B001602045B04676688A4560442D2C01B9400000000A2D2C00B9000040000B2D2C2045B00043617D6818B0004360442D2C45B01A234445B01923442D2C2045B00325456164B050515845441B2121592D2C20B0032552582359212D2C69B04061B0008B0C6423648BB8400062600C642364615C58B0036159B002602D2C45B0112BB0172344B0177AE5182D2C45B0112BB01723442D2C45B0112BB017458CB0172344B0177AE5182D2CB002254661658A46B040608B482D2CB0022546608A46B040618C482D2C4B53205C58B002855958B00185592D2C20B0032545B019236A4445B01A23444565234520B00325606A20B009234223688A6A606120B0005258B21A401A4523614459B0005058B219401945236144592D2CB9187E3B210B2D2CB92D412D410B2D2CB93B21187E0B2D2CB93B21E7830B2D2CB92D41D2C00B2D2CB9187EC4E00B2D2C4B525845441B2121592D2C0120B003252349B04060B0206320B000525823B002253823B002256538008A63381B212121212159012D2C456920B00943B0022660B00325B005254961B0805358B21940194523616844B21A401A4523606A44B209191A45652345604259B00943608A103A2D2C01B005251023208AF500B0016023EDEC2D2C01B005251023208AF500B0016123EDEC2D2C01B0062510F500EDEC2D2C20B001600110203C003C2D2C20B001610110203C003C2D2C764520B003254523616818236860442D2C7645B00325452361682318456860442D2C7645B0032545616823452361442D2C4569B014B0324B505821B0205961442DB8002B2C4BB800095058B101018E59B801FF85B800441DB9000900035F5E2DB8002C2C2020456944B001602DB8002D2CB8002C2A212DB8002E2C2046B003254652582359208A208A49648A204620686164B004254620686164525823658A592F20B00053586920B000545821B040591B6920B000545821B0406559593A2DB8002F2C2046B00425465258238A592046206A6164B0042546206A61645258238A592FFD2DB800302C4B20B0032650585158B080441BB04044591B21212045B0C05058B0C0441B2159592DB800312C2020456944B0016020 - 20457D691844B001602DB800322CB800312A2DB800332C4B20B003265358B0801BB040598A8A20B0032653582321B0C08A8A1B8A235920B0032653582321B801008A8A1B8A235920B0032653582321B801408A8A1B8A235920B80003265358B0032545B8018050582321B8018023211BB003254523212321591B2159442DB800342C4B535845441B2121592DB800352C4BB800095058B101018E59B801FF85B800441DB9000900035F5E2DB800362C2020456944B001602DB800372CB800362A212DB800382C2046B003254652582359208A208A49648A204620686164B004254620686164525823658A592F20B00053586920B000545821B040591B6920B000545821B0406559593A2DB800392C2046B00425465258238A592046206A6164B0042546206A61645258238A592FFD2DB8003A2C4B20B0032650585158B080441BB04044591B21212045B0C05058B0C0441B2159592DB8003B2C2020456944B001602020457D691844B001602DB8003C2CB8003B2A2DB8003D2C4B20B003265358B0801BB040598A8A20B0032653582321B0C08A8A1B8A235920B0032653582321B801008A8A1B8A235920B0032653582321B801408A8A1B8A235920B80003265358B0032545B8018050582321B8018023211BB003254523212321591B2159442DB8003E2C4B535845441B2121592DB8003F2C4BB800095058B101018E59B801FF85B800441DB9000900035F5E2DB800402C2020456944B001602DB800412CB800402A212DB800422C2046B003254652582359208A208A49648A204620686164B004254620686164525823658A592F20B00053586920B000545821B040591B6920B000545821B0406559593A2DB800432C2046B00425465258238A592046206A6164B0042546206A61645258238A592FFD2DB800442C4B20B0032650585158B080441BB04044591B21212045B0C05058B0C0441B2159592DB800452C2020456944B001602020457D691844B001602DB800462CB800452A2DB800472C4B20B003265358B0801BB040598A8A20B0032653582321B0C08A8A1B8A235920B0032653582321B801008A8A1B8A235920B0032653582321B801408A8A1B8A235920B80003265358B0032545B8018050582321B8018023211BB003254523212321591B2159442DB800482C4B535845441B2121592DB800492C4BB800095058B101018E59B801FF85B800441DB9000900035F5E2DB8004A2C2020456944B001602DB8004B2CB8004A2A212DB8004C2C2046B003254652582359208A208A49648A204620686164B004254620686164525823658A592F20B00053586920B000545821B040591B6920B000545821B0406559593A2DB8004D2C2046B00425465258238A592046206A6164B0042546206A61645258238A592FFD2DB8004E2C4B20B0032650585158 - B080441BB04044591B21212045B0C05058B0C0441B2159592DB8004F2C2020456944B001602020457D691844B001602DB800502CB8004F2A2DB800512C4B20B003265358B0801BB040598A8A20B0032653582321B0C08A8A1B8A235920B0032653582321B801008A8A1B8A235920B0032653582321B801408A8A1B8A235920B80003265358B0032545B8018050582321B8018023211BB003254523212321591B2159442DB800522C4B535845441B2121592D0000000200A10000052F05BD00030007003E402105062F02010004072F03000A05042F0303021A0906072F01001908098821637B182B2B4EF43C4DFD3C4E10F63C4D10FD3C003F3CFD3C3F3CFD3C31303311211127112111A1048EB8FCE205BDFA43B8044DFBB3000000000100AF000004AA05BD000900394018071E040409031E0100020908066B011A0B03082500190A0BB80157B32195DC182B2B4EF44DFD3C4E10F64DE4003F3F3CED12392FFD313013211521112115211123AF03FBFCCC02D1FD2FC705BDB4FE42AFFD640000030052FFDC04470449000F003B003C00DD40382A30010A100B1B0C1C2733481069096A10073908120C09031B320724091D100C1D3B2B022E293BB73B023B322A2512100705081C2722171CB8018A4023171D1F07271D2E0B021D350B3C073C3C1C1407292AA8241A3E1B291C4A0F2738193D3EBC0197002100B9019600182B2B4EF44DEDF4ED4E10F64DE4FDC412392F003F3FED3FED3FEDED1239111217395D1112392EED2EED01111239111739313043794028363715220001192501360F2100181E1B21001620142101212200370221001A1D1721011521172101002B2B2B01103C2B2B2B2B818181005D015D2416333237363D010E010F0106070615013637363534262322070607233E01333217161511141633323637150E0123222726270E012322263534363713010E724E5F59962168326D62315301B43E150C837A8D3B210AA805F7A3BD767517250C1E112A2C265D2A160937CE7C95BDBA978ACF5A2C49A691151C060E0D1C2F67016C082C182D5C534C2A53C69B484898FD971C220303850C06422340486AB58895A41301E4000002003BFFE103D0044E001A001B00A7402FA719019818A808AA18034A08119B14030314061D1A070D1D140B1B071B1B1710271201032702111A1D0A2717191C1DB80107B321727D182B2B4EF44DED4E10F63C4DED3939ED12392F003F3FED3FED12392F10ED313043794034001908250C150A26000E1310260112110F1007190A26000500032101010204030B160D26000F120D2600091806260104010621012B2B2B2B01103C103C2B2B103C103C2B2B2B81005D015D001617232E012322070615141633323637330E01232202351000330702D6E317AF10727EAC4A308892708319AF1EF0BBD2FA0112D4 - 1C044EB0D76383A86DA0A1DC8977D5C50133E6011A013A0500030048FFDA041A0449001C00240025010C40799708991AA71F03050E020F0514150E120F1514400C401408291A014B0BB603C701C603C71BD808D909D61FD823E817E8230BC711C712025C080521240F9A161D243906070716211D1C070A1D160B2507971CA71CB71CD71C0425160F251C05190A0C07110E270F1D27051A27242E072719192627D421A65D182B2B4EF44DFDE44E10F64DEDD4FD391239391112393912392F5D003F3FED3FED12392F3CFD3C10ED1112393130437940460023040503050205010504061F26111012101310141004060C25221B24260020001D26011E1D09170726000B150E26010D0E231A2126011E0521260108180A26000D100A2600002B2B2B2B01103C2B2B103C2B2B2B2A2B2A8101715D00715D5D00161716171615211E013332373637330E01070607062322001110003301262726232206070102B4D638361210FCEF0590978D543014B1074F3152794152C8FEEA0118E2011F0B284AAD7CA805012304476B55516C4AA2A3C55D36473B912E501C100123010601020142FE26754682B38A01DC000000000200840000013B05BD000300070036401C07E50400010006030A0917171A06010229070300190809AA216242182B2B4EF43C4DC4FD3CC44E456544E6003F3F3C3F4DED3130133311231133152384B7B7B7B7042AFBD605BDCC000000010080000003F805BD000B00A740645902013A08011902010706170657056705790678078705B903C903DA030A05050608080709030284029402A4020302391209090405060504066D12070708080705040305060908050204030A00000403060A07060A061A0D09020A29000B190C0DB22162B9011600182B2B4EF43C4DFD3C3C194E10E618003F3C3C3F3C3F1112173901121739874D2E2B087D10C104872E182B5D057D10C010083C083C3130015D00715D7213331101330901230107112380AD01CEE6FE6601B1E6FEB297AD05BDFCAB01C7FE6FFD62021C8AFE6E0000000100890000013D05BD0003002940150000030A0517171A0102290003190405AA216242182B2B4EF43C4DFD3C4E456544E6003F3F31301333112389B4B405BDFA4300000001008400000625044700260085403B0708070E060F1708170E170F2708270E270F4819560B670B0C23250A1A1D23190A02041725211D171D0D060700061B1C2503130A2817171A112914B80101B21A291DB80101400A00012E25292600192728B8010DB3216242182B2B4EF43C4DFDE410F4EDF4FD4E456544E6003F173C3F3F3C4DEDED111217390111123912393130005D13331536373633321716173E01333217161511231134262322061511231134272623220615112384B240345971804E2C243CA265D84E2ABB6B4D6A99B71A297066 - A7B4042F984F243D3F244656539C548EFD3702E86B508EA6FD9102BB6D324B9ECFFDC8000003003BFFD90421044E000C0018001900904033980896109916A504A808A610A916B808C808D704E50EE9140C3A08061D18070C1D120B190719191502270F1A1B092715191A1BB80109B321725D182B2B4EF44DED4E10F64DED12392F003F3FED3FED31304379402C001704260B1309260000110226010717092600050D0226010A140C260001100C26000816062601030E0626012B2B2B2B012B2B2B2B2B81005D241235342726232206151416331200111002212200351000330702E085304CBAA59696A3D6011EFCFEF7DDFEFC0112E70674010FA6965E94FCB2ABE403DAFEECFEF4FEFDFEAE012BFC010E01400500020076FE5504250449000E00220074402CA908A717022808201C110E061D15070F060E1D1C0B220E0227181A240A2E102E2129220F1923248721BD5D182B2B4EF43C4DFDE4E44E10F64DED003F3FED3F3FED1139123931304379401C161B00051A260426001B022601051602260101190E260003170626012B2B012B2B2B2B8181005D243635342726232207061514171633013315363736333212111007062322272627112302C6A72546BABB45252546BAFE2EAF36405B7BB6FEB7749A7952303BB479D3D2805CB1BB649A7C57A603B18E49283CFEE9FEFDFEA2965F351E49FDDD00000100890000029204470011004F40262703260D37034704040E0810020E0911090C270805070006110A081A13012E10291100191213B80145B321627E182B2B4EF43C4DFDE44E10E6003F3F4D3FC4FDC411123939011112393130005D1333153E0133321617152E0123220615112389AB15A46B05181D101B108892B4042FB9369B0203BE0302AF72FD980000010017FFEF0209055A00180052B50D2E0AC00E01B8013F40250416391703060E0A111A17171A0301062900150E150F031F030203FC1619191AFC21677D182B2B4EF44DFD5D39C42F3CFD3C104E456544E6002F3F3F3C4DFD3CED10FDE431301333113315231114171633323637150E012322263511233533A8B6ABAB2615310D1E141F43277E5A9191055AFED593FD4538130B01028E0908816702C59300000001000000000000ADA987CF5F0F3CF500110800000000005F4D8F0000000000BD95F341FE71FC730B9109A6000000090001000000000000000100000629FE2900000C01FE71FB580AD400010000000000000000000000000000000D05C700A104E300AF047300520400003B0473004801C700840400008001C7008906AA00840473003B0473007602AA008902390017000000340066013001B2027C02AA031A033C03B8043004A204E8053800010000000D006B0009006C00080002001000100053000007E808AA00040001B800492BB8003F2BB800352BB8002B2B - 4118008001A6009001A600A001A600030069018B0079018B0089018B0099018B00040089018B0099018B00A9018B00B9018BB2040840BA0179001A014A400B041F5414191F180A0B1FD2B80106B49E1FD918E3BB0119000D00E10119B20D0009410A01A0019F0064001F01A50025017A00480028019AB3296C1F60410A01A9007001A9008001A90003008001A9000101A9B21E321FBE012C00250401001F0126001E0401B61FE7312D1FE531B80201B21FC227B80401B21FC11EB80201400F1FC01D9E1FBF1D671FBE1D671FAB27B80401B21FAA29B80401B61FA91D6C1F931EB8019AB21F921DB80101B21F911DB80101B21F751DB80201B61F6D29961F6431B8019AB21F4C96B802ABB21F391DB80156400B1F3638211F351DE41F2F27B80801400B1F2D1D4C1F2A31CD1F241DB802ABB21F201EB8012540111F1C1D931F3A1D4C1F1E1D45273A1D4527BB01AA019B002A019BB2254A1FBA019B0025017AB349293896B8017BB348283125B8017A403648289629482725294C1F252946272729482756C80784075B07410732072B072807260721071B071408120810080E080C080A08080807B801ACB23F1F06BB01AB003F001F01ABB308060805B801AEB23F1F04BB01AD003F001F01ADB70804080208000814B8FFE0B40000010014B801ABB41000000100B801ABB606100000010006B801ADB300000100B801AD401F04000001000410000001001002000001000200000001000002010802004A00B0018DB806008516763F183F123E113946443E113946443E113946443E113946443E113946443E11394660443E11394660443E11394660442B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B18011DB0964B5358B0AA1D59B0324B5358B0FF1D592B2B2B2B2B2B2B2B182B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B74752B2B2B65422B2B4B5279B376706A66456523456023456560234560B08B766818B080622020B16A704565234520B003266062636820B003266165B070236544B06A234420B176664565234520B003266062636820B003266165B066236544B0762344B10066455458B166406544B27640764523614459B36242725D456523456023456560234560B089766818B080622020B172424565234520B003266062636820B003266165B042236544B072234420B1625D4565234520B003266062636820B003266165B05D236544B0622344B1005D455458B15D406544B262406245236144592B2B2B2B456953427374B8019A2045694B20B02853B049515A58B020615944B801A6204569447500 - 00>] def - /CharStrings 13 dict dup begin - /.notdef 0 def -/F 1 def -/a 2 def -/c 3 def -/e 4 def -/i 5 def -/k 6 def -/l 7 def -/m 8 def -/o 9 def -/p 10 def -/r 11 def -/t 12 def - end readonly def - currentdict dup/FontName get exch definefont pop end - %APLsfntEnd - 42/FontType resourcestatus{pop pop true}{false}ifelse - {currentfile 0(%APLT1End\n)/SubFileDecode filter flushfile}if - /FontType 1 def - /FontMatrix [ 0.00048828125 0 0 0.00048828125 0 0 ] def - /FontBBox{-399 -909 2961 2470}def - /UniqueID 4100303 def - currentdict currentfile eexec - 54544758EC884CF30C3CD503CEDBFF3839C47C3C3333173232E3FDBFF439491DB843E1924E63AA7726BBB0485AB56D93D8C0906F647A47162891E73FFC2A9873C4B1EAC5EEBDFFC4D06084FBD84139DF4583C6E259D10699944D1068C9C45667DCCCFB9B7EA01B606435EDCBD273ABAC093D14085CCBAC149BD7382E842CFE0D7FE4FD2EF589A2471F6074A80A8B675C2F7A50D63AC1EF90D787BADD11633CB01CF6EE3B37AAF9078A69AC4740E9B6525D78BBD839551A1CB80DB8682FA5E87591BBD6EE8B946063A2A58D9CA3685AB305495DC5FB5747EB8A9A059C4976C0FE4EEAB1D56FF47F1E9664ED9F4A7DAB763AF92B2F6CF2FA7DEC24710E0B9096E30F772BA7FEA9BDBE496C42ED2CEB58F54E80BDF57CE7B4DB6CCFE7182F43BF93CCA0767AF95D62C5D2C3DC6AE1E6D139F51A2C63432117F1714C5566572EE9967A715420ABDCD1D7BD74F8450B89965FCC81C6ACA565C5F3CCF91D430D1F953E4F1A645300A98DD8C47CD64555F08F422340A85404EAE0D3229C4F9336B9470CACBD6BBF3395104750A915CC6EAAC197668267B8C62D2764C8CD69FD937CA3C924D997A0EDE7964BEB9EA2F92EF70C5E5DA0AA5567765E71F2B911B3C5586B741EEB93F3C73016EC16BFF283758900903D203992EFC8BAFAF13579C602F38C91B71CCBEC8DADBFCB2CF6F614DCF0404E4678133CDA654CD39ADC4A8DD80E44091325D4BAEB046A131D96C708762726CCA97DEB757FDA16D04214EEC78A6487C0D9DC3EF4FD1CE9E617E7EA3CD654C9EAD8228BFD8D778DAF901BA0BFD491E5665E119D5D8661F5544A778E558A7FC1C8E00F2A51FDF2C877B8F63C4A2D8F6A78CBD9B702005F5F14183F0DB3869A87DD767C7445B9676EA425DEFE5DB37455C87326D67159A28D6FA0E959D4C231EC57FC4B0076AFDD1C7865B52309F3560CE959EC2E46FC8EA2A68A63C818EABD500BC77DA328655FE9C0FA1593E815A4726DE444776403719E7445E78A8BA00EA542DE100137E559722D8DF5BD95304F0E645C0181BDA63C00D4273562B627AB6D1464CEF066CC716B84357DDD6B4837AFF097250EF82EBEE6641147A4DB90C3F679C45C68FC220A2C2D9A33F44841708AD39A857800C7DFBC7399379A0B43666195ABFC7492F78BF87CF6D7A20955C37F7AC7CD78861BDFDA795BF7F396DBB385E7AF19B36AB04A9A6B7C1EFA46D4296A7EBD071E91001FDCA052CBB3495B7DD7654F8AA616F72F8A9B5A78F937AA419E07B7CD4117D6AF557CDC5EE959176D5BFB1AB221088B48A09E4CF37ACC1B5848B5A66B88DE5891376188A84D8D603A0B9F5E36DDD7B53790E9D1AC4D5D1D949278E77FE365FB5E590C51CB79D9CDD32285A690DCB741D3344C0232991A0984763027F24CC51EC774F064884DDCBC420D6F957E1AFA8223095C1CDDB9C0D0D7A201 - C548EF294ACD4E5967A19F1DBD4AF182D3503AA9CFBBC47CC755D5E6C33C058EE8630A650BA886BF924AEAC4729137CB443F08BF23D14B2F91156AA3D35189FD3448669FCEF7ED122118BB7FF00ED7545F34C7741E3F709BF91F5F03D84FF9B42A6407A4E684F6C9407EF208FA7453779CA38DEC3E7AF34DF64DE99B116168583F76E285875AF06BAE383F1D39DBA9F8FF303CC8429757EA39075225C9D5B7C102F725D7B58CA3E86F568AF1C0665AE175A0C1310EB407B6D43B991AFDE10E2C3961456123F96BA75AA3B4BA45403991E0A6A5E7E940DEB07FA7DA9CFFB83492FD6351E419F3CC8BFC898AB69D6F0E63A46397C2CA0A2330E9CA13B1D51E08D544AF798855396F4891E0588181BB523C075D6F71D3E7EB4C40A28871215041615D56BB9133A75A9AAFFE71132C605CB88893F2C0EA97FDFAD409BF7B03DCAED6FF083A751952A3EEB455BDE220CD266914E100E3C90DCB1685ABD8B3E083985AF57782D5A650308A50D1699C57561770BFFC4A73F43EA9FBA10B534590B28C52321C7C08A5DE70F75F380B7839F0EDE724B13489DBB059D25F886A77F7370B3BBC14406AC8BAE373569D05D2928654D278202FADD3262CC62089557396E0155F5685B4DF83D7489605625DA3A6CC795AB3E0C8BC69A1E4D8CD7D759792896FD25F48DC2EAA9D67CBA3A553AA84D1EA90F17A488464A22AD3A5524E110B9F558A6C0DAD1723EC9AFA385E210016425FA73952962C9CD10E07533892A67A0B23161040923CB3645A7CC1240A995A9B7832039BA2EE321B6C45FB3FB0FB25A1ABD91C1C4AACC349307C394E7E988E7E06525CBFABCB8CA1C33148B8272DE08546FB662C421E749B658D05EF217CD91B6178F93A9097083D8CF60FE15463E53986E5CD091B18DC5F00AF7E4E7E0330FB2CE5335673CFB24D2150C966F3A6E7D4A5C8C3241E8B0A4CF0DEC3BB2B6D503EB0C2231E9CBF3580E18A1A8CBAB9459BF6B1B65D741D09F7A73617F5D7BCFC1532F9B3E36B821AFC20DDD7ED3CC35B83145A7C7F6CE3EE79B38540036D0E2E2E7DB2131243C789951513383C66FC538D5E710B1340ED2BDC6EB7A495427E99FDC774AC1E861ED88D9876777FE9D46AD9F04BC7C11E425ABDD4D62D84F41DECD641BC4F2A230558D7D346064D80F77A544A9AB05F5E8659EF287B6B735D73B40D0249D24B6602AEFF7774F3B59392A7E07FC44409E0F2963EEB1E6EFAA4B3AED50F5063E4F62D261718F0B285D46EE7959C9D45F63ABBC193350743274965775D620119C93C827046A2C2E7F12DB2CC30C2AB99BAB215E4716F15A99535046831CFE02D5DA257F42BD10D8D78431C7F20156D86CEBF7D1C896B1D0DB134EB70139F773C7CDD455101DEA73BB019BDDCF8BDDAB0F6A18CC7555D595EF1817755B621B9736DEDC24E0C3951838327C982EFF7D4 - 13C34D1CC35A95B658C4D179F1A232195C259A11D8880782F1E83AA1273501EE6896E22F913CC1B646FB4F6E2AADE96337BF0B2DE0E2B3B1BC45A420DC3D78D85F9537CC649153A84F494AFCF8A66BF39A9BF876B36F37C78AA6C11E96A3406D0189F34F4D79077B896B5D8BE21FFEF27B25E94761A507756A9506D8864A443A045A9D448191F7914701C62102951D4AB113DCC40399977EE83777C32F912AD665977230260979C271DACC5434011E840A06A3F46A755C5042B7C3FE6B197D884DBD738EF280E5A5E6C59D023A4F5DBD9588A64A56 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - cleartomark end - %APLT1End - -%RBIEndFontSubset -/Helvetica cguidfix -/F1.1/Helvetica renmfont -[ /CIEBasedABC 4 dict dup begin -/WhitePoint [ 0.9505 1.0000 1.0891 ] def -/DecodeABC [ { 1.8008 exp } bind { 1.8008 exp } bind { 1.8008 exp } bind ] def -/MatrixABC [ 0.4294 0.2332 0.0202 0.3278 0.6737 0.1105 0.1933 0.0938 0.9580 ] def -/RangeLMN [ 0.0 0.9505 0.0 1.0000 0.0 1.0891 ] def -end ] /Cs1 exch/ColorSpace dr pop -[ /CIEBasedA 5 dict dup begin /WhitePoint [ 0.9505 1.0000 1.0891 ] def -/DecodeA { { 1.8008 exp } bind exec} bind -def -/MatrixA [ 0.9642 1.0000 0.8249 ] def -/RangeLMN [ 0.0 2.0000 0.0 2.0000 0.0 2.0000 ] def -/DecodeLMN [ { 0.9857 mul} bind { 1.0000 mul} bind { 1.3202 mul} bind ] def -end ] /Cs2 exch/ColorSpace dr pop -%%EndPageSetup -/Cs1 SC -q -0 0 202 247 rc -76 0 0 76 126 171 cm -BI -/Width 228 -/Height 228 -/BitsPerComponent 8 -/Decode[ -0 1 -0 1 -0 1 -] -/Interpolate true -/DataSource cg_aiproc -ID -JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$ -JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$df6QN -JcC<$ec14#JcFg2o)>llm/E4KJcF:#JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#L&_,Nr;Q0` -n,2tXm/$VTn+cnXl2(2Pn,2YQq#7PuJcF:#JcCc1q#:6joDSI^q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\ -])R?]ec14#RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcDDC -rr2Keq#(*fr;6Kiqt]p[rqH*Zqt9jYp%-](qt'LQrq5sXrqH*\rqZHfq"sjap&4debl<7oec14#WW2bm -o)8Rcq"t$dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0dq"jd_ -qu$-cq#8hDJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjUqsX=JqsDo"rpBLK -qsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#[K$7*o)8Rcq"ssaqtU0bqt:$_ -r:U']rq$$Xqsj[TqsX=Io'?;?o',<#p$)A=p$;D?rpTaRrpfdSrq$-]rq6'[rqH3_rqZ?dqu$-cqu5[V -JcF:#JcEIaqu60brquZjq"k!bq"Od]rq69_!:p6_oD\=Xnc&"VnG_nRmf)VQm.foDl20];kPjW@jlYY' -jnn3;kOn'<l1jTDm/HDImf)_Tn,DhUnc&+YoD\C]p&=[^p\Xa\qYpBhr:U$]rpB`:s4..#s2Y0:rpp$e -r;6BjqYU*fq"sgbpAXaao`"I]o(qkWnaZVIrp]pTrpB^Orp0RKroj7BroX+>roEt:ro3V0eDU5_qr7V8 -qrIb<qr[n@qrn%Erp0RMrpB^Qrp]pUrp]gTrpp'[rq-3_rq??cqtU0dqtg<hqu$-cp&=[bJcF:#JcEmm -rr2BbrquZjrqcEbq"F^Zrq$-[qsj[SrpTpU!UfCTmJcGNlMg&IkkjQ?jo4?9iqq[5hu;R5htu:0h:LH] -h>#k+i;VX2i:u=/jSn9?kPOKBl2KuIli-;Nmf)_Tn,DhUnc&+YoD\CWpA"F[qYpBhr:9gcrq?ACs4..# -s3:TCrpp$er;QTjqYU*cp\sm`p&=U\nc&"VnG_nUmf)PQlN->;rp'LHqrdt>qr@S4rnm_5qqq;,qqV)' -rn?qrn(@<dqqD&(p"]Q&qqqD2rnm_5ro*k:qrIb>qrn%Erp0RMqsOIQrpTjUrpfmXrq60^rqHEfq"k!e -rquHfqu6EkJcF:#JcF=$rr2Kerqucmqtg3cqtL*`rq-*Zqsj[Srp]pTrpB^Nrp'LHroX:D!TrPDjo4<> -ir7p9i;;F2h>Z4/g\]\'f`'J!ec+(ke,IejdI5HWdJMAhe,.Yoebdqpf`'S'g]$"-h>Z=/i;V^7ir8!; -jo4EAkPj]El2L#JmJcPQnG_nUnG_tWoDA1WpAXgcq=sgcqu6NdrVZWprdk+#s+14$s76-fr;QTmqYp<c -q#:!dp&=U_o)%tVnG_kTmJcGNlMg&Ikl0`Djo4<@irS3#ro3q8rnm_3rnRM-rn@A(rn%%urmh"tpsT/g -p!<W_ps&9Ops&]]qp5/dpsT/krmgnsrn%/%rn@A+rnRM0rnm_5ro3q;roF(?roa:ErosFIrp0RNrpTjU -rpfmVrq-3_rq?-^rqZQirqlTjpAG!iJcF=$JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-irB#Wq#13iqtpBhqt^$]rq-*ZqsjRPrp9XMroj@EroX4@ro=";ro!e4rn[S. -!87J-gA]b(f)F1ue,.Plci2;jcMl&ebPoZ`ao9?[`r<sV`;@IO_Y_1*_#D1I_Z%IM`;[aT`r=$Xao9H^ -bPo`bc2Q)hci2;jdJhVoec+/!f`'S'g]$%.hu;R5ir8!;jSn<@kPj]Eli-;Kn,DhUnc&.Wo_A1[q>:$f -qu$?lr:p6frdk+2s+143s8N#jrV69eq>U0apAXX^nb_hTmf)VQli-2Kl2KfDjSn3=iVqd7hu;F1gA]e) -ec=5$e^aZKrmLenrm1ShrlkAbrlP/\rl>#Wrl"]OrkeQJrkJHHpq>Lqpq?R=qnW3JqnrEOrl+lWrlG)\ -rlb;brm(MhrmC_nrm^qtrmq)%rnIG-rnm_5ro*k:roF(?rosFIrp0RNrpK[QqssOUqtU0dq>10hp&4mh -JcFj3JcG'9qu69erquQfrqQBbqt9s\rp]gRrpB^Orp0RIroa:Cro3q9qqqD/rnRM+rn%/"rmCen!RT3m -ci25hc2Prdao9B\`r<pU_u@OP_#(nG^AbhF]`,PB])K8>\GNc7[cY!p[f3c5\Gj&<])K>@]`,VD^AbnE -_#D4M_u@UR`r=$Xao9N`c2Q#fci2>kdf.erfDaJ&h#?.,hu;U6ir8*>kPj]Eli-8MmJcSOnGDkWp&=^_ -q"aadqYU3frUp/@s6fo<s7--grq66hr;6BjqYp<iq#:$epAXaao`"F\nc&"VnG_hSli-,IkPjWCj8S'8 -hu;F1g]#h(f)F1udJhMlci2,gaoTZ-rlP/Zrl"fRrk\TLrkJHGrk/6Arji$<rjMg5qm61)ric=*ric4% -k,n<ZrilC*rilC,rj2L/rjMg8rji$>rk&0CrkJHJrk\TOrl+lVrlP/_rlkAfrm:Ylrm^qtrn%/(rn[J/ -ro*k:roX4Croj@IrpB^SrpTjVrpp'\rq69arqHEe!VuNkq>:$fqtp<grVQSFs7-,?s7--^rVl`lqu6Hk -q>U0gp\smco`"I]o)A.Xn,DbSli-2Kl2KfDjSn3=i;VU4h>Z.-f`'J$eGdnnci2/fb5TE]`W=*!rl"fP -rkSNJrk/6Arji$;rjMg6rj)O.ric=*riZ7&riH+"ri5jpri#^lk,/-Uql'Lnri5suriH+$riZ7)ric=+ -rj)O2rjMg8rji$?rk/6FrkSNLrl"fTrl>#\rlk8crmLeqrmq)$rn@A-rnm_5ro="=roO.Drp'LKrpKdS -rp]pXrq$-]rq??c!VlEiq#:*gqYU0hr:U#>s7-,?s7H?jrqQHkr;6BjqYp<iq#:$epAXaao)A1Vn,D_R -m/H8Kkl0`Dir7m8hu;I2h#?%,f)F1udJhMlcMl)fb5TH\`W!^S^]D6drkJHGrk/6ArjMg6rj;[0rilC* -riQ1$ri?$tri#gnrh]UiqkO.brh8/@rh9=cqkO.drh]Ukrhoapri?%"riQ1'rilC,rj;[4rjMg;rk&0C -rkJHKrkeZRrlG)]rltGfrm:Ylrm^qurn@A+rn[S2ro*k9roX4CrosFKrpBUOrpg!Yrq69a!Vc<gp\sse -q>U6iqtp<drVQSFs7cPEs8)cprq66hr;QQiq>9pcpAX^`oD\=[nG_nUmf)MNl2KoGjSn09i;VR3g]#e' -eGdqrd/M>ic2Piaa8X'W_>_7L^Ab_E\H07OrjVm5rj)F)riH+"ri#gorhf[irhBCcrh07_rgs+[rg`tW -rgN_Prg;i7qj@ANqjRMRrg`tYrgs+]rh07arhBCerhf[mri#gsriQ($riuI/rjVm;rk&0DrkJHKrl+lW -rlP/arm1SjrmUksrmq)'rn[J0ro="=roj@Grp'LNrpTjUrpp'[!VH!ao_\@]p\t!cqYU3frVQSFs8)bH -s8)cjrVl`lqtp3gq#:!dp&=U_o)A1Yn,DbSm/H>MkPjWCjo46<i;VU4gA]b(f)F.tdJhJkbl5caaSs*V -_Z%@M^AbbD\c/u:ZN7D=qlp(%ri?$srhf[krhKIeqk*kYrg`tVrgEbQrg*GHrfmDGqi^W7plPB8plbW? -rfmDIqj.5KrgEbSrg`tYqk*k]rhKIhrhoaori?%#qlp(+rjDa9rk&0DrkSNMrkn`VrlY5arm1SkrmUkt -rn.5(rndY3ro*k<roX4Crp0RMrpKdSrp^$[nc87[o`"O_pA=Xaq>U9gr:p5As8)bJs7lTgrVQKkqYp<i -q#:$ep&=U_oD\7Yn,DbSli-2Kkl0]Cj87d6h>Z1.fDa>"dJhMlc2Poca8X'W_Z%@M^AbeE\,Nf7ZMq'. -XoY].riQ1!rhoalrhBCbrh'1]rg`tWrg<\Nrg!AErf[8BqiC`:oo8j-pl"g(qi1K5rf?r<qi^rBrg!JL -rg<\Srgj%[rh'1`rhBCgrhoapriQ1&rilC-rjDa7rk/6DrkSNMrl+lWrlb;crm:Ylrm^r!rnIG.qr%J6 -roO.CrosFJrpKdS!V#RYnG`%Yo`"O_p\sseq>:$fqtU-bre(6*s82fmrVl`lqu6Hkq>U0gp\smco`"F\ -nc&"VnG_hSli-)Hk5OH@i;VU4h>Z+,fDa>"d/M>ic2Piaa8X$V_#D(I]`,A=[/RB1Yl:d(X8]$tV#dEh -rhKIcrgs+[rgNhRrg3VJrf[8CrfI,?rf6l6reg]2qhOs"qh+$_re(!!reLB,qhkB2rf6u=rfI,Arf[8E -rg3VPrgNhWrh'1_rhKIiri#gsriQ1(rj)O2rjMg=rkABIrl"fUrlP/arm1Sjrmh#"rn7;,rnm_5roF(? -roa:Hrp9aUn,VtWn,DkVo)A:\p&=^bq#:*gqYpBhr;QZfre^Z0s8N#mrV69hq>U0gp\smco`"I]nG_nU -mf)POlMg&Ijo4<>i;VU4g]#n*f)F1udJhDib5TK]_u@LO^](kE\c0);Z2V!,Y5YF"VuEOlU&^heTV2:U -rgWnTrg3VLrfd5@rf6u:reg]3reUH*re19'rdt#tomcsimsY(^pj`0krdt-%qh4s&reUQ1reg]6rf-f: -rfd>Hrg3VPrgWnYrh07brh]Ulri,n"ric=+rjVm;rk&0Erk\TOrlG)]rltGirm^qurn7;*rndY4ro="> -rosFI!UK%Oli->On,DhUoD\F^pAXgcq#:*aqtU-ere^Z6s7lTjrVl`lqu6Hkq#:$epAX^`o)%qUmf)SP -l2KoGk5O?=i;VX5gA]b(f)F(rd/M>iao9?[_u@IN^&GYC[JmN3Yl:g)X8]'sU]."eTDkD^RfT"JrgEbN -rfmDErfI,>rf-o7reUQ.re19'rdt-"qg\ToqgJ6dpj2CSpj2^^rdFZmrdXfqrdt-%re19*reUQ2rf-o; -rfI,Arfd>HrgEbTrgs+]rh9=dri#grriZ7)rj2U3rk&0CrkSNNrl4rZrm(MhrmC_rrn.5(rnm_5ro*k= -roX=HklBuIm/HDLnG`%Yo`"R`p\ssbqYpBhr;QZirf$l<s82fmrVl`lqu6Hkq>U0gpAXaao`"C[nG_nU -li-2Kkl0]Cj8S!9hYu:/g&BM#df.Slc2Pia`r<gR^](qG\,Nf7Z2Us+X8]*tV#I+fTDkG]S,SfSP5paH -P*5g*rf6u:reg]1re:?(rdk'!rdXoqrd=]lrd"Kfrce6^rcJ$Yqf:h=olC%QqfMg[rce?drd"Kird=]n -rdXotrdk'$re:?,reg]5rf6u=rfR2Drg<\Rrgs+]rhBCfri,muric=+rj;[6rk8<Grk\TRrlP/arm1Sl -rm^r#rnIG/ro!e9!TiDCjo4KCl2L#Jn,DhUnc&1[p&=[aq#:*gqYpBhr;QZfrf[;Bs8N#mrV69hq"sgb -p&=U_o)A.Xmf)SPlMg#Hk5OB>i;VU4g&BY'f)F%qcMl&ea8X'W_>_1J])K2<Zi73.Xo>=!VZ*=hT`1M] -S,ScRQ2ZsGO8t7@NK*pqreLK-re:?&rdautrdFcmrd"Kfrce?brcJ$Yqf2LPrbpD+rbqRNrc.pYqfMg\ -rce?drd"KirdFcqrdb!!re:?+reLK2rf-o=rf[8Grg3VRrgj%]rhBChri,n!rilC.rjVm<rkABJrl"fV -rlkAerm:Yqrn%/&rndY4!TN)=ir8*>kl0lHm/HGPnG`"XoD\F^p\Xa\qtU-erf[;Hs7lTjrVl`lqu6Hh -p\smco`"FYn,D\Qli-,Ijo49=i;VR3g]#e'e,I_ncMl#daSs'U_#D(I\c0&:Z2Us+X8]*tU]-tdTDk>Z -R/WBMOoCIANrFn9L]N<freCE(rdautrdFcnrd4Whrc\9_rcA'Zqf)FNphg"HqeP#&rbMCIphfnHqf)OT -rcA'\rc\9crd4WlrdFcqrdk'#reCE.reg]8rf@&@rg!JMrgWnZrh9=dri,muric=+rjDa9rkABIrkeZU -rlY5crm:Yormq)'rnRV5huM^7ir8*>kl0oImJHAOo)A:YpAXg`qYpBhr;QZirg!MNs82fmrVl`lqu6Hk -q#:$epAXaao`"C[nG_nUli-/JkPjK?iVqa6g]#h(ec*qpcMl&e`r<mT^](qG\c0&:Yl:d(X8\spU]-nb -Sc5&VQN!$GOT(:>MZ/D1L&QW'J,t1NrdXoprd+QhrcS3^rc8!WqeuINrbVRLrbDFGqe,n?rakb5ojdc+ -qd]2-ral(@qe,nBrbDFJrbVRNrbq[Qrc8!ZrcS3crd4WlrdXotrdk'&reUQ2rf6u=rfR2GrgEbVrh'1a -rh]UpriZ7)rjMg:rk8<Grkn`TrlkAerm:Yprn%8+gAp"-hu;U6ir8-?l2L#Jn,DhUnc&1[p&=[ap\t!f -qYpBhr;QZfrgWqTs8N#mrV69hq"sgbo`"I]o)A.Xmf)SPl2KlFjSn*:hYu=0f)F1udJhDib5TK]_Z%=L -]`,D>[/R</XT#0tV>d1fT)P5YQi<6KOT(:>MuJS4L&Q`(JGsutHNAJ?rd"Kerc\9_rc.pVrbh^OrbMLJ -rb21Arau.@qdf\9raPY2ojIQ%nmM6$raPk:qdf\;rau.Bqe5tDrbMLLrbh^Rrc.pZrcS3ard"KirdOis -re(3(re^W4rf6u>rfmDKrgWnYrh9=fri#gtrilC/rjVm>rkJHLrlG)]rltGirmUu"ec=;#h#?./i;Vg: -kPj`Fm/HGPnG`"XoD\C]p\Xa\qtU-ergWqTs8N#prVl`lqu6Hhp\smcoD\=Xn,D\QlMfrFj8S!9hYu:/ -g&BG!d/M>iao9<Z_Z%=L]DfA?ZMq',Xo>3sU]-nbSc5&VQN!$GO8b.<M>i8/K)U<"If=`oGQ;mfG'<k, -rc.pVrbqdQrbVRLrb;@Frb)4@qd]M3ra5Y4qd9,)pg*>npg*Z$qd9>1ra5Y4raGe9qdf\=rb2:FrbMLL -rb_XQrc%jVrcJ-_rcnEirdFcrrdt-(re^W6rf@&@rg*POrgj%\rhKIiriQ1(rj)O6rk/6FrkeZSrlP/b -rm1\odK%_pg&Bb*hYuI4jSn<@lMg/In,DkVoDA7\p\Xgdqtp<jrVQS`s.98irqlZnr;6BjqYp9hp\smc -o`"I]nc&%Wmf)MNkPjTBir7m8hYu1,ec+"rd/M8gaSs'U^](qG[f3W4YPtX&W;`UlT`1M]Rf8NMOoCF@ -MZ/D1K`6N$If=`oH2`$eFT-7[DujosrbqdPrbDFHrau.@rac";raGe5ra>_4ra,J-r`oG,r`];(oiU?X -nlYlor`];*qcs,+qd080ra5Y5raPk;ral(@rb;@IrbVRPrc%jVrcJ-_rd"KjrdOisre19+reg]9rfR2D -rgNhWrh07drhoasric=-rjMg>rkSNMrlG)^!RT0nd/MJmf)F>$hYuI4ir8'=kl0lHmf)\Snc&.Zp&=[a -p\t!fqYpBhr;QZlrgs.]s7lQfqu6Ejq#:$eo`"I]nc&%Wmf)SPkPjTBir7m8h>Z.-ec+%sci2,ea8X!U -^](kE\Gif5Y5YL$V>d7hTDkA[R/W?LOT(7=MZ/>/KDpB"IK"QlGlDgaEr0bTC]S?grbDFGrau.?raYq: -qdBD0ra#;'qcWo#pfGX=pfI>pr`T##ra#M0qdBD4raYq<rau.CrbDFKqeuISrcJ-ard+QlrdXp!re:?/ -rf$i<rfmDLrg`t[rhBCgri?%%rj)O5rk&0Erkn`U!R&XdbPoiedf.ergA]n,i;Va8jo4HBm/HDOnG_tW -oD\C]p\sseq=sj^rLX%_s8N#mrVQKkqYp9hp\smcoD\=[n,DbSm/H;Ljo4<>hu;I2g&BV&dJhJkbl5W] -_u@FM]Df8<ZMq',WrAmpT`1P^SGnfQP5^OAMuJP3L&QW%If=`oGlDjbErL%WDZ4MPC&hoJBP@BXraYq: -ra5Y4ra5Y2r`oG,r`]2%r`K/#pf7;mr_reoe5?*@r_reqqc3MoqcNi#r`];*r`o>,ra>_4raGe9rb)4E -rbDFLrbh^Src8!]rcnEirdOisre:?-repc:rf[8Grg`tZrh07fri5t$rj)O4rk&0ErkecV`W4$Xbl5oe -dJhbsgA]q-hu;X7jo4QEli->On,DkVoD\I_p\ssbqYpBerVQSis/5nrrqQHkr;QTmqYp<iq#:!dp&=U_ -nc&%Wn,DVOkPjTBiVqa6h>Z%*eGdhoc2Pf``W![P^&GVBZi73.Xo>3sU]-nbS,S`QP5^OAMuJP3K)U<" -J,X`mGQ)^`E;jeTDZ4DMB`;WC@fTs=@Uf=Dra>_3r`oG,r`];'r`8nrr`&kqqbm;gnkf<]r_W8`peLT[ -r_WSinkf<_peq)ir`&ksqc<\ur`T5)r`oG.ra>_4raGe9rau.CrbDFMrbqdTrcJ-_rd"Kmrdk'#reUQ3 -rf@&Arg3VRrh'1brhf[srilC.rjr*B!PlJN_#D=Pao9Qad/MPofDaV*hu;U6jo4KClMg8OnG_tWo`"O_ -pAXjdq>U6iqu6NjrVQSls/5nirVl`oqu6Ejq#:$ep&=U_o)A.Xmf)SPkPjTBir7m8h#?"+eGdkpcMkoa -`W!^Q^&GP@[/R</XT#0tUAgb`S,S]PP5^OAM>i;0KDpB"HiA<iFT-=[DuOYRD#S2KB)Z??A,]j9?3+A= -ra#M-r`];(r`B)"r`/qsqc!Ahr_NMiqbQu^peBR<peCNYqbR2fr_NMir_`Ynqc*Ppr`9#"r`T5(r`fA- -ra5Y4raYq=rau.ErbMLNrbqdVrcJ-brd=]pre(3)re^W8rf[8GrgWnZrhBCjri?%&rj;[8!PQ/H^&GkI -`W!sXcMl5jeGe/#h#?72ir8'=kPjiImf)_To)A7[p&=^bq#:*gqu6NdrMT[qs8N#mrVl`oqu6Hkq"sgb -o`"FYn,D\QlMfoEj8Rs8h>Z+,f)F%qc2Poc`;[UP^](bB[/R9.X8]!qUAgeaRf8WPOT(7=MuJD/Jc:/u -HiA9hFT-7YDZ4MPCAqoGB)Z9=@/aO4>l\+1>[784r`K/$r`9"ur`&kpr_`YkpeUlaqb?`Wpe0F8pe10O -r_<8bqbR2fr_`Ymr_rerr`9#"r`K/(r`oG.ra5Y5raPk=rb2:Grb_XQrc%jYrce?grdXp!re19/rf6u> -rg*PPrh'1arhoarric=.!P#W>\Gj8B_Z%LQbPofdd/MVqg&Bh,hu;X7jo4QEm/-8No)A:\p\XabqYpBk -r:p6friQ4#s8N#prVl`oqYU*fp\smco`"C[nG_nUli-/Jk5OB>hu;I2fDa;!d/M;haSs-W_#CtF\,NW2 -Xo>C#U]-qcSc4rSPQ$XBMuJJ1K)U<"I/\EjF8g4ZDuOSPC&VcEA,]s7?iF=0>Q._)<WQ6%r`/hor_iVi -r_NMir_EGer_32^r^uiTqaf4,ognsOqb$i\qb6u`r_EGhr_NDfqbmDlr`/r!r`K/(ra#D.raGe9rb)4E -rbVRPrc.pYrd"Kjrdb!"reLK2rf@&Brg*PSrh07cri?%$!O/d.Yl;-2]DfVF`;[mXc2Q)heGe)!h>Z@3 -ir8*>kl0oIn,DhUnc&1[p&=^bq>:$cr;QZlriQ4&s8N#prVl`oqtp3gq#:!do`"I]nG_kTm/H8KkPjN@ -i;VO2g&BM#dJhGjaSs0X_>_(G\,N`5Xo>=!V>d.eSGnoTOoCC?MuJG0K)U9!HN&-fFT-7YDZ4JOBDuNB -AH$!9?N+70>Q.e)=8l2";uortr_r\kqbR)`r_3;aoh+mJogdM$qa^3Joh,3Vr_3;cr_E>dr_WSkr_req -r`/r!r`T5)ra#M1ra>_9ral(ArbVROrc%jYrce?frdXp!re:?0rf6u?rg<\Srh07eri#q#XT5L&Zi7H5 -]DfYG`W!sXcMl5jeGe/#h#?72j8S3?l2L&Kmf)_ToD\F^pA=Xaq>U9jr;6HlriQ4)s8N#prVl`lqu6Ej -q#:$eo`"F\nG_nUm/H>MkPjQAi;VU4gA]_'d/M;hbPoHZ_>_1J\,N`5YPtO#V>d.eSGnlSP5^L@MZ/D1 -JGsurHiA0eF8g+WDZ4GNB`;N@@fBa6?N+4/>5hY'<rQ+u;?0Pp;,R<gr_WSir_EGdqb-o\oh#-Rqa^3H -e4&^nr^ZiVqapZWr_*,^qbI,er_NMjr_i_qr`B)$r`];*ra,S2raGe9rb2:Grbh^Rrc8!\rd4Wnrdb!' -reg]8rf[8Irg`t\rhTXpW;rpsYPtm-\,O,@_>_CPbPofdd/MYrgA]t.i;Vg:kPjfHmJcSRnG`%Yo`"Ua -q#:*gqtp<jrVQSus0Mb)rqQHhqu6Hkp\smcp&=O]nc&"Vm/H;Lkl0T@i;VX5f`'G#dJhDiaSs-W_#CtF -\,NW2XT#3uU&LY_S,SWNOoCC?LAli)J,XipGlDgaE;j_RC]7rFAH$$:@/aL3>lIk)<rQ+u;Ys>j:]O8l -:J^sbr_3;ar_!&Zr^coVog\gIqaA:gogJdJnj`UKqag]Xr_!/_r_3;dr_NMir_`Pjr`/r!r`K/)ra#M2 -raGe:rau.Frbh^SrcJ-`rd=]pre(3)rf6u>rfd>Nrgj.aT`CecWW'%!Yl;-2]DfVF`;[mXc2Q,iec+5# -hu;U6ir80@l2L&Kn,DkVo)A=]pAXg`qYpBerVQT&s0Mb)rqQHkqu6Hkq>U-fpAX^`nc&%Wmf)MNkl0`D -i;VR3g]#b&df.SlaSs0X_>_(G\,N`5Xo>9uU]-nbRf8WPOT(4<M>i,+J,XipG5cR^DuOVQC&VcEA,]p9 -?iF:/>5h\(<W5ts;uTVj:]=)h9`[s_r_3;`qapcXqa^WTogSaGYXA(OqaLBOr^ZiVr^luZr_3;cr_EGg -qb[8jr`&ksr`T5(r`fA/raGe9rb)4Frb_XQrcA'^rd=]prdt-+rf-o=rg*PP!M>taTDkVbW;`puZi7H5 -]DfYG`W!sXci2Alec+>&hYuI4k5OTDlMg5Nn,DkVo`"O_p\t!fqYpBerVQT&s0Mb)rqlZnr;QQlq>U0g -pAX^`o)A.Xmf)SPkl0]Cir7m8h#?"+df.Slbl5Q[_>_4K\,N`5YPtL"V#I"cS,S`QOoC@>M#N&+J,Xfo -GlD^^DuOVQC&V`D@fBd7?N+4/=oMP&<rQ"r;>sAj;#X5h:&[fd9*%[Yr_!&Zr^cfRpdP0Mj$V<_ksP>9 -pdOsIqag]Xr_!/_r_3;cr_EGhr_NMjr_i_rr`B)%r`oG.ra>_7rau.Drb_XQrc.p^rd4Wore(3+rf-o> -rg!SSRfJrWTDkYcW;a""Zi7H5^])+L`;\![ci2Alg&Be+i;Va8k5OTDm/HDOnG`"Xp&=[aq#:*gqYU3i -rVQT&s1/1/rqQHkr;QTmq>U0gp\sgao)%qUm/H8Kjo4<>hu;C0fDa7ud/M5fa8WmR]`,G?Yl:d(WrA^k -T)P5YPQ$[CN;eM0Jc:/uGlDjbEW0nUCAqlFA,]p9?iF=0>5hY'<W5ts;Z9Ml:]=,g9`@]a9)_B^8-)7P -r^Z`QqaLKPksM[AlpLY<r^HTOr^ZrYr^m)]r_*5ar_EGgr_WSlr_rerr`K/'r`oG0raGe9rb)4GrbqdU -rcS3brdXp!re190rf7)DP5pgGS,T#YU&M(kXo>R(\Gj/?_#DCRbPolfe,Itug]$+0ir8'=l2L&HnG`%Y -o`"Uaq#:*gqu6NjrVQT)s1/1/rqlZnr;6Bjq#:$epAX[_o)A+WmJcDMkl0WAi;VR3fDa;!d/M8gaSs*V -^&GP@Zi7-,WrAjoTDk;YQ2ZmEN;eY4Jc:,tHN&$cEW0nUCAqlFAH$$:?iF=0=oMM%<W5qr;Ys8h:&[ic -9)_EZ8,u0X8,,OP7,pY=6Kpl77/04M8,,XS8cD?]9`@c`:]=5j;uTer=8lA%>lJ(/@K'g:BDuZFDuOeV -FT-UcIK"fsM#N;5OH9I(rg!JOrh'1dri,n"rj2U6rk8<Krl>#^rm:Yorn%/*ro!e9roj@HrpB^Rrpg!Z -rq??crqQKiqu$Hlqu4/+\c;[.qu-EhrqcWgrq??arpp'XrpKdOrosFEro!e3rnIG&rmLelrlG)WrkJHD -rjDa/ri?$prh07[rg*PGrf$i3rdt-!rd+Qfrc%jSrbVRHrabn5r`oG+r`9"tr_`Ykr_NMgr_3;ar_!/] -r^d#YrC6]SqaLKPmmE@,mmHt?r^HTOr^ZrYr^m)]r_*5aqbI,er_`Yor`9#%r`o>-raYq?rbVROrc%j\ -rd4Wordt-)!K;s;N;et=QN!BQT`1hfX8]=%[/RZ9^])1NaSsNbdf.erg]$(/i;Vm<kl0oImf)_To)A=] -pAXg`qYpBkrVQT)s1JC2rqlZnr;QQlq>U0gpAX^`oD\7YmJcGNkPjTBiVq^5gA]\&d/M8gao90V^AbbD -Zi70-X8\mnT`1J\PQ$[CNW+V1Jc:/uGQ)^`E;j_RC&V`D@K'X5?2dt*<rQ+u;Z9Pj:]=&e9D_<[8GG[Q -70,hGr^?3BK0o#oqaCEPpdY-Or^m)^r_<8cr_`Ymr`/r!r`K/*ra5Y5rau.Drb_XRrcJ-`rdXp!!JH++ -K`6u1OT(ICSGo/[U].=nYPtm-]DfSE_Z%[Vc2Q)hf)FA%hYuL5jSn?Ali->OnG`%Yp&=[aq#:*gqYU3i -rVQT/s1eU5rqlZnr;QTmq>U0gp\sjbo`"C[n,D\QlMfrFj8Rs8g]#h(e,IYlb5TE[_#CtF\,NW2X8]$r -T`1J\R/W3HN;eY4Jc:,tHN&$cEW0kTB`;TB@fBd7?2e%,<rQ+u<;o_n:]=,g9`@]a9)_BY8,,OP6i]U> -6c_Uh6,c1W6i0:H7K,gS8H)6\9E%Wa:B"&g;#XGn<W6%u>5he+@/aX7B)ZKCDZ4YTFT-UcI0"nM!.k-* -rf$i<rg<\Trh07griH+'rjVm=rkSNQrlY5crmUkurnIG0ro="?rp'LLrpTjVrq$-^rqHEerqZQjrquZl -rr0\4^]4<4qu-Nlrql]jrqQKerq-3\rpTjSrp0RIroF(;rnm_.rmh"prlkA^rkeZJrjVm4riQ0trhBC_ -rg3VIrf6u7re(3"rd+Qfrc%jRrbMLEraYq7ra#M,r`K/"r_r\jr_EGdr_!&Zqa^WTqaLKPrBp0D^I%oc -q`t-H^I%BVqaCEPqaUQTr^luZr_3;cqb[8jr`/r"r`];,ra5Y6ral(Erbh^Srce?g!IoS!J,Y*"M#NG6 -P5^jJSc5A_W;`puZMqB5^&GnJa8X<^d/MSpg&Bn.ir8$<kl0lHmf)\So)A:\p\sseq>U9jr;6HlrkJKM -s8N#prVl`oqu6Hkq#:!dp&=O]nG_nUli-,Ijo43;h>Z.-eGdkpci1r`_Z%=L[f3T3YPtEuUAgeaQN!'H -NrFe4K)U9!GlDgaE;j_RB`;TB@K'X5>lIk)<rQ(t;>sDk:]=&e9E%Q_8GbpV7f,XR7/'(B6c_UM5fH(\ -6i0:N7JfRR8,GjV9)_K_9`@ie;#X>k<;oqt=T2S)?N+C4Ac?ECD>nMRFTH`3!-nKmre(3)rf6u@rg*PU -rhKIiric=-rjMg@rkn`Trm1Slrm^r$rn[S3roO.Crp0RPrpg!Yrq69brqQKhrql]mrr)`n_Z.LQq#13h -rqcWirqHEcrq69\rpTjRrp'LGro="8rnIG)rmLekrlb;YrkJHErj2U-ri5slrgs+Xrf[8@reg]-rdXoo -rcS3\rbqdMrau.=ra5Y0r`];%r`&kpr_WShr_<AaqapQQqaLKPoL&=>d6dUoh*Ca$c9gkbqaCEPpdb<T -qb$i^r_NMir_i_pr`9#%r`oG0raPk=rb;@Mrc/$^FT?R`HiANoKDpc-NrG4@Rf8oXUAh1lY5Yd,]DfSE -_u@jYci2Alf`'Y)hu;[8kPjcGmJcSRnc&4\pAXgcq>U6iqtU-,s2+g2rVl]nqYp<ip\smcoD\7Ymf)SP -kl0ZBi;VR3g&BP$d/M8ga8WmR]`,G?Yl:^&VZ*7fS,S`QOT(1;LAl`&I/\BiEW0nUD#S&GA,]j7>lIq+ -=T2;!;>sAj:B!ue9`%E\8GG[R7.*DC6USp]b<X$5njE:BpdY-Or^m)_r_<Aer_NMkr`&l!r`T5*ra5Y7 -rau.Grb_aVE<("XGlE'hJGt<&MuJh;QN!BQT`1hfX8]@&\Gj/?_#DCRbPolfec+8$h>Z@3jo4KCm/HDO -nG`%Yp&=^bq>U6iqtU-,s2G$;rqlZnr;QQlq#:$ep&=R[nG_eRl2KfDj8Rs8gA]\&dJhDia8WsT^&GM? -ZMps)VZ*7fRf8TOOT(.:L&QW%I/\?hEW0nUCAqlF@K'X5?2dt*<rQ(t;#=&f9E%Q_8cD9[8,c!T7K,^G -6i'-q6FfA#6M3_C7/fXS7fGpW8H)3[9)_K_:]!uf<;oqt=T2V*?iFL5BDuZIDf5Vorc.p\rd=]qre:?/ -rfI,ErgNhZrhf[rrj)O5rk8<JrlG)`rmC_qrn@A/ro3q=rosFKqsaUVrq69brqZQiqu$Hlqu4\:aT)8= -qu-Nlrql]jrqQKerq-3\rpTjRrp'LHroF(:rn[S*rm^qnrlY5ZrkSNErjDa/ri#gkrh'1Urf[8@reCE( -rdOijrcA'WrbDFFraYq8ra#M,r`9"tr_`Ykr_EGdr_!/]r^d#Yr^QcRr^?3BqEih$pd)GUpd*1lnjECE -qaLKRr^ZrYr^m)]r_3;cr_WSkr`&ktr`];+ra>_8rau7HC&i#JDuOhWGQ*'jK)UN(NrG4@QN!NUU].4k -YPtp.])KME`W"$Zci2DmfDaV*iVqp;kl0lHmJcSRo)A:\p\sseq>U9jr;6HlrlG,\s8N#prVl`oqu6Ej -q#:!doD\:Zn,DYPl2KlFiVq^5g]#_%dJhGj`r<jS^AbS?Z2Um)U]-qcSGn]NNrFt9K)U5uHiA*cE;j_R -BDuH@?iFC2>Q.b(<;oem:]=&e9E%N^8H)-Y7f,XR7.N_;6J+W&5g)Le6i0:N7JfRR8,c'Y8cDB^:&@`c -;Z9Yp=T2M'?N+=2@f^4T!,):Jrc%jXrd4Wordt--rf@&Arg`t[rhKIprj)O3rkABKrl4r_rmC_prnIG/ -ro*k>rosFJrpTjVrq$-_rqHEfrql]mqu-NnaT'H`rr2fnrqucmrqcWgrq??`rpg!WrpKdLroX4?ro!e1 -rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJraYq9ra5Y,r`9"ur_`Ykr_NMd -r_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5dr_WSkr`/r!r`K/,ra>h;@fU$< -C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYrg]$.1j8S3?kl1#Ln,DkVo`"O_ -p\t$gqu6NmrVQT;s3(HArqlZnqu6Hkq>U-fp&=R^nG_kTm/H2Ijo46<h>Z(+eGdenb5TE[_#CtF[Jm?. -WW&[lSc4uTP5^F>L]2o)I/\?hErKtUCAqlF@K'X5>lIe'<W5ts;#X5h:&[ca8cD9[8,c!T7K,^D6h*M+ -6N0935lO(!6LmMC7/KFP7fGpW8H)3[9)_Qa:]=2i<;ons<rQA'?3+JC!+Gk>rbDFMrc8!^rd=]sreLK3 -rf[8Jrgj%`ri#h!rjDa:rkSNQrlb;erm^r#rn[S4roF(Arp9XPrp]pYrq69brqZQirql]nqu4e=bQ%S@ -qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXol -rcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Acr^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQT -r^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtL -ao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[aq>U6iqu6Qkrlb>es8N#prVl`oqYp9hp\sjboD\7Yn,DYP -kl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1YDZ48IA,]j7>lIn*<rQ"r -;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^:&[rf;>sJm<rQ2%>[.86 -ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUkurndY4ro="Arp0RPrp]pY -rq69brqZQiqu$Hlqu5"CcN!nCrr)iorql]jrqQKerq69^rpTjRrosFFro3q7rnRM'rmLekrl4rRrk8<= -rilC&rhKIargEbJrf-o6rdk&srcnE^rbh^Nrac":ra,S-r`B(ur_WSir_EGcr_!/]r^ZrWqaLKPmmH;* -o0S!nnNb\mnjECEqaLKRr^ZrZr_!/_r_EGgr_WSnr`9,(=o_b*?N+C4AH$BDDZ4YTGlE*iJc:N*NW,(> -RJrfWU].=nYl;'0^&GnJ`r=9_dJh\qh#?41ir8-?lMg2Mn,DnWp&=^bq#:*gqu6NmrVQTAs3CZDrr2lq -r;QTmq>U0gp\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pb -E;j\QB`;H>?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N` -:&[ug;Z9\t=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A, -ro!e;roj@IrpTjWrq-3arqQKgrql]mrr)`ndJqVorr2fnrquclrqQKdrq69\rp]pTrosFEro3q7rn@A' -rm:YgrlG)Srk&0;ric=#rhKI`rg3VHreg]/rdauorcS3ZrbMLGraYq8r`oG*r`/qrr_NMgr_3;`r^m)[ -r^QcRr^?<Ei'IE0!C9#&5hSF%6/=m#6i0:N7K,dU8,c*Z9)_K_:B"&g;?9ct!*0#$r`oG1raYq?rbMLP -rcS3drdb!%reg];rg3VTrhKIlric=/rk&0FrlG)_rm:YrrnIG0ro3q>rosFMrpTjVrq69brqQKhrqlTk -rr1=FdJs4Fqu-NlrqcWgrq??arpg!Vrp9XJroO.<rn[S+rm^qnrlY5ZrkABBrj2U*rhf[frgNhNrf@&6 -re(3"rce?_rbqdLral(;ra#M,r`K/!r_`Yjr_3;`r^m)[r^ZrWr^HfSmmH,%rBUHM6%M;P5lO(-6LmMC -7/fXS7fGpW8H)3[9E%Wa:]=5m<)`isr`K/'ra#M3ral(BrbqdWrce?kre(3*rf@&CrgNhZrhf[rrj2U6 -rkABNrlY5drm^r#rn[S4roO.Crp9XPrpg!\rq??crqcWkqu-NndJq_rrr2fnrqucmrqcWgrq??_rp]pS -rp0RHroF(9rnIG'rmLejrlG)Vrk/6=rilC%rhTOcrg*PGrf-o1rdauqrcS3[rb_XIrac"8r`oG*r`9"q -r_WShr_*5_r^luWr^QlTnjD5"rBPp!d6QMSogAUEqaUQTr^m)]r_*5cr_EPl;#jJm<rQ5#>lJ+0A,^-? -D>nPSFoHdfJGt6$NW,+?QN!NUV#ICnYl;*1]`,hJaSsH`df.ktg]$+0j8S6@li-;NnG`%Yp&=^bqYpBk -r;QZlrm^tts8N#prVl]nqYp<ipAX^`nc&%Wm/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQL -NW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO -7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8rbDFLrc%j]rd=]qre^W6rfR2Lrh07driZ7+rjVmArl"fX -rm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQirql]nqu5+FeGoOIqu-NkrqcWhrq69^rp]pTrp0RJro="9 -rn[S)rmLekrl4rSrkAB=ric=%rhBC_rg<\Hrepc1rdXonrcS3YrbMLHraPk6r`oG'r`&kor_NMer_*5^ -r^d#YpdOa@j$NW/qETTsb<Z%mi'R*(pdP0Pr^d#[r_*5b!DcJk:]=5j<;oqt>lJ+0@fC'?C]88OFoH^d -J,Y3%MuJh;R/W]VUAh4mYl;$/^Ac"K`r=9_df.hsh>Z@3j8S<Bli->OnG`%Yp&=acq>U9jrVQTDs4%)J -rr2lqr;QQlq#:$eo`"F\n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"Kj -F8g(VCAqfD@/aI2>5hP$;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha -:/1dar_NMkr`/r$r`oG1ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5 -roj@HrpB^Rrpp'\rqHEfrqcWlrr)iqeGn%uqu-NlrqcWhrqHEarpp'Wrp9XJroO.;rnRM+rmC_jrlY5W -rk8<?rilC%rhTObrg<\Ireg]/rdXomrcJ-XrbMLFraPk6r`fA(r_reor_NMfr_!/]qa^WTr^?EHi'RE/ -nN_Xj`BaDgh*V!+qaC<Nr^ZrZr_!8d9`Roe:]=5j;uTnu>Q/"/@fC$>C]88OFT-RbJ,Y-#MZ/b;Qi<TU -V#ICnYl;-2^&GnJb5TZbdJhhuh>Z@3jo4KCm/HJQo)A:\p\t!fqYU3irRCkss8Murr;QTmq>U0gpAX[_ -nc&"VlMfuGj8Rs8g]#k)d/M8gaSs!S]Df5;Xo>6tUAgV\Q2ZjDM#N&+If=NiErKtUB`;TB@K'R3=oMJ$ -;Z9Ml:B!oc9)_E]8,c!W7Iih+6Mj(=5_22;5lO(-6M3_F7K,dU8,c*Z8c_RX!)*;dr_WSlr`9#$ra#M3 -ral(Brbh^Urc\9irdt-*rf@&CrgNh\ri#gurjDa;rkSNSrlkAgrn.5)rnm_8roa:GrpTjVrq$-_rqHEf -rql]mrr(@HfDkjLrr)iorql]jrqHEbrpp'XrpKdMroX4>rndY.rmh"orlY5[rkJHCrj2U)rh]Udrg<\K -rf6u3rdk&rrcJ-Yrb_XHraPk6r`];&r`/qor_EGer_!/]r^d#Xr^HfSnjDG(lTg"d^Hg^DogA^Hr^HfU -r^d#[!D5ra9)_Qa:]=2i<W6,">5hn.A,^*>D>nPSFT-[eJGt9%NrG4@R/W`WV>dOpZi7N7^])7PbPoie -ec+8$hYuO6k5OWEmf)_To)A=]p\t!fqu6NmrVQTJs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2 -fDa4tbl5Z^_Z%1H[JmB/W;`RkT)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U -7K,^M6fUN460LRb5eKA]6/t<,6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcs -reg]8rfd>QrhBCjric=/rk&0Hrl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfn,rr2fn -rquclrqHEcrq-3ZrpB^NroX4?rnm_0rmq(rrlb;\rk\TErj2U,rh]UergWnMrf-o5rdauprce?\rbVRI -raPk6r`oG'r`&kor_NMer_*5^r^d#Xr^HfSog@k.qa'F2JO$b2r^#[5ogA^Hr^HfUr^Qu\8H;?]9E%Zb -:]=5j<;oqt>lJ+0@fC'?D#SDQGQ*!hJGtB(NW,+?S,T)[V>dXsZi7N7_>_IRbPoogf)FG'hu;[8k5O]G -mf)_To`"O_p\t$gqtp?krn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49=hu;=.ec*nob5T?Y^](_A -ZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\8,c!W7.iq-6K17]5dir9 -6Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1rfI,Hrgs+`riQ1*rjVmA -rl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOgAh0Orr)inrqcWirq??`rpg!Vrp0RJ -ro="9rn[S)rmLelrl4rSrkAB<ric=$rh07[rg!JDreUQ*rd=]hrc.pRrb2:@ra>_1r`K/!r_i_kr_<Aa -r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_*5br_NMkr`&l!r`fA0raYq?rbVRRrc\9grdt-+rf@&D -rgWn[ri5t#rj2U<rkeZSrm1Smrmq))ro!e9rosFKrpTjVrq-3`rqZQirql]nrr1XOgAh0Orr)inrqcWi -rq69^rp]pTrp0RIro="9rnRM&rm:Yhrl"fOrk/69riQ0trh'1Xrfd>?reLK(rd4Werc%jPrau.=ra,S- -r`B(tr_`Yjr_*5_r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_!/_r_NMjr_retr`];-raPk>rbMLP -rc\9frdk''rf$i?rgEbXrhoatrj)O9rkSNOrltGirm^r&rnm_8roj@HrpKdTrq$-^rqZQirql]nrr1XO -h>dKRqu-NkrqcWhrq69^rp]pTrp'LGro*k5rnIG$rm:Ygrkn`Mrji$4ri?$prgj%Trf[8<re19#rcnE` -rbqdLral(;ra#M+r`B(sr_WShr_*5_r^d#Xr^HfSpd<k(i]r&[[QrY8pd>$Kr^?iW7K>pW8H)3[9E%]c -;#XAl=8lD&?2e:3Ac?BBDuOkXGlE3lK`6l.P5^jJSc5JbWrB7%\c0>B_u@mZci2Dmg]$(/iVr$>lMg5N -nG`%Yp&=acq>U9jrVQTMs5!_SrqlZnqYp9hp\sgao)A+Wm/H5Jjo43;h#?"+df.Pkb5T6V]`,A=YPtL" -UAgV\Q2ZjDL]2o)If=KhErKtUB)Z<>?iF:/=8l5!;#X5h9`@W_8H)-Y7K,^J6fp_g5_22&5itE+6iKIS -77@2Fr^ZrYr^m)_r_EGhr`/r"r`fA/raYq>rbh^TrcS3hrdt-)rf@&CrgNh\ri,n#rjMg=rk\TVrm(Mk -rn7;,ro!e;roj@JrpTjWrq-3arqZQirr)`nh>c=2rr2fnrqcWhrqHE`rpg!Vrp0RIroF(:rnRM*rmC_i -rlP/Trk&0;riQ0trh9=Zrfd>Are:?&rd=]erc%jQral(<ra5Y-r`B(tr_WShr_3;_r^d#Yr^HfSog@k. -fg(*RX[)#8ogA^H!C]EW7K,gV8H)3[9`@cc;#XDm<rQ8$?iFO6Ac?NFE;jtYI/\ZqL&R,3PQ%!LU&Lth -Xo>a-]DfVFao9QadJhetg]$.1jSnBBli-APnc&.Zp\t!fqYpHjrn[V1s8N#srVl`oqYp9hp\sd`nc%tU -lMfuGj8Rs8gA]\&d/M8ga8WmR])K)9X8\poTDk/UOoC@>K`6K#HiA'bDZ4GNAH$$:?N+(+<W5nq;#X5h -9`@W_8H)*X7.iq-6J4VT5cm<06Mj.J6i]XS7fGpW8cDE_:&[ug;Z9_r=T2Y+@K'g:C]88OErLFbJGt6$ -NW,+?QN!NUV>dOp[/RZ9_#DCRbPolff)FG'hu;[8kPjcGmf)_ToD\L`q>U6ir;QZorn[V1s82cor;QNk -q#:!do)A.Xmf)GLjo46<h>Z(+eGdhob5T?Y^&GM?Z2Ua%U]-nbPQ$XBMZ/2+IK"KjE;j\QC&VT@?iF=0 -=8l5!;>sAj9`@Z`8H)-Y7fGgK6fUMd5_22&5i>!+6i9=P7/f[T8,c'Y9)_N`:]=5j<;otu>lJ+0@fC*@ -D>nMRGlE*iJc:Q+NrG7ATDkYcWW'1%\,O)?`;[pYd/MPog&Bh,iVqs<kl1#LnG`"XpAXgcq>:*hrS@M0 -s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3f`'A!cMkrb_u@=J[f3N1VuEChSGn]NNW+b5JGsopG5cI[ -D#S,I@K'U4>Q.\&;uTVm:B!oc8cD6Z7fGjI6gR/76.nMS5cm<H60U`06NBLQ7K,dU8,c*Z9E%]c;#XGn -<rQ>&?N+C4B`;fHE;k%[I/\ZqM#ND5P5_!NU&LthYl;*1]`,hJaSsKae,Ituh#?:3jo4KCmJcSRnc&4\ -p\t!fqu6NmrS@M0s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3fDa4tc2Pc__Z%1H[/R9.V>d.eS,SNK -MuJJ1J,XcnFoH=YCAqlF@/aI2>Q.Y%;uTSl:&[ca8cD6Z7fGjO6fp_^5_21r5itE/6NBLQ7K,dU8,c*Z -9E%Zb:]=8k<W65%?N+@3BDu]GDuOnYHN&EnLAm/2OT(aKT`1eeYPts/]Df\HaSsH`df.kth#?:3jo4KC -mJcSRnc&4\p\t!fqu6NmrS@M0s8Murr;QTmq#:!do`"C[mf)POk5OE?hu;@/f)F(rbPoK[_#CnDZi7-, -U]-kaRJr<IMZ/;.IK"KjF8g%UB`;QA@/aF1=oMD";Z9Jk:&[ca8cD3Y7K,^M6fp_^5_21r5itE/6NBLQ -7/fXS7fH!Y9E%Zb:]=8k<;p&">lJ.1AH$<BD>nVUGlE-jK`6o/OT([IT)PMaY5Yd,\c0DD`r=0\dJh\q -gA^"/j8S3?li->Onc&1[pAXjdqu6NmrS@M0s8Murr;QTmp\smco`"C[mf)POjo49=hu;=.ec*qpb5TBZ -^](bBZMps)UAg__Qi<'FM>i/,I/\?hErKnSB`;QA?iF:/=oMA!;>sAj9E%Q_8cD3Y7K,^M6fp_^5_21r -5itE/6NBLQ7/fXS7fH!Y9)_K_:]=5j;uTr!>lJ+0AH$9AD#SJSGQ*!hKDp`,O8bLFSc5A_XT#L(\Gj8B -`;[pYd/MSpg&Bn.ir8'=li->Onc&1[p&=^bqu6NmrS@M3s8N#srVl`oqYp6gpAX[_nG_hSli-#Fir7j7 -f`'A!ci2#b_u@FM[f3N1X8\dkS,S]PNrFk6K)U,rG5cL\C]7uGA,]j7>Q.b(;uTYn:]=#d9)_B\7fGjU -7/K@36I7uK5bp['630G@!(6`Rr^HfUr^d#[r_*5dr_`Ynr`K/(ra5Y7rb)4Grc.p\rd4WrreUQ6rg!JP -rh07kriuI2rkJHNrlG)brm^r"rnm_7roO.FrpB^Srq$-^rqHEgrql]nqu5XUi;`fUrr)iorqcWgrq69^ -rp]pSrp'LDro*k5rmq(trm1Sbrkn`Lrj;[.ri5sjrgNhNrepc0rdaunrcJ-XrbDFEraGe3r`T5%r_i_l -r_EGbr^d#Yr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,gV8cD?]:B")h;Z9bs>5hh,@K'j;CAr/N -FT-RbJGt<&MuJt?S,T)[WrB4$[/Rf=_Z%XUci2Dmf)FP*iVqp;lMg2MnG`%Yp&=^bqYpBkrVQTSs5<qV -rr2lqr;QQlp\sjbo)A.Xm/H8Kj8S!9h>Z")df.Sl`r<gR^&GA;Y5YC!TDk8XPQ$I=L&QW%GlDd`DuOJM -Ac?*:>lIn*<rPtq:]=)f8cD9[8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^d#[r_<Afr_`Yq -r`K/)ra>_:rb;@MrcA'`rdb!%reg]=rgEbXri#h!rj2U;rkeZSrm1Smrmq))ro!e9rosFKrp]pXrq69b -rqcWkrr)`nj8\';rr2oprql]krqHEbrpp'Wrp0RJro="9rnRM(rmLekrl+lQrk/6:riZ6urgs+Vrf[8< -re19#rce?_rbqdLrac"9r`oG)r`/qpr_NMfr^m)[r^QlUr^?NKksGA8bs6hFTg8TCk!B)96iBCO7/fXS -7fGpW8cDH`:]=5j<W6,">lJ.1Ac?BBDuOhWGQ**kK`6l.P5^jJT)PYeXo>[+]`,_G`W"0^df.hsh#?41 -j8S<Bm/HJQo)A=]p\t$gqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1eGdhoc2PZ\^](kE -Z2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X7/K@66H;?B5at%%63'@O -6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5JbX8]C']DfVF`;\$\dJhYp -h#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I_nbl5NZ -^](kEZ2Ug'V#Hn`QN!!FM#N#*IK"BgEW0hSBDuE??iF4-=8l1u;#X5h9`@W_8H)*X7/K@66H;?B5at%% -63'@O6i0:N7fGpW8cDE_:&[ug<;otu=oMe-A,^-?D>nPSFoHggK)UT*OT(RFSGo>`X8]C']DfSE_u@mZ -ci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5 -gA]S#ci2,e_Z%7J\c/i4WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ -6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-N -U].:mYl;34^Ac"KbPoiee,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl]nqYp<ip&=R^ -nG_hSl2KlFiVq[4g&BJ"ci2,e_Z%7J\Gi`3WW&XkRf8QNNrFb3JGsopF8g+WC]7oE@fB^5=T2>";Z9Ml -:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?KEDuOhWHiAQp -L&R,3PQ%$MUAh.kYl;03^Ac"KbPoiee,J&"h>ZC4kPjcGmJcVSoD\F^q>U6iqu6Qnro=%=s8N#srVl]n -qYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtUC]7lD@K'U4 -=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4AH$BD -DuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6iqu6Qnro=%= -s8N#srVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtU -CAqcC@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3 -AH$?CDZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qn -ro=%=s8N#srVl]nqYp9hp&=R^nG_eRkl0ZBi;VO2g&BCuc2Pia_>_+H[f3H/VuE@gR/W9JNW+S0J,Xfo -ErKtUCAq`B@/aI2=8l5!;>sAj9`@]a8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9E%Zb:]=5j<;otu -?2e72A,^6BDZ4\UHiANoKDpl0P5^jJT`1kgY5Ym/]`,bHao9QadJhhuh#?72jSnBBm/HMRoD\F^q#:*g -qu6Qnro=%=s8N#srVl]nqYp9ho`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/ -J,XcnErKtUCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j -<;otu?2e72A,^6BDZ4\UHN&BmKDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C] -q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-H -N;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N` -:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQ -o)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pf`_#CtF[Jm<-VZ*7f -Qi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6Mj'_5_21`5lO(@63'@I6iKOR -7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEaSsH`dJhhuh#?72 -jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@tbl5Z^_#CtF -[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_5_21]5lO(C -63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEa8X<^ -d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@t -bl5Z^_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_ -5_21]5lO(C63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a- -])KMEa8X<^d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZB -i;VO2g&B@tbl5]__#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W -7JK7C6Mj'_5_21`5lO(@63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^H -T`1kgXo>a-]DfVFaSsE_d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\ -n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj -9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`. -OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9h -o`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/J,XcnErKtUCAq`B@/aI2=8l5! -;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BDZ4\UHN&Bm -KDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C]q#:*gqu6Qnro=%=s8N#srVl]n -qYp9ho`"F\nG_eRl2KiEi;VO2g&BCucMkuc_#CtF[Jm?.W;`LiQi<-HN;eM0J,XcnErKtUCAqcC@/aI2 -=T2>";>sAj9`@Z`8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9)_N`:]=5j<W6,"?2e:3AH$?CDZ4\U -HN&EnK`6r0OoC^HU&LthY5Yj.]DfVFb5TZbdJhhuh>Z@3k5OTDm/HMRoD\C]q#:*gqu6Qnro=%=s8N#s -rVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtUCAqcC -@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3AH$?C -DZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qnro=%= -s8N#srVl]nqYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtU -C]7lD@K'U4=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5# -?N+C4AH$BDDuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6i -qu6Qnro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KiEi;VR3gA]P"cMkuc_Z%7J\,NT1WW&[lRJrELNrF_2 -JGsrqErL"VD#RuE@K'U4=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y -9E%Zb;#XAl<rQ5#?N+C4AH$EEDuOeVI/\ZqK`7#2PQ%!LU].7lYPu$1^&GnJb5T]cdf.u"h>Z@3k5OWE -mJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5gA]S#ci2,e_Z%7J\c/i4 -WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u= -6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-NU].:mYl;34^Ac"KbPoie -e,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1 -eGdhobl5Q[^](hDYl:^&V>d"aQMusEL]2o)If=KhErKtUB)Z<>?iF:/=8l1u;#X5h9`@W_8H)*X7/K@6 -6H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<;otu>Q/"/A,^*>DZ4YTFoHjhK)UQ)O8bFDSGoAaX8]@& -])KJD`;\![d/MPoh#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@ -hu;F1eGdhoc2PZ\^](kEZ2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X -7/K@66H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5Jb -X8]C']DfVF`;\$\dJhYph#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp6gp&=O]n,DYP -l2K`Bi;VO2f)F+scMkf^_>_+HZi7-,VuE:eR/W9JMZ/;.J,XZkF8g+WB`;QA@/aF1=T2>";>sAj:&[`` -8H)*X7K,^M6g6r:6-VZG5bUIB60:K76UUf>r^?`Sr^QlWr^m)`r_NMjr`/r"r`oG1ral(BrbqdWrce?k -re19.rf[8Jrgs+eriQ1+rk/6Grl+l^rmLesrnRM1ro="Brp9XQrpp']rqHEgrql]mqu5XUi;`fUrqucm -rqcWgrq69]rpTjQrp'LDro!e3rmq(srm(M_rk\TIrj;[-ri#ggrgEbLrepc0rdXomrcJ-Xrb;@CraGe3 -r`T5$r_i_lr_EGbr^d#Xr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,dU8H)6\:B")h;Z9_r=oM_+ -@K'j;C&W&MFT-RbJ,Y0$MuJq>RJriXW;a""[/Rc<_Z%RScMl8kf)FM)iVqp;lMg/Ln,DnWp&=^bqYpBk -r;6KRs5<qVrr2lqr;QQlp\sjboD\7YmJcDMjSn-;hYu+*e,I\maSs*V^AbM=YPtR$T`1DZPl?U?L&QW% -H2_pbDuOMNB)Z6<?2e"+=8l+s;#X5h9)_B\8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^m)] -r_EGhr_i_sr`];,raGe;rbDFNrcJ-brdb!&repc?rgWn[ri5t$rj;[=rkeZUrm1Smrmq)*ro*k;rp'LM -rp]pYrq69brqcWkrr)`nj8\';rr2oqrquclrqHEcrq$-YrpB^NroO.=rnm_-rmUkmrlG)VrkJH@rilC& -rh07[rg!JCreUQ*rd4Wfrc.pQrb)4?ra5Y/r`K.ur_`Yjr_*5_r^d#Xr^HfSqa9C1cp3.IUd3j)!CK3S -6iKLQ7K,dU8H)3[9E%`d;>sMn=T2P(?iFR7BDu]GEW1.\HiAWrM#NG6Q2[9PT`2"kZ2V32^])1NaSsNb -eGe,"hu;X7jo4TFmJcVSoD\F^p\t$gqu6Qkro=%:s8N#srVl`oqYp9hpAX^`nG_hSli-&Gj8Rs8g&BM# -d/M2e`W!XO\Gif5XT"snSGniRO8b"8KDp8tGQ)X^D#S,IA,]j7>Q.b(<;obo:]=&e9)_B\7fGjU7/K@3 -6I7uK5bp['630G@!(6`Rr^HfUr^d#\r_3;er_i_pr`K/(ra5Y7rb)4Hrc8!^rd=]tre^W8rg*PSrhBCn -riuI4rkJHNrlY5ermh#$rnm_8roX4GrpKdTrq-3`rqQKhrql]nqu5XUh>dKQrqucmrqQKdrq-3[rpKdO -roX4?rnm_/rmq(rrlb;[rkSNDrj2U,rhKIargEbIreg].rdFcjrcA'Urb2:Ara>_1r`T5"r_i_kr_<Aa -r^m)Yr^HfSpd=11cp3.IUd4'/q*P-Lr^?`Sr^QlYr_*5br_NMkr`&l"r`oG1rac"Brb_XUrcnEjre19/ -rfI,Irgs+ariZ7,rji$Drl4r\rmC_qrn@A/ro="?rp0ROrpg![rq??drql]mrr([Qh>dKQrqucmrqZQf -rq69\rpTjRroj@Cro*k3rn%.trltG_rkeZHrj;[.rh]UergWnKrepc1rdXonrcS3YrbDFFra>_2r`fA% -r_relr_<Aar^m)Zr^QlUpd=11cp3.IUd4'/q*P-Lr^HfUr^ZrZr_*5br_NMkr`/r%ra,S3rb)4GrbqdY -rd+QnreCE2rfI,Krh07eric=/rk&0HrlG)`rmLetrnRM3roO.CrpB^Rrpg!\rqHEfrql]mrr([Qh>dBN -rquckrqQKdrpp'XrpKdLroO.<rn[S+rmUklrlP/Wrk/6=rilC#rhBC_rf[8?reUQ(rd4Wfrc%jQrb2:? -ra5Y0r`9"tr_`Yir_3;`r^d#Yr^QlTqa9L4pd*RuJO$>&pd+%/r^6TO!(?fUr^ZrYr_!/_r_EGir`&kt -r`oG0raPk?rbMLPrc\9frdb!(rf6u@rgj%_ri#h#rjMg=rkn`Vrm(Mlrn.5+ro*k<roj@Lrp]pXrq??c -rqZHhrr([Qh>dBNrquckrqQKdrpp'XrpKdLroO.<rn[S+rm^qorlY5Yrk8<?riuI%rhKIbrfd>Breg]+ -rdFcjrc%jQrb;@@ra5Y0r`B)!r_`Yjr_3;`r^d#Yr^QlTog@b+fg(*RX[(f2qa:9L!(?fUr^ZrYr_!/` -r_NMjr`&kur`oG0raPk@rb_XRrcnEirdk'+rf6uArh'1cri,n%rjVm?rl"fYrm:Yorn7;,ro*k<roj@L -rp]pXrq??crqZHhrr([Qh>dKRrr)iorqcWhrqHE`rpg!Urp'LGro="8rn@A&rm:Ygrl>#Rrjr*9ri?$o -rh'1UrfR2>re19#rd4Wbrbh^Nrac":ra,S+r`/qqr_WShr_3;_r^d#Xr^?EHj$MEaJO$>&i'R<.r'UNQ -r^QlWr^m)_r_<Agr_i_rr`K/+raGe:rbMLOrc8!brdb!$rf-o?rg*PUrh]Uprj;[9rkSNRrlb;frmq)' -rnm_8roa:GrpKdTrq$-`rqZQirqucorr1aRh>dKRrr)iorqcWhrqHEarpg!Vrp'LGro="8rnIG)rmC_i -rlP/Trk&0;riH*rrh07Xrfd>Bre:?&rd=]drc%jQral(<ra5Y-r`B(ur_WShr_3;_r^d#Xr^?EHj$MEa -JO$>&i'R<.r'UNQr^QlWr^m)_r_EGhr`&ktr`T5-raPk<rbVRPrcA'drdb!%rf@&Brg<\Xrhf[rrjDa; -rkSNTrltGirn.5)rnm_8roa:GrpTjWrq-3arqZQirqucorr1aRh>dKRqu-NjrqQKerq-3\rpTjQroj@C -ro!e2rn7;!rm(Mcrk\THrjMg0ri#gjrgNhOrf@&6rdt,urcS3\rbh^IraYq7r`fA'r`/qor_EGdr^m)[ -r^ZrVr^?EHk!I`dJO$>&k!J`.r^6cU70#dU8,c'Y8cDE_:B")h<W6,">Q/"/A,^*>DZ4YTFoHjhK)UQ) -O8bCCRf9&\WW'+#[f3r=_>_UVcMl8kg&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6irVQTMs5!_SrqlZnqu6Hk -q#9scoD\7Ymf)MNkPjH>hYu:/e,I_nbl5NZ^](eCYl:^&V>d%bQi<0IMZ/;.J,X]lF8g+WB`;TB@K'R3 -=oMM%;Z9Ml:B!oc9)_B\7fGjU7/0.*6K17]5dir66MNqI7/fUU7RdAIr^d#[r_*5cr_WSlr`B)&ra#M3 -ral(BrbqdXrcnElre19.rf[8Jrgj%bri5t%rji$Brkn`Zrm1SmrnIG/ro*k>rp'LNrp]pYrq69crqZQj -rr)`nh>c=2rr2fnrql]krqQKdrq-3[rpTjProj@@rnm_1rmh"qrltG]rkSNFriuI)rhoaergEbMrf$i2 -rdauorcS3ZrbDFEraPk5r`fA(r_renr_EGdr_!/\r^QlUr^?NKh*U*dJO$Y/h*Um(r^?`S!CfNY7fGsX -9)_N`:B")h;uTnu>5hk-@fC!=CAr2OFoH^dJGt<&N;f(@RJrfWVuEdsZ2VB7_#D=Pc2Q,iec+A'hu;X7 -kl0oIn,DkVo`"R`q#:*gqu6Qkrn[V.s8N#srVl]nqYp<ipAX^`nc&"Vli-/Jj8S!9h>Z")df.Sl`r<jS -^AbJ<YPtR$T`1G[Q2ZjDM#N#*I/\?hEW0eRB`;N@@/aF1=T2;!;Z9Jk:&[ca8cD3V7Iih+6K17]5dir9 -6M3_F7JoUT7fH!Y9E%Zb:]=8k<;p#!>Q/%0A,^-?D#SGRG5cmgK)UW+O8bFDS,T)[WrB1#Zi7]<_Z%RS -ci2Dmf)FM)i;Vd9l2L&Kn,DkVo`"R`q>U6iqu6Qnrn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49= -hu;=.ec*nob5T?Y^](_AZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\ -8,c!W7.iq-6K17]5dir96Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1 -rfI,Hrgs+`riQ1*rjVmArl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOfDkjLrqucm -rqcWgrq??`rp]pTrp9XHro="8rnIG'rmC_grl+lPrjr*9ric<trh07[rfR2>reUQ(rd4Wfrc%jQrb;@@ -ra5Y0r`B)!r_`Yjr_3;ar^d#Yr^QZNqa9C1qa'F2JO$b2r^#I/r^6HKr^QlW!D#`]8H)9]:&[rf;>sPo -=8lJ(?iFO6C&VrJE;k%[HiAQpM#ND5OoCjLT`1eeYPtp.])KME`r=0\dJh_rg]$+0j8S3?m/HGPnG`(Z -p&=^bqYpBkr;6KIs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2fDa4tbl5Z^_Z%1H[JmB/W;`Rk -T)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U7K,^M6fUN460LRb5eKA]6/t<, -6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcsreg]8rfd>QrhBCjric=/rk&0H -rl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfe)rr2oqrqucmrqZQfrq69]rp]pTrosFE -ro3q6rn@A%rm1Sdrl4rPrji$7ri?$prh'1Wrfd>Are:?&rd=]erc%jRrau.=ra5Y.r`B)!r_WShr_<Aa -r^m)[r^QlUr^?<Ej$N&sJO$t8i'R*(r^?`Sr^QlXr^d,_8cVK_:&[rf;#XJo=T2M'?iFR7B)ZZHEW1(Z -I/\ZqL&R,3P5^jJTDk\dX8]I)\c0AC`r=0\ci2Jog&Bk-ir8*>l2L,MnG`"Xp&=^bq>U9jr;QZlrn@D( -s8N#prVl`oqYp9hpAX[_nc%tUlMfuGj8Rs8gA]\&d/M8gao9*T]Df5;Xo>6tUAgY]Q2ZjDM#N&+If=Ni -ErL"VB`;QA@/aF1=oMM%;Z9Ml:B!oc9)_B\7f,XR7.iq-6Mj(=5_22;5lO(-6Mj.I7/fXP7fGsX8HDIW -!)*;dr_WSlr`B)%r`oG1ral(BrbqdWrc\9irdt-*rf@&DrgWn]ri#gurjDa;rkSNTrlkAgrmq)'rnm_8 -roa:GrpKdTrq$-_rqQKhqu$Hlqu5=LeGoFErquclrqQKerq-3\rpTjQroj@Cro!e2rn7:urm(McrkeZJ -rjVm2ri5snrgs+VrfR2;re:?$rd"KbrbqdOrau.=ra5Y/r`K.ur_i_kr_<Aar^luWr^QlTog@Y(r^$'> -JO%1>r^#@,qa:6KqaUQTr^m)^!DQ8g:&[rf;>sMn=T2P(?iFO6BDu]GDuOkXH2`<mK`6l.OoC^HT)PPb -WrB7%\,O)?_Z%^Wc2Q,ig&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6fr;QZEs4%)Jrr2lqr;QQlq#:$eo`"F\ -n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"KjF8g(VCAqfD@/aI2>5hP$ -;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha:/1dar_NMkr`/r$r`oG1 -ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5roj@HrpB^Rrpp'\rqHEf -rqcWlrr)iqeGn%urr2oqrquclrqZQgrq69_rpg!Urp0RIro="9rn[S(rmLelrl>#UrkAB>rilC&rhBC_ -rg3VGrepc0rdXonrcS3ZrbVRIraGe4r`fA'r`/qpr_NMer_*5]r^ZiTr^HfSpd<k(qa('DJO%CDr^#@, -pd>$Kr^H]Rr^ZrYr_*5b!DcJk:]=5j<;otu>Q.t.@K's>C]8;PFoH^dJ,Y0$MuJh;R/WZUUAh4mYl;'0 -^Ac"Ka8XEadf.erh>Z@3j8S9AlMg5Nnc&.Zp&=acq>U6ir;QZorm^tts8N#prVl]nqYp<ipAX^`nc&%W -m/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQLNW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr -;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8 -rbDFLrc%j]rd=]qre^W7rf[8Mrh07driZ7+rjVmArl"fXrm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQi -rql]nqu5+FeGoOIqu-Nlrql]krqHEcrq$-YrpB^Nroa:Arnm_0rmq(srltG`rkn`JrjMg1ri5snrh'1U -rfR2>re19$rd=]frc.pSrb)4@ra5Y0r`T5$r_`Ykr_EGcr_!/]qa^WTr^?<Eh*V'*JO%UJh*Ud%qaC<N -r^ZrZr_!/_r_EGg!Du\o;>sVq=T2S)?iFR7BDucIEW1+[I/\ZqK`6u1P5^dHTDkYcWrB7%[f3r=_u@aV -c2Q/jfDaP(hu;[8kPjfHmJcVSoD\F^p\t$gqu6NmrVQTDs4%)JrqlZnr;QTmqYp9hpAX^`nG_kTmJc>K -jo46<h#>t*eGdenb5TBZ^Ab\BZi7'*VuEChRJrHMO8aq6K)U5uGQ)[_DuOJMB)Z9=?N+.-=8l.t;>sAj -9`@]a9)_B\8,c!Q7/0.*6N'1N5s^&eej04#h*Um(pdG*Nr^ZrYr_!/_r_3;er_W\p;ZKbq=8lD&?N+F5 -B)ZNDDuOhWGQ*'jK)UQ)O8bCCRJroZVZ*[rZi7K6^Ac+Nb5T`deGe,"h#?:3jo4KCmJcSRnG`(ZpAXjd -qYpBkr;QZlrm^tqs8N#prVl`oqYp9hpAXaanc&%Wmf)JMk5OB>hu;@/fDa.rbl5]__#CtF[JmB/WW&[l -Sc4uTOoC7;L&QW%HN&'dE;jYPBDuE?@/aF1=oMG#;uTSl:B!rd9)_E]8H)*U7K,^G6f:925lj8;JO%mR -r^#@,ogAUEr^HfUr^ZrZr_!/_r_EGgr_`bs<<-%u=oM\*@/a[8BDu]GE;k"ZHN&HoL&Qu/OoC^HSc5D` -WW'+#[Jmf;_#DFSbl5ugfDaP(hu;X7k5OWEmf)\Snc&4\p\sseqYpBhrVlfDs3CZDrr2lqr;QTmq>U0g -p\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pbE;j\QB`;H> -?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N`:&[ug;Z9\t -=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A,ro!e;roj@I -rpTjWrq-3arqQKgrql]mrr)`ndJqMlrr2fnrquclrqQKerq-3\rpTjSrp'LGro*k5rnIG&rmLekrl4rS -rkAB=rilC'rhBC`rgNhJrf$i4rdauqrcnE^rbh^Mrac":ra,S,r`B)!r_`Yjr_<Abr_!/\qa^WTpdFmE -i^36'JO&`je3`ptpdG!Kr^ZrYr^m)^r_<Afr_`Ypr`9,'=TDV(?N+C4AH$?CD>nPSGlE*iJGtB(N;eq< -Rf8oXUAh7nYl;$/^Ac"K`r=9_dJh\qg]$(/iVr$>lMg5Nn,DnWo`"Uaq>U6fr;QZlrmCbks8N#prVl`o -qYp9hp\sjboD\7Yn,DYPkl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1Y -DZ48IA,]j7>lIn*<rQ"r;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^ -:&[rf;>sJm<rQ2%>[.86ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUku -rndY4ro="Arp0RPrp]pYrq69brqZQiqu$Hlqu5"CbQ%S@qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0 -rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXolrcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Ac -r^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQTr^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7 -BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtLao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[a -q>U6iqu6Qkrlb>bs8N#prVl`oqu6HkpAXaao`"@Zmf)VQkPjTBir7d5f`'D"ci2)d`r<aP])K,:Y5YF" -U]-h`Qi<0IMuJJ1Jc:&rGlDd`D>n8KB)Z3;?N+4/=8l5!;Z9Ml:B!ue9)_E]8GG[L7/0.86K^]76'";1 -6.&$o6hj(E7fGsX8cD?]:&[oe;#XAl<W6)!>lJ%1?sitBrau.Drb_XUrce?hrdk''repc=rg<\UrhKIk -riZ7.rjr*Drl4r\rm1Snrn7;,ro3q=roa:JrpTjUrq-3_rq??frql]mrr)`nbQ#ccrr2fnrqucmrqcWg -rq??`rpg!WrpKdLroX4?ro!e1rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJ -raYq9ra5Y,r`9"ur_`Ykr_NMdr_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5d -r_WSkr`/r!r`K/,ra>h;@fU$<C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYr -g]$.1j8S3?kl1#Ln,DkVo`"O_p\t$gqu6NmrVQT;s2b6>rqlZnr;QTmq>U0gpAX[_nc&"Vli-/JkPjH> -hYu:/eGdkpcMki__Z%:K[f3Q2Xo>*pT`1J\P5^L@MuJ>-If=]nF8g.XD>n2IAH#s8?N+1.=T2;!;Ys8h -9`@]a8cD9[8,c!T7K,^G6hE^t6Dm)l6M3_C7/fXP7fGpW8H)3[9E%Z_:]=8k<;p#!>5hk-?iFO9B4h3W -rb_XRrcA'crdXp!repc:rf[8Nrh'1briQ1*rjMg?rkeZSrm(Mjrm^r%rndY5roa:Frp0RPrpg!Zrq??c -rqZQjrquZlrr1"=`W,r:qu-NlrqcWhrq??`rpp'WrpKdOroj@Aro!e3rmq(trm1Scrl"fNrji$8ric=" -rhKIarg*PHrf6u4rdt,urce?`rbqdOrb)4?ra>_2r`];%r`&kpr_WShr_<Aar^m)[qa^WTpdFmEoKq1s -pd)GUpd*(ipd=gEqaUQTr^d#[r_!/ar_EGhr_i_qr`9#%r`oG1raYq?!GcHNC]88OF8gC_If=ruLAm54 -P5^dHT)PJ`W;a""[/RW8^])1Nao9Wce,Iqth>Z@3j8S9AlMg5Nn,DnWo`"R`q#:-er;QZlrlG,Ys8N#p -rVl`oqYp9hp\sjboDA%Vm/H8Kjo4<>hu;@/f)F(rc2Pc__Z%7J\,N]4XT#*rT`1DZQ2ZmEMZ/>/JGsrq -GQ)U]DuOMNBDu?=?iF@1=T2A#<;o_k:]=#d9)_E]8H)-Y7f,XR7.N_A6I/!/5fH(_6i0:N7K,dU8,c'Y -8cD?]9E%`a;#XGn<rQ5#?2e41@K'p=CB8?l!,qjVrc\9grdb!%reg]:rg!JOrh07friH+)rj_s@rkeZU -rltGirmh#%rnm_7roO.Drp9OOrq$-^rqHEfrqcNirr)`naT'-Wq#13hrqcWirqHEcrq$-YrpKdProj@B -ro!e3rn7;$rm:Ygrl>#Rrk/6?rilC&rhf[frgWnQrfI,;reCE&rd=]irc.pUrbVRGraYq7r`oG+r`K/! -r_`Yjr_EGer_32\r^cfRr^?0A!CK5q6H_X56LmM@7/07K8H)3[9`@cc:B"&g;Z9Yp=T2J&>lJ+0A,^*> -D#S;QEH(turcnEhrdb!&repc;rg*PQrh07fri?%&rj_s@rkSNSrlb;frmh#$rn[S3roO.Crp9XOrp]pY -rq69brqZQirqlKh_Z.LQrr2fnrqucmrqcWhrq??`rpg!VrpB^LroX4>rnm_0rn.4urm(Mdrkn`Nrk/6: -ric=%rhKIbrgWnNrf@&9re(3"rd4Werc8!Urb2:BraPk6r`fA)r`9"tr_`Ykr_EGer_*5_r^luWr^QcR -qaC0G!CK5q6MNk&5kmXa6Mj.C7/fXP7fGpW8cD?]9E%Zb:B")h;>sPo<rQ8$>lJ+0@fC!=B`;oKE<13) -!-S9frdXp"reg]8rfd>Nrh'1bri?%%rj2U:rkSNOrlb;ermLeurnIG0ro3q>rosFLrpTjVrq-3`rqQKh -rql]mrr)`n_Z.LQrr2fnrqucmrqcWhrq??arpp'XrpTjProj@Cro!e3rn@A$rmC_krl4rSrkJH@rj)O, -rhf[hrh'1Urf[8@reCE(rdXolrcJ-Yrb_XJral(;ra5Y0r`K/#r`&kor_WSir_3;ar_!/\qa^WTqaLKP -pI"XAa?n]J`Bs,_qaCEPqaUQTqag]Yr_*5ar_NMir_`Yor`9##r`oG/raGe;rb;@Krc%jZ!I/hhGlE3l -KDpW)NrG4@QN!NUU]..iYPtm-[f4&@_u@[Tci2AleGe2$h>Z@3jo4KCli-APnc&+Yp&=^bq#:-hqu6Nm -rVQT2s1eU5rqlZnr;QTmq>U0gp\sgao)A+Wmf)POkl0ZBiVqa6g&BP$d/M8ga8WsT^&GM?ZMq!*VuEFi -Sc4uTP5^L@M>i/,J,XcnGQ)R\D>n>MAc?3=?iF@1>5hY'<W5qo;#X5h9`@Z]8c)$W7f,XR7/]LE6bbte -62NqH6,,bT6i0:N7JfRR8,c*W9)_N`:&@cd;uTer=T2M'?2e41@fBs<C]85NE;k(\HNAVG!.Y!#reUQ6 -rf[8Jrgj%_ri#gurj)O5rk8<Jrl>#^rm:Yprn7;.ro3q<roj@HrpKdSrpp'\rqHEerqZQjrquZlrr0\4 -]`8!1qu-NlrqcWirqQKcrq-3[rp]pRrosFDro="9rnRM*rmUkmrlY5ZrkSNFrjMg1ri?$qrh07[rg3VG -rf$i5rdk&trd4Wdrc.pTrb2:CraYq7r`oG+r`B)!r_renr_NMfqb-o\r^coVr^QcRrC$QOpd;e_pd)PZ -pd=gEr^H]Rr^ZiVqb$i\r_<Afr_`Ynr`/r!r`];+ra5Y7rau.Crbh^TrcJ-drdFm!JH19#M>iM6OT(UG -S,T)[VZ*XqYl;*1]DfVF`W"$Zci2DmfDaS)i;Vd9jo4NDm/HMRnc&.Zp&=acq>U6fr;QZlrkJKGs8N#p -rVl`oqYp<iq#:!do`"I]nG_hSli-)Hjo46<hYu7.f)F%qbl5``_Z%:K]Df/9YPtU%U]-qcSGn`OOT(7= -K`6Q%J,XZkFT-7YD>n8KB)Z6<?iF@1=T2A#<W5nq;>X/g9`@]^8cD9U7f>aV77I2DmmD^ommHt?r^HTO -qag]Xr_*5bqbR2gr_i_qr`B)$ra#M1raGe<rb;@Krc%jYrce?krdk0(KE-])NW,%=PQ%*OTDkVbX8]=% -Zi7T9^])+Lao9Qad/MVqg&Bk-iVqp;kPjfHmf)_ToD\F^pAXjdq>U6fr;QZlrkJKDs8N#prVQKkqYp6g -pAXaao)A.Xmf)POl2KiEi;VR3g]#b&df.SlaSs-W^](hD[JmB/X8\spT`1G[QN!$GN;eV3K)U9!HN&-f -E;jbSD#S)HAG]a5>lIq+<rQ(t;>sDk:]=,g9`@]a9)_E]8H)-X7f5aQ7K,^D6^:",6i0:N7JK@O8,c'Y -8cD?]9E%W^:B")h;>sPo<rQ;%>l.n-A,^-?D#S>OE;k(\HiANoK)UN+N/RaqrfR2GrgWn[rhf[qric=. -rjr*Drl"fWrm1Slrmh#&rndY4roX4Drp0ROrp]pXrq69arqH<drql]nqu4/+\c;[.qu-Nlrql]krqQKe -rq??_rpg!VrpB^Mroa:@ro!e3rn.5#rmC_hrlG)Vrk8<@rj;[-ri,mmrgs+Xrg*PFrepc2rdk&trd4We -rc8!VrbDFFrac"9ra,S/r`K/$r`9"rr_`Yjr_EGdqb-o\r^m&Y!CoZW7f,XL7/0-76MNqC7/fXJ7fGpW -8cD?Z9E%Wa:B"&g;>sJm<rQ2"=T2S)?N+@3AH$6@CAr/NErL4\HiAKnJc:H(MZJp$!0I2GrgNhXrhTOm -riZ7-rji$Arkn`UrlkAhrmh##rn[S3ro="@rp'LMrpTjVrq$-_rqHEerqcWkrqucoqu4/+\c;[.q#13i -rql]jrqQKerq-3\qsaUOrosFDro="8rnIG(rmUknrlb;]rkSNGrj_s3riQ1"rh9=_rgWnNrfI,<re19% -rdXolrcS3[rbqdNrb)4?raGe5r`oG+r`K/"r`&kpr_WSir_EGdr_*5_r^d)\!D#c\8,,RN7K,^>6a/oD -6i0:N7JK@O8,c'Y8cD?]9E%Wa:B"&g;#XAl;uTer=T2M'>lJ+0@K'd9BDu]GDuObUFoHXbJ,Y'!K`6r0 -NrbH.!0dDOrgs+_ri5t"rilC3rk/6Grl>#]rm:Ynrn%/(rnm_7roO.Drp9OOrq$-]rqHEerqZQjrquZl -qu4/+ZiC%(qu-NlrqcWirqQKdrq-3\rp]pTrp9XJroO.=ro!e2rn7;!rm1Sfrl"fPrkJHArj2U-ri#gl -rh'1Zrg*PGrf-o5re(3"rd4Whrc.pUrb_XKrau.=ra>_3r`oG*r`K/#r_i_mr_NMir_EGer_*;b!D?)b -9)D3Z8GG[L7K,^86e"He6i0:H7JK@L8H)3[9)_K_9`@cc:B")h:]=5j;Z9_r=8lA%>lJ%.@/aX7B)ZND -D>nJQEW14^HiANoKDp]+NW,(>Q3!JE!1Wt[rhTOlric=-rjVmArkeZQrlkAfrmLf!rnRM2ro3q>roj@J -rpB^Srpp']rq??drqZQiqu$Hlqu4&(ZiC%(qu-NlrqcNfrq??arq-3[rpTjRrosFGroX4=rnm_1rmq(s -rm1Sbrl+lQrk/6>rj)O*ri#glrgs+Xrg*PFrf$i5rdt-!rd=]grcA'Xrb_XKrb)4?raGe5r`oG+r`K/# -r`&kqr_`Ykr_NMf!)*De9`%K^9)_EW8,,RK7J0(A6e"I"6h3Y?7JK@I8,c*Z9)D9\9`@cc:]=2i;>sMn -<W6%u=T2M'>lJ+0@K'd9BDuZFD>nMRFT-I_I/\WpK)UW+N;eq<QN!<RSt5qRrhTOmriQ1*rjVm>rk\TQ -rlG)brmUktrnRM0ro*k=roa:FrpB^Rrpg![rq69arqZHfqu$Hlqu4&(ZiC%(q#1*erqcWgrq??arpp'Y -rpTjQrp'LHro3q8rnm_-rmh"qrltG`rl"fOrk&0=rilC'ri,mjrgs+Yrfd>Drf6u4re(3"rd=]ircJ-Y -rb_XMrau.?raGe6ra,S/r`K/#r`/qqqbd>h!)EVk:]=,g9`@]a9)D3Z8GbpM7f,XO7)D=a7/fXG7fGpT -8H)3[9)_K_9`@fd:]=2i;>X8j<W6)!=T2S)?2e72@K'g:B)ZTFDZ4VSFT-L`I/\WpKDpW)NrG.>PQ%'N -ScPOY!29CkriQ1(rjVm=rkSNOrlP/armC_qrn.5-ro*k9roj@Grp9XQrpg!Yrq69arqH<drqlKhqu4&( -YlF_%qu-NlqtpBgrqQKerq-3\rp]pUrp9XMroa:Aro!e4rn@A'rm:Yhrlb;Zrk\TJrjVm5ric=#rh]Ue -rg`tSrf[8@reg]1rdaurrd4WercA'Wrbh^Nrb2:@raPk6ra,S/r`];'r`9"ur_`_n!Du_n:]=2i:]=,g -9`%K^9(bdT8GbpJ7asln7fGpT8Gc!U9)_K\9`%Ta;#X8i;>sJm<W6)!=T2M'>Q.t.?iFL5A,^0@CAr,M -DuOeVFoHaeIf=lsL]321NrG4@Qi<NST`1bgWMolsric=-rjVm@rk\TPrlb;drm:Yrrn@A.ro!e:roa:H -rpB^Rrp]pYrq-3arqQKgrqlTjrr)`nYlCs-q#:'drqcWirqQKcrq-3\rp]pTrpB^Lroa:Aro!e3rn@A$ -rmC_jrlG)WrkSNGrjVm4riZ7#rh]Uerg`tTrf[8@repc0rdt-!rd+QfrcS3Zrb_XMrb)4Brac"9ra,S0 -r`];(r`K/#!)rtu<;ohn;>X/d:&[i]9E%Q\8cD9L8(:$!8,c'V8cD?Z9D_E^:&[ob:]=2i;>sMn<W6%u -=T2J&>5hh,?iFI4AH$0>BDu]GDZ4VSFoHXbHN&EnK)UK'MuJe:P5^jJS,T)[V>dFpY-%c-rj)O4rk/6G -rl+lXrm(Mjrm^r$rn[S3roF(@rosFLrpKdTrpp'\rq69crqZQiq#'pdYlCa'rr2fnrquclqt^6crq??` -rpg!WrpTjProsFEro3q7rn[S*rm^qorltG`rl"fOrk&0=rilC(ri?$nrh07]rg*PIrf@&:reCE(rdauq -rd"Karc8!VrbVRJrb)4?raPb3r`oG,r`B/$!EN8#<Vo_o;Ys;i:]=2i:B!ue9`%K^9(bdQ8CU0&8Gc!U -9)_K\9`@cc:B")h:]!uc;Z9Vo<W6)!=T2P(?2J".@K'd9BDuWED#SAPEW1%YH2`3jJGt0"L]352O8b@B -QN!HST`1_cX8]7&Ycn,3rjVm=rkSNOrlP/arm:Yorn%/*ro!e8roX4Drp0RPrp]pWrq-3_rqHEfqtg3f -rr)`nXoGF$rr2]krqucmrqcWhqtL*^rposTrp9XLroO.>rnm_2rn7;%rm:Yhrlb;Zrk\TKrj_s7ric=% -rhf[hrh'1Yrg*PFrf-o8re19%rdXoorcnEarc%jSrb_XLrb2:CraPk7ra5Y1!*fP0>lIt,=T2D$<rQ+u -<;oep;>sDe:]=,d:%_3T9AN589CbdU:&@]_:]=2i;>sJm;uTer<rQ2"=T2P(>lJ%.?iFL5@fC!=B`;cG -D>nJQE;jtYGQ)sgJ,Y'!K`6o/NrG.>QN!?PTDkSaVuEarYPtm0\@;OKrkJHLrl"fZrm(Mirmq)%rn[S2 -ro3q=rp'LLqsXOTrq-3aqtU0erql]mq#1*hXoGF$qu6KkrqucmrqcNfrqQKcrq-3\rp]pTrp9XJroO.= -rnm_0rn7;#rmC_jrlG)Xrk\THrj_s7ric=%ri#gjrgs+Yrg!JGrf@&8reCE(rdaurrd+QdrcA'Xrbh^N -rb;@Drac"<ra5_5!FK45?N+1.>5MG$=8l8"<;ohn;Z9Pj;#X8f:@_-P9__9O9_D-T:B"&d;#X>h;Z9Vo -<;oqt=8Q,!=oMY)?N+=2@/a[8Ac?<@C&VoIDZ4VSF8g=]HN&<kJGt0"LAm&/O8b=AQ2[9PTDkSaW;`js -YPtp.\,j7T!5/<Irl+lXrm(Mjrm^r#rnRM1ro3q>roj@JrpB^Srpp'\rq60`rqZQirql]mrr)NhXoG=! -rr2]krqucmrqcWirqQKdrq69_rpg!WrpTjOroa:Bro*k6rn[S*rm^qorltG`rl+lPrk8<Brj2U.riQ0s -rhKIbrgWnQrf[8Arepc3rdt-"rdXomrce?`rc%jTrbh^Mrb2:CraPq;!FfO;?iFI4?N+4/>Q.h*=T2@u -<W5ts;u9Ji;=[Q_:]=2`:\[][:]=2i:\%?];>=&g;uTbq<Vohr=T2J&>Q.n,?2e72?iFL5A,^*>B`;cG -DZ4SRE;jtYG5cddJ,Y#uK)UT*MuJe:P5^gIS,T&ZU]..iXo>R(Zi7Q8]`Gpa!5STQrlP/arm:Yorn%/* -rnm_6roO.Crp'LOrp]pWrq-3_rq??drqZQirql]mqu-EkVuNIjrr2]kqtpBhrqQKerq??_rpp'WrpKdP -rp'LEro="8rn[S,rn%.srm1Sfrl4rTrkJHErjMg3ric=$rhf[frgs+Zrg!JGrf@&:reUQ-rdausrd=]i -rcS3\rc%jSrb_XL!,)CHB`;ZDA,]s:?iFI4?iFC2>lIt,>5MJ%=T2@r<W5ts;uT\E;>X8j;uTbn<Voho -=T2J&>5hb*>l.k,@/aO4@K'd9BDuWECAr)LDZ4VSErL7]GlE*iIf=lsL&Qo-MuJe:P5^aGSGo,ZT`1hf -WrB4$ZMq?4]DfSE_Z@cs!65#^rm(Mjrn%/'rn[S2ro3q=rp'LKrpKdSrpp'\rq??crqQBerqlKhqu3Dk -U&Y#hqu-Nlrql]krqZQgrq??arq-3[rp]pSrp0RIroO.=ro!e3rn@A%rmLelrlb;^rl"fNrk&0>rj)O, -riH*rrhKIbrgWnRrfd>Crf-o7re:?(rdXoqrd"KercJ-[rc%jS!,M[PD#S5LBDuNBAc?3=@f'R4?N+70 ->lIt,>5MJ"=T2D!<qTJT<;T\j<rQ1q=T2J&>5hb*>lJ%.?Me.0@fBm:Ac?<@BDu]GD#S>OE;jqXFT-L` -HN&?lJ,Y'!L&Qu/N;eq<PQ$pJS,T&ZU]..iXT#F&ZMqB5]DfSE`;[gYbKBn/rm1Slrmh#%rnRM2ro3q> -roj@IrpB^Srpg!Zrq69arqHEfrqcWkrqucop&:ceT)\fhqu-NlqtpBhrqQKerq??`rq$-Zrp]pTrp'LG -roO.=ro!e4rn.5#rmLemrlkA_rkeZLrk8<>rj2U-riH*trhTOdrgj%Wrfd>Drf@&9reLK+rdausrd=]j -rce?`rc%pW!H<#WDuOSPCAqrHB)ZB@AH$';@K'X5@/aO4?Me%->lIt,>5h[t=QW]U=T2J&>5hb'>lJ%+ -?N+@3?iFL5@fBp;Ac?<@C&VoID#SAPE;jkVFT-I_H2`3jIf=lsK`6c+MZ/\9OoCRDRf8lWT`1bdVuEds -YPtm-[f3u>_#D4MaSs?`d*Md>rmLesrn.5,ro!e8roO.Crp'LNrpTjVrq$-^rq??crqZQirqlTjrr)`n -T)Y2Xrr2fnrquZjrqcNdrq??_rposTrp9XLroX4?ro!e4rnIG*rmLemrm(Mbrl4rSrkJHErji$6ric=' -rhf[irh'1\rgEbOrfR2@rf-o6reCE(rdausrd=]i!-SBdG5cU_EW0qVDuOVQD#S5LC&VfFBDuH=A,B^6 -?iFI1?hdt&?12%n?2.b'?iFI4?iFI4@K'd6AH$6@B`;`FC]8/LD>nJQE;jkVFT-I_GlE*iIK"crK)UN( -M>iM6O8b:@QN!<OSc58\U]..iXo>R(ZMqE6]`,\F_Z%RSao9TbciMSC!7Ll"rnIG/ro!e:roX4Frp9ON -rpg!ZqtC$`qtg<hqu$Hlqu3)bR/d'_rr)`lrql]krqZQgrq??arq-3\rp]pTrp9XJroX4@ro!e4rnRM) -rm^qorm(Mcrl>#TrkJHGrjVm7riuI)ri,morh07^rg`tRrfmDErf6u9reUQ,rdt-!rd=cn!IK1mHN&*e -FoHL^EW0qVDuOVQD#S5LC&VfFBDZ9>AG]m9@e*t,?iFI+?iFI4?iFI+@JaO5A,Bg9Ac??AB`;`FC]8/L -D>nJQE;jkVFT-F^G5cgeHiAHmJ,Y'!K`6f,MZ/Y8OoCUEQN!ERT)PD^VZ*RoXo>U)[/RQ6^&GhH_Z%UT -b5T]cd/MMqf@L#SrnRM0ro!e:roX4Drp9XOrp]pXrq-3_rq??crqZQirqlTjrr)WkS,\lUqu6KkrquZj -rqcWhrqHEcrq69_rpg!WrpTjProsFFro3q9rnm_0rn%/"rm:YirlkA]rkn`Mrk8<ArjMg1riQ1#rh]Uh -rh'1\rgEbOrfR2Arf6u8reLK+rdb'"!J#_"J,XipHN&3hFoHL^ErL%TDuOVQD#S5LCAqoDBDuNBAbBU, -A,'O1A+F10Ac?<=BDuWECAr#JD#S;NDu4MQErL.ZFoH[cHiAElJ,XutJc:?%L]321NrG+=OoC[GRJrcV -TDkSaV>dOpY5Y[)[f3i:^&GeG_u@[Tbl5oed/MSpfE'a]!8IM1ro*k9roa:Frp0RPrp]pWrq-3_rq??c -rqZQirqlTjrr)NhS,\cRq#:0hrquZjrqcNdrq??`rposTrp9XMroj@Cro3q8rn[S.rmq(trm:Yirlb;^ -rkeZMrkABBrjMg2ric=%ri,mlrh9=`rgWnSrg!JFrfI,>re^]3!JlR2LAlf(JGt&tIK"WnHiA9hG5cU_ -F8g4WE;OSKD>nAKCY`b)C\qrCD>S8KE;jnWF8g:\G5cacHiAElIK"`qJc:9#LAm#.MZ/Y8O8b:@Q2[0M -S,T&ZU&LhdWW'!uYPtg+[Jm`9^AbqI_Z%XUb5T]cd/MPof)FG'h#ZHl!9!k9roX4Drp0RNqsXOTrq-*] -rqH<drqlTjrr)WkQ2d-Lp&=shqu$HjrqcWirqQKerq69_rpp'XrpKdQrosFGroX4>ro!e4rn7;&rmh"q -rm1Sfrl>#Wrk\TJrk&0>rj)O-riZ7!rhf[jrh07]rgNhQrg!JFrf7&=!KE*<N;eY4LAll*K)U<"J,Xip -HiA?jGlDpdG5cU\F8KtSE;OSQDWYg5DYnALE;OYSF8L(YG5c^bGlE$gHiAElJ,Y#uK)UH&LAm#.N;eh9 -O8b:@Pl@$KRf8lWT`1bdVZ*OnY5Y[)ZMqB5])KGC_>_CPa8X<^cMl5jec+2"g&Bk-huVis!94"?roa:F -rpB^Qrp]pXrq-3_rqHEerqZQirqlTjrr)NhQ2cpFqu6KkrquZjrqcWirqQKdrq69_rpg!WrpTjPrp'LH -roO.>ro!e4rnIG*rm^qqrm1SgrlP/Zrk\TKrk8<?rjDa1ric=%ri,mmrhBCargs+Yrg<\K!0RAGP5^OA -NrG":MZ/D1L&Q`(Jc:3!J,XlqI/\KlH2`'fGPcO^FSg.VEoqB7ErL.WFT-F^GQ)jdH2`0iI/\QnJ,Xut -Jc:<$L&Ql,MZ/P5NrG+=OoCRDR/WQRT)PA]UAgtfWW'!uYPtg+[/RQ6^&GeG_>_IRao9Qaci2AleGe/# -g]$(/i;Va;jlHL(roj@Grp0RPrp]pWrq-3_rq??drqZQirqlTjrr)NhP5gL@q#:0hrquZjrqcWhrqHEc -rq-3\qsaUQrp9XKroj@Dro*k7rnm_/rn.5$rmC_lrm(Mbrl>#UrkSNHrk&0;rj2U.riZ7$ri#gkrhBCa -rgj+Z!LoSXRJrKNPl?gEOT(:>NW+h7M#N/.K`6W'K)U;tJ,XooIJA0aHLH.SHMDjdIJ\KmJ,=cqK)UE% -K`6`*M#N;2NW+t;OT(CAPQ$jHRJr]TT)PA]U&LhdW;`grY5Y[)Zi7B3]DfMC_#D7N`r=*ZcMl/hdJh_r -f`'V(hu;R5iVr!=k5ji3!9sLLrpBUPrq$-]rq??crqQBerqlTjrr)WkN;nk:p&=shqu$HjrqcWirqQKe -rq69_rq$-Zrp]pTrp9XLroj@Bro=":rndY/rn7;$rmUknrm(MdrlP/XrkeZLrk&0>rjMg3rilC)ri,mq -rhf[h!2'@cT`1P^Rf8`SR/W?LPQ$^DO8b.<N;e_6M>i>1LAlo+K_U/rJGXiVIf"WlJG=`qK`6])LAm#. -M>iD3N;eh9O8b:@PQ$gGR/WNQRf8oXT`1\bVZ*LmWW'("Yl:s-[f3f9]DfSE_Z%LQao9K_cMl2ie,Ins -g&Bb*hYuL5j8S-=kl0iJm-F`=rpKdSrpg!Zrq-3_rqHEerqZQirqlTjrr)NhN;nY4qu6KkrquZjrqcWi -rqQKerq??`rpp'YrpTjUrpB^Nroa:CroF(:rndY1rn7;&rmh"prm(MfrlP/[rl"fOrkABErjMg5rj)O- -riQ1#rhogn!MuXlU]-qcT)P;[Rf8]RQi<3JP5^UCOT(=?Nr+b6MZ/G/L\QQ"KB@dbKD:-!L\lo)MZ/P5 -NrG+=OT(CAP5^[EQi<EPRf8lWTDkM_U]..iW;`jsXo>R(ZMq92[f3r=^AbqI`;[dUao9Qaci2;jec+2" -g&Bh,hu;R5jSn9?kPjfHm/c_G!:^!Vrpg!Yrq-3_rqHEerqZQirqlTjrr)NhM>r5.q#:'eqtpBhrqZQg -rqHEbrq-3]rp]pUrpKdOrp'LHroO.>qr%J0rnIG(rmh"qrm:Yhrlb;]rl+lRrkSNIrk/6>rjDa2ricC* -!NrU)Xo>=!VuEOlUAghbTDkG]SGo#WR/WENQ2?dEP5^R?O8b14NVe\0MtN&+NVeb8O8G%9P5^[EQ2[-L -R/WTSSc55[TDkP`UAh"gVuE[pXo>L&Yl:s-[JmZ7]`,VD_#D4M`W!pWbPoccd/MGleGe)!g]$%+i;Vd9 -jo4KCl2L#Jmf)YUnF-GIrq$-]rq69brqQKgqtg<hq#1!eKE$T(p&=jerquZjrqcWirqQKdqt9s[rpp'W -rpKdPrp'LHroX4Aro3q8rndY/rn7;&rmUkorm1SfrlY5]rl"fQrkJHGrjr*=rj;a5!OT65Z2Us+XT#:" -W;`[nV>d4gU&1J]SGo#TRJrTQQi<<MQ2$RBP3.o(P5(7?Q2[*KQi!0LRJr]TSbo&YU&LecV>dClW;`js -Xo>O'Z2V*/[Jm]8])KDB^])+L`;[jWb5TWaci2>ke,Itug&Bb*hYuI4ir8'=kPj]ElMg,Kmf)\SnH&7Q -!;$3_qtC$arqZQirqlTjrr)EeKE$N&qZ$Qop&4mfrqcNfqtL*`rq-3]rpp'XrpTjSrp'LIroj@Bro3h5 -rn[S.rmq(urmUknrm(MfrlP/[rl+lQrkSNIrjr0@!P,c?\,N`5ZMUj)XT#:"W;`^oVZ*@iUAgkcT`1S_ -T)P;[SGo#WRerNPR-'b4R/WNNRf8fUSGo)YT)PA]T`1YaUAgqeVZ*LmW;`jsXo#=$Z2V*/\,Nr;]DfPD -^])(K`W!pWao9Qaci2;je,Insf)FG'h>?.0j8S-=kl0iGlMg5Nn,DhUo)A4]o^i.UqtC$`rqZHfqu$?i -qu20HqYu-Ho`+piq#13iqtpBhrqZQgrqHEcrq69]rpfmSrpB^OrosFGroX4>ro!e5rn[S/rn@A&rm^qp -rm:YirltGbrl>#Wrk\ZN!PlMM^](qG]`,MA[f3]6[/R?0Yl:j*Xo>F$X8]*tW;`[nV>d:fU]."eU"uC@ -U&Le`U].(gV>d@kVuE[pX8]4"Xo>O'Yl:p,[/RK4[f3l;]DfMC^])(K_Z%ORaSs?]c2Q#fd/MGleGe%u -gA]k+h>Z=2iVqj9k5OQCl2L&KmJHAOnc&+Yp&=Xcp\+[^rqQKgrqcWkqu$6fqu20Hp]#gEo`+gfqu-<f -rqcNfrqQKerq??arq-3]rp]pUrpKdPrp'LHroX4@ro="9rndY1rn7;'rn%.urmLemrm(MerlY5\!6,&Z -`r<pU_Z%@M^AbeE]DfD@\,Ni8[/RE2ZMUm*Y5YR#X8]-uWW&jJVuEXoWV`^pX8]7#Y5>I&ZMq30[/RK4 -\,Nu<]DfJB^AbqI_Z%LQ`W!pWb5TT`cMl2idf._pfDaG%g&Bh,hu;R5j8S0>k5OTDlMg/Lmf)\SnG`%Y -o`"O_pAXdeq"OjarqZHfq#(-ip&9OBp]#gEnc/Ufp&4mfqtpBhrqZQgrqHEcrq69_rpp'YrpTjUrpB^N -roj@EroX4?ro3h4rnRM-rn%/#rm^qprm:YjrlbAb!QrRaao9<Z`;[[R_>_7L^](qG]`,MA\c0,<[f3Z2 -Zhq$,YPtd*YPYKbXnAjrYl:j*Yl:p,Zhq-/[f3c8\c02>]DfMC^])%J_>_@O`W!mVao9K_bl5rfd/MGl -eGe"tfDaP(h>?+/iVqm:k5OQCkl0oImJcVSn,DkVo)A:\p&=[ap\spgq=t$dqtg<hqu$?iqu20Hnc+1? -li6k]p&4mfq"k!bqtL!\rq-3ZqsXOOrp9XMroj@EroX4>ro*b3rn[S/rn7;&rmh"r!71bnd/MAjcMl)f -bl5``aSs3Y`;[[R_Z%@J^](tH^&G\D]DfD@\c0,9\,Nhu[JRE3\,3]7\c02>]DfJB^&GbF^\bhG_Z%IP -`;[dUa8X3[bl5ldcMl/hdJhSnec+2"g&Be+h>?+/iVqj9k5OQCkl0oIm/HDOn,)VOo`"O_p\Xa]q>gBh -r;6Hcrdk+;s+149s7QBgrVl`lqu6Hhq>U0gpA=O^oD\=XnG_kTmJcDMl2KoGk5OKAjSn-;i;VX5h#?%, -g&BS'ecF@Qrm^qqrm:YjrltGdrlb;`rlG)Zrl4rVrl"fQrk\KIrkJ?Erk83Aqn)=.rk%s<rk83CrkJ?G -rk\TNrl"fTrl4rXrlP/^rlb;brltGgrmC_nrm^qtrn%/&rnIG-rnm_5ro*k;roO.Aroj@Grp'LMrpK[Q -rpp'[rq60^qtU0dqt^?jqZ-Njr;QZcrdk+;s+140s8N#mrVl`lqu6Hhq=s^`o_\7Wnb_eSm/H>Mkl0cE -k5OH@j8S';i;VU4h>Z./g&]p]rn.5$rm^qrqpGDhrm:YirlkAbrlY5^rl>#Xrl+lTqnrEMqn_+(rk\KK -rknWOrl+lVrl>#[rlY5`rlkAdrm:Yjrm:YlrmUksrmq)$rn7;*rn[S2ro!e8ro="=roX4Croj@IrpBUO -rp]pWrq$$Zq"Od`qtg<hr;6Qmq#1*hJcFj3JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-huEBKqu-<fqtpBhrqZQgrqH3\rq$-[qsaURrpKdPrp0RKroj@EroX4@!94+? -j8S$:i;VX5hYu=0g]#q+g&BY'fDF+teGdqrdehGkd.krdcM5ZQbkTH[cMPred/25idf._meGe"tfDaG% -g&B_)g]$"*hYuI4iVqm:jSn<@kPj]ElMg,Km/-5JnG`"XoD&"Xp\sseq>:$fqtU*grVZZhrdk+,s+14$ -s8N#grVl`oqtp6eq>9pcpAX^]oDA(Wn,DhUmf)VQli-2Kkl0`FjoOW,roO.>ro3q9ro!\2rn[S/rnI>' -rn.5$qpk\qp!`ogpsJQWpsJueqpYGlrmgnsqq1o$rnIG-rn[S2qr%J4ro3q;roO.Aroa:ErosFJrpB^Q -rp]pUrp]pWrq$$ZqtC$`rqZ?crql]mp&4gf!<.QLf)L=$c2[eBo)8RcrqlThqt^-`rq?6^rq-*XrpTjU -rpTjSrp0XN!UK(NlMg#EkPjQ>j87g7hu;R2htu7,h##k*g@Eqcf_*qpgA]k"h#?.,hu;R5hu;R5iVqm7 -jSn?>kl0lHli-8Jmf)_Tn,DhUnb_tXp&"I^p\t!`qYpBkr:U$crqZSFs4..#s3:T:rqlZnr:TsdqYp<i -q"sgbpAXaao_\7Znc&%Wn,D_Tm/cVArp9OJrp'LHqrdk<roEt:ro3q9ro!S/rndG+ptY>mptYZ#qqh5- -ro!e7qr7V8qrIb<roa1Bqs+1Hrp9XOrpKdSrp]pWrq$$Zrq69aqtL*brqZHfqtp9grr)Eeq>Z$Gec14# -a8c&9o)8RcqtpBhqt^6dqtL*`rq69_rq$-[qXFUVnc&"VnG_kTmJcJOli-2KkkjQBk549>jSS!:iq;9[ -i;;L1ir8!8jSn9<k5OQ@kl0lHli-8MmJcPQnG_nUnGDbTo)A7[o`"O_pAXg`q#:*dqYpBhr:U$]rq?AC -s4..#s1\O1rpp$er;6BdqYp9bp\smcp&=R`o)\ISrposVrpTjUrpTaPrpB^Oq!7hAqrm_9roX+>k2cO' -qr[e=p#uD>q!7qGrpBLKrp]pUrp]pWrpp'[rq-3_rq?6`qtTs_rqlTjp&4R_mJhb;ec14#^Amd'qu-<f -qtpBhq"apaqtL'^r:U']qt'gXrpfmTrpTaPqsFCLqs3q?ror%uros+@rp0IJrpBLKrpTaRrpg!Yrq$$Z -q"=X\qtTs^qtg<hq#(-im/HDPJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjU -qsX=JqsDo"rpBLKqsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#WW2bmo)8Rc -qtp6dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0do(r@_qu$-c -q#8hDJcF:#JcD_Lm/I"_qu$3cr;6Kio(i(To(DnPo(1].p%.kKp%A+Sp%eL]p&"O^rr)3_ec14#ec14# -RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcCc1q#:6joDSI^ -q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\])R?]ec14#NrSbNoD\Xcp&+(Orqah6qtf[Vo)/Lck5MslJcF:# -JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#JcFg2o)>llm/E4KJcF:#JcC<$jSt2<PQ-46ec14# -JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$ -JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec1. -~> %APLeod -EI -76 0 0 76 0 171 cm -BI -/Width 228 -/Height 228 -/BitsPerComponent 8 -/Decode[ -0 1 -0 1 -0 1 -] -/Interpolate true -/DataSource cg_aiproc -ID -JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$ -JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$df6QN -JcC<$ec14#JcFg2o)>llm/E4KJcF:#JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#L&_,Nr;Q0` -n,2tXm/$VTn+cnXl2(2Pn,2YQq#7PuJcF:#JcCc1q#:6joDSI^q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\ -])R?]ec14#RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcDDC -rr2Keq#(*fr;6Kiqt]p[rqH*Zqt9jYp%-](qt'LQrq5sXrqH*\rqZHfq"sjap&4debl<7oec14#WW2bm -o)8Rcq"t$dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0dq"jd_ -qu$-cq#8hDJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjUqsX=JqsDo"rpBLK -qsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#[K$7*o)8Rcq"ssaqtU0bqt:$_ -r:U']rq$$Xqsj[TqsX=Io'?;?o',<#p$)A=p$;D?rpTaRrpfdSrq$-]rq6'[rqH3_rqZ?dqu$-cqu5[V -JcF:#JcEIaqu60brquZjq"k!bq"Od]rq69_!:p6_oD\=Xnc&"VnG_nRmf)VQm.foDl20];kPjW@jlYY' -jnn3;kOn'<l1jTDm/HDImf)_Tn,DhUnc&+YoD\C]p&=[^p\Xa\qYpBhr:U$]rpB`:s4..#s2Y0:rpp$e -r;6BjqYU*fq"sgbpAXaao`"I]o(qkWnaZVIrp]pTrpB^Orp0RKroj7BroX+>roEt:ro3V0eDU5_qr7V8 -qrIb<qr[n@qrn%Erp0RMrpB^Qrp]pUrp]gTrpp'[rq-3_rq??cqtU0dqtg<hqu$-cp&=[bJcF:#JcEmm -rr2BbrquZjrqcEbq"F^Zrq$-[qsj[SrpTpU!UfCTmJcGNlMg&IkkjQ?jo4?9iqq[5hu;R5htu:0h:LH] -h>#k+i;VX2i:u=/jSn9?kPOKBl2KuIli-;Nmf)_Tn,DhUnc&+YoD\CWpA"F[qYpBhr:9gcrq?ACs4..# -s3:TCrpp$er;QTjqYU*cp\sm`p&=U\nc&"VnG_nUmf)PQlN->;rp'LHqrdt>qr@S4rnm_5qqq;,qqV)' -rn?qrn(@<dqqD&(p"]Q&qqqD2rnm_5ro*k:qrIb>qrn%Erp0RMqsOIQrpTjUrpfmXrq60^rqHEfq"k!e -rquHfqu6EkJcF:#JcF=$rr2Kerqucmqtg3cqtL*`rq-*Zqsj[Srp]pTrpB^Nrp'LHroX:D!TrPDjo4<> -ir7p9i;;F2h>Z4/g\]\'f`'J!ec+(ke,IejdI5HWdJMAhe,.Yoebdqpf`'S'g]$"-h>Z=/i;V^7ir8!; -jo4EAkPj]El2L#JmJcPQnG_nUnG_tWoDA1WpAXgcq=sgcqu6NdrVZWprdk+#s+14$s76-fr;QTmqYp<c -q#:!dp&=U_o)%tVnG_kTmJcGNlMg&Ikl0`Djo4<@irS3#ro3q8rnm_3rnRM-rn@A(rn%%urmh"tpsT/g -p!<W_ps&9Ops&]]qp5/dpsT/krmgnsrn%/%rn@A+rnRM0rnm_5ro3q;roF(?roa:ErosFIrp0RNrpTjU -rpfmVrq-3_rq?-^rqZQirqlTjpAG!iJcF=$JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-irB#Wq#13iqtpBhqt^$]rq-*ZqsjRPrp9XMroj@EroX4@ro=";ro!e4rn[S. -!87J-gA]b(f)F1ue,.Plci2;jcMl&ebPoZ`ao9?[`r<sV`;@IO_Y_1*_#D1I_Z%IM`;[aT`r=$Xao9H^ -bPo`bc2Q)hci2;jdJhVoec+/!f`'S'g]$%.hu;R5ir8!;jSn<@kPj]Eli-;Kn,DhUnc&.Wo_A1[q>:$f -qu$?lr:p6frdk+2s+143s8N#jrV69eq>U0apAXX^nb_hTmf)VQli-2Kl2KfDjSn3=iVqd7hu;F1gA]e) -ec=5$e^aZKrmLenrm1ShrlkAbrlP/\rl>#Wrl"]OrkeQJrkJHHpq>Lqpq?R=qnW3JqnrEOrl+lWrlG)\ -rlb;brm(MhrmC_nrm^qtrmq)%rnIG-rnm_5ro*k:roF(?rosFIrp0RNrpK[QqssOUqtU0dq>10hp&4mh -JcFj3JcG'9qu69erquQfrqQBbqt9s\rp]gRrpB^Orp0RIroa:Cro3q9qqqD/rnRM+rn%/"rmCen!RT3m -ci25hc2Prdao9B\`r<pU_u@OP_#(nG^AbhF]`,PB])K8>\GNc7[cY!p[f3c5\Gj&<])K>@]`,VD^AbnE -_#D4M_u@UR`r=$Xao9N`c2Q#fci2>kdf.erfDaJ&h#?.,hu;U6ir8*>kPj]Eli-8MmJcSOnGDkWp&=^_ -q"aadqYU3frUp/@s6fo<s7--grq66hr;6BjqYp<iq#:$epAXaao`"F\nc&"VnG_hSli-,IkPjWCj8S'8 -hu;F1g]#h(f)F1udJhMlci2,gaoTZ-rlP/Zrl"fRrk\TLrkJHGrk/6Arji$<rjMg5qm61)ric=*ric4% -k,n<ZrilC*rilC,rj2L/rjMg8rji$>rk&0CrkJHJrk\TOrl+lVrlP/_rlkAfrm:Ylrm^qtrn%/(rn[J/ -ro*k:roX4Croj@IrpB^SrpTjVrpp'\rq69arqHEe!VuNkq>:$fqtp<grVQSFs7-,?s7--^rVl`lqu6Hk -q>U0gp\smco`"I]o)A.Xn,DbSli-2Kl2KfDjSn3=i;VU4h>Z.-f`'J$eGdnnci2/fb5TE]`W=*!rl"fP -rkSNJrk/6Arji$;rjMg6rj)O.ric=*riZ7&riH+"ri5jpri#^lk,/-Uql'Lnri5suriH+$riZ7)ric=+ -rj)O2rjMg8rji$?rk/6FrkSNLrl"fTrl>#\rlk8crmLeqrmq)$rn@A-rnm_5ro="=roO.Drp'LKrpKdS -rp]pXrq$-]rq??c!VlEiq#:*gqYU0hr:U#>s7-,?s7H?jrqQHkr;6BjqYp<iq#:$epAXaao)A1Vn,D_R -m/H8Kkl0`Dir7m8hu;I2h#?%,f)F1udJhMlcMl)fb5TH\`W!^S^]D6drkJHGrk/6ArjMg6rj;[0rilC* -riQ1$ri?$tri#gnrh]UiqkO.brh8/@rh9=cqkO.drh]Ukrhoapri?%"riQ1'rilC,rj;[4rjMg;rk&0C -rkJHKrkeZRrlG)]rltGfrm:Ylrm^qurn@A+rn[S2ro*k9roX4CrosFKrpBUOrpg!Yrq69a!Vc<gp\sse -q>U6iqtp<drVQSFs7cPEs8)cprq66hr;QQiq>9pcpAX^`oD\=[nG_nUmf)MNl2KoGjSn09i;VR3g]#e' -eGdqrd/M>ic2Piaa8X'W_>_7L^Ab_E\H07OrjVm5rj)F)riH+"ri#gorhf[irhBCcrh07_rgs+[rg`tW -rgN_Prg;i7qj@ANqjRMRrg`tYrgs+]rh07arhBCerhf[mri#gsriQ($riuI/rjVm;rk&0DrkJHKrl+lW -rlP/arm1SjrmUksrmq)'rn[J0ro="=roj@Grp'LNrpTjUrpp'[!VH!ao_\@]p\t!cqYU3frVQSFs8)bH -s8)cjrVl`lqtp3gq#:!dp&=U_o)A1Yn,DbSm/H>MkPjWCjo46<i;VU4gA]b(f)F.tdJhJkbl5caaSs*V -_Z%@M^AbbD\c/u:ZN7D=qlp(%ri?$srhf[krhKIeqk*kYrg`tVrgEbQrg*GHrfmDGqi^W7plPB8plbW? -rfmDIqj.5KrgEbSrg`tYqk*k]rhKIhrhoaori?%#qlp(+rjDa9rk&0DrkSNMrkn`VrlY5arm1SkrmUkt -rn.5(rndY3ro*k<roX4Crp0RMrpKdSrp^$[nc87[o`"O_pA=Xaq>U9gr:p5As8)bJs7lTgrVQKkqYp<i -q#:$ep&=U_oD\7Yn,DbSli-2Kkl0]Cj87d6h>Z1.fDa>"dJhMlc2Poca8X'W_Z%@M^AbeE\,Nf7ZMq'. -XoY].riQ1!rhoalrhBCbrh'1]rg`tWrg<\Nrg!AErf[8BqiC`:oo8j-pl"g(qi1K5rf?r<qi^rBrg!JL -rg<\Srgj%[rh'1`rhBCgrhoapriQ1&rilC-rjDa7rk/6DrkSNMrl+lWrlb;crm:Ylrm^r!rnIG.qr%J6 -roO.CrosFJrpKdS!V#RYnG`%Yo`"O_p\sseq>:$fqtU-bre(6*s82fmrVl`lqu6Hkq>U0gp\smco`"F\ -nc&"VnG_hSli-)Hk5OH@i;VU4h>Z+,fDa>"d/M>ic2Piaa8X$V_#D(I]`,A=[/RB1Yl:d(X8]$tV#dEh -rhKIcrgs+[rgNhRrg3VJrf[8CrfI,?rf6l6reg]2qhOs"qh+$_re(!!reLB,qhkB2rf6u=rfI,Arf[8E -rg3VPrgNhWrh'1_rhKIiri#gsriQ1(rj)O2rjMg=rkABIrl"fUrlP/arm1Sjrmh#"rn7;,rnm_5roF(? -roa:Hrp9aUn,VtWn,DkVo)A:\p&=^bq#:*gqYpBhr;QZfre^Z0s8N#mrV69hq>U0gp\smco`"I]nG_nU -mf)POlMg&Ijo4<>i;VU4g]#n*f)F1udJhDib5TK]_u@LO^](kE\c0);Z2V!,Y5YF"VuEOlU&^heTV2:U -rgWnTrg3VLrfd5@rf6u:reg]3reUH*re19'rdt#tomcsimsY(^pj`0krdt-%qh4s&reUQ1reg]6rf-f: -rfd>Hrg3VPrgWnYrh07brh]Ulri,n"ric=+rjVm;rk&0Erk\TOrlG)]rltGirm^qurn7;*rndY4ro="> -rosFI!UK%Oli->On,DhUoD\F^pAXgcq#:*aqtU-ere^Z6s7lTjrVl`lqu6Hkq#:$epAX^`o)%qUmf)SP -l2KoGk5O?=i;VX5gA]b(f)F(rd/M>iao9?[_u@IN^&GYC[JmN3Yl:g)X8]'sU]."eTDkD^RfT"JrgEbN -rfmDErfI,>rf-o7reUQ.re19'rdt-"qg\ToqgJ6dpj2CSpj2^^rdFZmrdXfqrdt-%re19*reUQ2rf-o; -rfI,Arfd>HrgEbTrgs+]rh9=dri#grriZ7)rj2U3rk&0CrkSNNrl4rZrm(MhrmC_rrn.5(rnm_5ro*k= -roX=HklBuIm/HDLnG`%Yo`"R`p\ssbqYpBhr;QZirf$l<s82fmrVl`lqu6Hkq>U0gpAXaao`"C[nG_nU -li-2Kkl0]Cj8S!9hYu:/g&BM#df.Slc2Pia`r<gR^](qG\,Nf7Z2Us+X8]*tV#I+fTDkG]S,SfSP5paH -P*5g*rf6u:reg]1re:?(rdk'!rdXoqrd=]lrd"Kfrce6^rcJ$Yqf:h=olC%QqfMg[rce?drd"Kird=]n -rdXotrdk'$re:?,reg]5rf6u=rfR2Drg<\Rrgs+]rhBCfri,muric=+rj;[6rk8<Grk\TRrlP/arm1Sl -rm^r#rnIG/ro!e9!TiDCjo4KCl2L#Jn,DhUnc&1[p&=[aq#:*gqYpBhr;QZfrf[;Bs8N#mrV69hq"sgb -p&=U_o)A.Xmf)SPlMg#Hk5OB>i;VU4g&BY'f)F%qcMl&ea8X'W_>_1J])K2<Zi73.Xo>=!VZ*=hT`1M] -S,ScRQ2ZsGO8t7@NK*pqreLK-re:?&rdautrdFcmrd"Kfrce?brcJ$Yqf2LPrbpD+rbqRNrc.pYqfMg\ -rce?drd"KirdFcqrdb!!re:?+reLK2rf-o=rf[8Grg3VRrgj%]rhBChri,n!rilC.rjVm<rkABJrl"fV -rlkAerm:Yqrn%/&rndY4!TN)=ir8*>kl0lHm/HGPnG`"XoD\F^p\Xa\qtU-erf[;Hs7lTjrVl`lqu6Hh -p\smco`"FYn,D\Qli-,Ijo49=i;VR3g]#e'e,I_ncMl#daSs'U_#D(I\c0&:Z2Us+X8]*tU]-tdTDk>Z -R/WBMOoCIANrFn9L]N<freCE(rdautrdFcnrd4Whrc\9_rcA'Zqf)FNphg"HqeP#&rbMCIphfnHqf)OT -rcA'\rc\9crd4WlrdFcqrdk'#reCE.reg]8rf@&@rg!JMrgWnZrh9=dri,muric=+rjDa9rkABIrkeZU -rlY5crm:Yormq)'rnRV5huM^7ir8*>kl0oImJHAOo)A:YpAXg`qYpBhr;QZirg!MNs82fmrVl`lqu6Hk -q#:$epAXaao`"C[nG_nUli-/JkPjK?iVqa6g]#h(ec*qpcMl&e`r<mT^](qG\c0&:Yl:d(X8\spU]-nb -Sc5&VQN!$GOT(:>MZ/D1L&QW'J,t1NrdXoprd+QhrcS3^rc8!WqeuINrbVRLrbDFGqe,n?rakb5ojdc+ -qd]2-ral(@qe,nBrbDFJrbVRNrbq[Qrc8!ZrcS3crd4WlrdXotrdk'&reUQ2rf6u=rfR2GrgEbVrh'1a -rh]UpriZ7)rjMg:rk8<Grkn`TrlkAerm:Yprn%8+gAp"-hu;U6ir8-?l2L#Jn,DhUnc&1[p&=[ap\t!f -qYpBhr;QZfrgWqTs8N#mrV69hq"sgbo`"I]o)A.Xmf)SPl2KlFjSn*:hYu=0f)F1udJhDib5TK]_Z%=L -]`,D>[/R</XT#0tV>d1fT)P5YQi<6KOT(:>MuJS4L&Q`(JGsutHNAJ?rd"Kerc\9_rc.pVrbh^OrbMLJ -rb21Arau.@qdf\9raPY2ojIQ%nmM6$raPk:qdf\;rau.Bqe5tDrbMLLrbh^Rrc.pZrcS3ard"KirdOis -re(3(re^W4rf6u>rfmDKrgWnYrh9=fri#gtrilC/rjVm>rkJHLrlG)]rltGirmUu"ec=;#h#?./i;Vg: -kPj`Fm/HGPnG`"XoD\C]p\Xa\qtU-ergWqTs8N#prVl`lqu6Hhp\smcoD\=Xn,D\QlMfrFj8S!9hYu:/ -g&BG!d/M>iao9<Z_Z%=L]DfA?ZMq',Xo>3sU]-nbSc5&VQN!$GO8b.<M>i8/K)U<"If=`oGQ;mfG'<k, -rc.pVrbqdQrbVRLrb;@Frb)4@qd]M3ra5Y4qd9,)pg*>npg*Z$qd9>1ra5Y4raGe9qdf\=rb2:FrbMLL -rb_XQrc%jVrcJ-_rcnEirdFcrrdt-(re^W6rf@&@rg*POrgj%\rhKIiriQ1(rj)O6rk/6FrkeZSrlP/b -rm1\odK%_pg&Bb*hYuI4jSn<@lMg/In,DkVoDA7\p\Xgdqtp<jrVQS`s.98irqlZnr;6BjqYp9hp\smc -o`"I]nc&%Wmf)MNkPjTBir7m8hYu1,ec+"rd/M8gaSs'U^](qG[f3W4YPtX&W;`UlT`1M]Rf8NMOoCF@ -MZ/D1K`6N$If=`oH2`$eFT-7[DujosrbqdPrbDFHrau.@rac";raGe5ra>_4ra,J-r`oG,r`];(oiU?X -nlYlor`];*qcs,+qd080ra5Y5raPk;ral(@rb;@IrbVRPrc%jVrcJ-_rd"KjrdOisre19+reg]9rfR2D -rgNhWrh07drhoasric=-rjMg>rkSNMrlG)^!RT0nd/MJmf)F>$hYuI4ir8'=kl0lHmf)\Snc&.Zp&=[a -p\t!fqYpBhr;QZlrgs.]s7lQfqu6Ejq#:$eo`"I]nc&%Wmf)SPkPjTBir7m8h>Z.-ec+%sci2,ea8X!U -^](kE\Gif5Y5YL$V>d7hTDkA[R/W?LOT(7=MZ/>/KDpB"IK"QlGlDgaEr0bTC]S?grbDFGrau.?raYq: -qdBD0ra#;'qcWo#pfGX=pfI>pr`T##ra#M0qdBD4raYq<rau.CrbDFKqeuISrcJ-ard+QlrdXp!re:?/ -rf$i<rfmDLrg`t[rhBCgri?%%rj)O5rk&0Erkn`U!R&XdbPoiedf.ergA]n,i;Va8jo4HBm/HDOnG_tW -oD\C]p\sseq=sj^rLX%_s8N#mrVQKkqYp9hp\smcoD\=[n,DbSm/H;Ljo4<>hu;I2g&BV&dJhJkbl5W] -_u@FM]Df8<ZMq',WrAmpT`1P^SGnfQP5^OAMuJP3L&QW%If=`oGlDjbErL%WDZ4MPC&hoJBP@BXraYq: -ra5Y4ra5Y2r`oG,r`]2%r`K/#pf7;mr_reoe5?*@r_reqqc3MoqcNi#r`];*r`o>,ra>_4raGe9rb)4E -rbDFLrbh^Src8!]rcnEirdOisre:?-repc:rf[8Grg`tZrh07fri5t$rj)O4rk&0ErkecV`W4$Xbl5oe -dJhbsgA]q-hu;X7jo4QEli->On,DkVoD\I_p\ssbqYpBerVQSis/5nrrqQHkr;QTmqYp<iq#:!dp&=U_ -nc&%Wn,DVOkPjTBiVqa6h>Z%*eGdhoc2Pf``W![P^&GVBZi73.Xo>3sU]-nbS,S`QP5^OAMuJP3K)U<" -J,X`mGQ)^`E;jeTDZ4DMB`;WC@fTs=@Uf=Dra>_3r`oG,r`];'r`8nrr`&kqqbm;gnkf<]r_W8`peLT[ -r_WSinkf<_peq)ir`&ksqc<\ur`T5)r`oG.ra>_4raGe9rau.CrbDFMrbqdTrcJ-_rd"Kmrdk'#reUQ3 -rf@&Arg3VRrh'1brhf[srilC.rjr*B!PlJN_#D=Pao9Qad/MPofDaV*hu;U6jo4KClMg8OnG_tWo`"O_ -pAXjdq>U6iqu6NjrVQSls/5nirVl`oqu6Ejq#:$ep&=U_o)A.Xmf)SPkPjTBir7m8h#?"+eGdkpcMkoa -`W!^Q^&GP@[/R</XT#0tUAgb`S,S]PP5^OAM>i;0KDpB"HiA<iFT-=[DuOYRD#S2KB)Z??A,]j9?3+A= -ra#M-r`];(r`B)"r`/qsqc!Ahr_NMiqbQu^peBR<peCNYqbR2fr_NMir_`Ynqc*Ppr`9#"r`T5(r`fA- -ra5Y4raYq=rau.ErbMLNrbqdVrcJ-brd=]pre(3)re^W8rf[8GrgWnZrhBCjri?%&rj;[8!PQ/H^&GkI -`W!sXcMl5jeGe/#h#?72ir8'=kPjiImf)_To)A7[p&=^bq#:*gqu6NdrMT[qs8N#mrVl`oqu6Hkq"sgb -o`"FYn,D\QlMfoEj8Rs8h>Z+,f)F%qc2Poc`;[UP^](bB[/R9.X8]!qUAgeaRf8WPOT(7=MuJD/Jc:/u -HiA9hFT-7YDZ4MPCAqoGB)Z9=@/aO4>l\+1>[784r`K/$r`9"ur`&kpr_`YkpeUlaqb?`Wpe0F8pe10O -r_<8bqbR2fr_`Ymr_rerr`9#"r`K/(r`oG.ra5Y5raPk=rb2:Grb_XQrc%jYrce?grdXp!re19/rf6u> -rg*PPrh'1arhoarric=.!P#W>\Gj8B_Z%LQbPofdd/MVqg&Bh,hu;X7jo4QEm/-8No)A:\p\XabqYpBk -r:p6friQ4#s8N#prVl`oqYU*fp\smco`"C[nG_nUli-/Jk5OB>hu;I2fDa;!d/M;haSs-W_#CtF\,NW2 -Xo>C#U]-qcSc4rSPQ$XBMuJJ1K)U<"I/\EjF8g4ZDuOSPC&VcEA,]s7?iF=0>Q._)<WQ6%r`/hor_iVi -r_NMir_EGer_32^r^uiTqaf4,ognsOqb$i\qb6u`r_EGhr_NDfqbmDlr`/r!r`K/(ra#D.raGe9rb)4E -rbVRPrc.pYrd"Kjrdb!"reLK2rf@&Brg*PSrh07cri?%$!O/d.Yl;-2]DfVF`;[mXc2Q)heGe)!h>Z@3 -ir8*>kl0oIn,DhUnc&1[p&=^bq>:$cr;QZlriQ4&s8N#prVl`oqtp3gq#:!do`"I]nG_kTm/H8KkPjN@ -i;VO2g&BM#dJhGjaSs0X_>_(G\,N`5Xo>=!V>d.eSGnoTOoCC?MuJG0K)U9!HN&-fFT-7YDZ4JOBDuNB -AH$!9?N+70>Q.e)=8l2";uortr_r\kqbR)`r_3;aoh+mJogdM$qa^3Joh,3Vr_3;cr_E>dr_WSkr_req -r`/r!r`T5)ra#M1ra>_9ral(ArbVROrc%jYrce?frdXp!re:?0rf6u?rg<\Srh07eri#q#XT5L&Zi7H5 -]DfYG`W!sXcMl5jeGe/#h#?72j8S3?l2L&Kmf)_ToD\F^pA=Xaq>U9jr;6HlriQ4)s8N#prVl`lqu6Ej -q#:$eo`"F\nG_nUm/H>MkPjQAi;VU4gA]_'d/M;hbPoHZ_>_1J\,N`5YPtO#V>d.eSGnlSP5^L@MZ/D1 -JGsurHiA0eF8g+WDZ4GNB`;N@@fBa6?N+4/>5hY'<rQ+u;?0Pp;,R<gr_WSir_EGdqb-o\oh#-Rqa^3H -e4&^nr^ZiVqapZWr_*,^qbI,er_NMjr_i_qr`B)$r`];*ra,S2raGe9rb2:Grbh^Rrc8!\rd4Wnrdb!' -reg]8rf[8Irg`t\rhTXpW;rpsYPtm-\,O,@_>_CPbPofdd/MYrgA]t.i;Vg:kPjfHmJcSRnG`%Yo`"Ua -q#:*gqtp<jrVQSus0Mb)rqQHhqu6Hkp\smcp&=O]nc&"Vm/H;Lkl0T@i;VX5f`'G#dJhDiaSs-W_#CtF -\,NW2XT#3uU&LY_S,SWNOoCC?LAli)J,XipGlDgaE;j_RC]7rFAH$$:@/aL3>lIk)<rQ+u;Ys>j:]O8l -:J^sbr_3;ar_!&Zr^coVog\gIqaA:gogJdJnj`UKqag]Xr_!/_r_3;dr_NMir_`Pjr`/r!r`K/)ra#M2 -raGe:rau.Frbh^SrcJ-`rd=]pre(3)rf6u>rfd>Nrgj.aT`CecWW'%!Yl;-2]DfVF`;[mXc2Q,iec+5# -hu;U6ir80@l2L&Kn,DkVo)A=]pAXg`qYpBerVQT&s0Mb)rqQHkqu6Hkq>U-fpAX^`nc&%Wmf)MNkl0`D -i;VR3g]#b&df.SlaSs0X_>_(G\,N`5Xo>9uU]-nbRf8WPOT(4<M>i,+J,XipG5cR^DuOVQC&VcEA,]p9 -?iF:/>5h\(<W5ts;uTVj:]=)h9`[s_r_3;`qapcXqa^WTogSaGYXA(OqaLBOr^ZiVr^luZr_3;cr_EGg -qb[8jr`&ksr`T5(r`fA/raGe9rb)4Frb_XQrcA'^rd=]prdt-+rf-o=rg*PP!M>taTDkVbW;`puZi7H5 -]DfYG`W!sXci2Alec+>&hYuI4k5OTDlMg5Nn,DkVo`"O_p\t!fqYpBerVQT&s0Mb)rqlZnr;QQlq>U0g -pAX^`o)A.Xmf)SPkl0]Cir7m8h#?"+df.Slbl5Q[_>_4K\,N`5YPtL"V#I"cS,S`QOoC@>M#N&+J,Xfo -GlD^^DuOVQC&V`D@fBd7?N+4/=oMP&<rQ"r;>sAj;#X5h:&[fd9*%[Yr_!&Zr^cfRpdP0Mj$V<_ksP>9 -pdOsIqag]Xr_!/_r_3;cr_EGhr_NMjr_i_rr`B)%r`oG.ra>_7rau.Drb_XQrc.p^rd4Wore(3+rf-o> -rg!SSRfJrWTDkYcW;a""Zi7H5^])+L`;\![ci2Alg&Be+i;Va8k5OTDm/HDOnG`"Xp&=[aq#:*gqYU3i -rVQT&s1/1/rqQHkr;QTmq>U0gp\sgao)%qUm/H8Kjo4<>hu;C0fDa7ud/M5fa8WmR]`,G?Yl:d(WrA^k -T)P5YPQ$[CN;eM0Jc:/uGlDjbEW0nUCAqlFA,]p9?iF=0>5hY'<W5ts;Z9Ml:]=,g9`@]a9)_B^8-)7P -r^Z`QqaLKPksM[AlpLY<r^HTOr^ZrYr^m)]r_*5ar_EGgr_WSlr_rerr`K/'r`oG0raGe9rb)4GrbqdU -rcS3brdXp!re190rf7)DP5pgGS,T#YU&M(kXo>R(\Gj/?_#DCRbPolfe,Itug]$+0ir8'=l2L&HnG`%Y -o`"Uaq#:*gqu6NjrVQT)s1/1/rqlZnr;6Bjq#:$epAX[_o)A+WmJcDMkl0WAi;VR3fDa;!d/M8gaSs*V -^&GP@Zi7-,WrAjoTDk;YQ2ZmEN;eY4Jc:,tHN&$cEW0nUCAqlFAH$$:?iF=0=oMM%<W5qr;Ys8h:&[ic -9)_EZ8,u0X8,,OP7,pY=6Kpl77/04M8,,XS8cD?]9`@c`:]=5j;uTer=8lA%>lJ(/@K'g:BDuZFDuOeV -FT-UcIK"fsM#N;5OH9I(rg!JOrh'1dri,n"rj2U6rk8<Krl>#^rm:Yorn%/*ro!e9roj@HrpB^Rrpg!Z -rq??crqQKiqu$Hlqu4/+\c;[.qu-EhrqcWgrq??arpp'XrpKdOrosFEro!e3rnIG&rmLelrlG)WrkJHD -rjDa/ri?$prh07[rg*PGrf$i3rdt-!rd+Qfrc%jSrbVRHrabn5r`oG+r`9"tr_`Ykr_NMgr_3;ar_!/] -r^d#YrC6]SqaLKPmmE@,mmHt?r^HTOr^ZrYr^m)]r_*5aqbI,er_`Yor`9#%r`o>-raYq?rbVROrc%j\ -rd4Wordt-)!K;s;N;et=QN!BQT`1hfX8]=%[/RZ9^])1NaSsNbdf.erg]$(/i;Vm<kl0oImf)_To)A=] -pAXg`qYpBkrVQT)s1JC2rqlZnr;QQlq>U0gpAX^`oD\7YmJcGNkPjTBiVq^5gA]\&d/M8gao90V^AbbD -Zi70-X8\mnT`1J\PQ$[CNW+V1Jc:/uGQ)^`E;j_RC&V`D@K'X5?2dt*<rQ+u;Z9Pj:]=&e9D_<[8GG[Q -70,hGr^?3BK0o#oqaCEPpdY-Or^m)^r_<8cr_`Ymr`/r!r`K/*ra5Y5rau.Drb_XRrcJ-`rdXp!!JH++ -K`6u1OT(ICSGo/[U].=nYPtm-]DfSE_Z%[Vc2Q)hf)FA%hYuL5jSn?Ali->OnG`%Yp&=[aq#:*gqYU3i -rVQT/s1eU5rqlZnr;QTmq>U0gp\sjbo`"C[n,D\QlMfrFj8Rs8g]#h(e,IYlb5TE[_#CtF\,NW2X8]$r -T`1J\R/W3HN;eY4Jc:,tHN&$cEW0kTB`;TB@fBd7?2e%,<rQ+u<;o_n:]=,g9`@]a9)_BY8,,OP6i]U> -6c_Uh6,c1W6i0:H7K,gS8H)6\9E%Wa:B"&g;#XGn<W6%u>5he+@/aX7B)ZKCDZ4YTFT-UcI0"nM!.k-* -rf$i<rg<\Trh07griH+'rjVm=rkSNQrlY5crmUkurnIG0ro="?rp'LLrpTjVrq$-^rqHEerqZQjrquZl -rr0\4^]4<4qu-Nlrql]jrqQKerq-3\rpTjSrp0RIroF(;rnm_.rmh"prlkA^rkeZJrjVm4riQ0trhBC_ -rg3VIrf6u7re(3"rd+Qfrc%jRrbMLEraYq7ra#M,r`K/"r_r\jr_EGdr_!&Zqa^WTqaLKPrBp0D^I%oc -q`t-H^I%BVqaCEPqaUQTr^luZr_3;cqb[8jr`/r"r`];,ra5Y6ral(Erbh^Srce?g!IoS!J,Y*"M#NG6 -P5^jJSc5A_W;`puZMqB5^&GnJa8X<^d/MSpg&Bn.ir8$<kl0lHmf)\So)A:\p\sseq>U9jr;6HlrkJKM -s8N#prVl`oqu6Hkq#:!dp&=O]nG_nUli-,Ijo43;h>Z.-eGdkpci1r`_Z%=L[f3T3YPtEuUAgeaQN!'H -NrFe4K)U9!GlDgaE;j_RB`;TB@K'X5>lIk)<rQ(t;>sDk:]=&e9E%Q_8GbpV7f,XR7/'(B6c_UM5fH(\ -6i0:N7JfRR8,GjV9)_K_9`@ie;#X>k<;oqt=T2S)?N+C4Ac?ECD>nMRFTH`3!-nKmre(3)rf6u@rg*PU -rhKIiric=-rjMg@rkn`Trm1Slrm^r$rn[S3roO.Crp0RPrpg!Yrq69brqQKhrql]mrr)`n_Z.LQq#13h -rqcWirqHEcrq69\rpTjRrp'LGro="8rnIG)rmLekrlb;YrkJHErj2U-ri5slrgs+Xrf[8@reg]-rdXoo -rcS3\rbqdMrau.=ra5Y0r`];%r`&kpr_WShr_<AaqapQQqaLKPoL&=>d6dUoh*Ca$c9gkbqaCEPpdb<T -qb$i^r_NMir_i_pr`9#%r`oG0raPk=rb;@Mrc/$^FT?R`HiANoKDpc-NrG4@Rf8oXUAh1lY5Yd,]DfSE -_u@jYci2Alf`'Y)hu;[8kPjcGmJcSRnc&4\pAXgcq>U6iqtU-,s2+g2rVl]nqYp<ip\smcoD\7Ymf)SP -kl0ZBi;VR3g&BP$d/M8ga8WmR]`,G?Yl:^&VZ*7fS,S`QOT(1;LAl`&I/\BiEW0nUD#S&GA,]j7>lIq+ -=T2;!;>sAj:B!ue9`%E\8GG[R7.*DC6USp]b<X$5njE:BpdY-Or^m)_r_<Aer_NMkr`&l!r`T5*ra5Y7 -rau.Grb_aVE<("XGlE'hJGt<&MuJh;QN!BQT`1hfX8]@&\Gj/?_#DCRbPolfec+8$h>Z@3jo4KCm/HDO -nG`%Yp&=^bq>U6iqtU-,s2G$;rqlZnr;QQlq#:$ep&=R[nG_eRl2KfDj8Rs8gA]\&dJhDia8WsT^&GM? -ZMps)VZ*7fRf8TOOT(.:L&QW%I/\?hEW0nUCAqlF@K'X5?2dt*<rQ(t;#=&f9E%Q_8cD9[8,c!T7K,^G -6i'-q6FfA#6M3_C7/fXS7fGpW8H)3[9)_K_:]!uf<;oqt=T2V*?iFL5BDuZIDf5Vorc.p\rd=]qre:?/ -rfI,ErgNhZrhf[rrj)O5rk8<JrlG)`rmC_qrn@A/ro3q=rosFKqsaUVrq69brqZQiqu$Hlqu4\:aT)8= -qu-Nlrql]jrqQKerq-3\rpTjRrp'LHroF(:rn[S*rm^qnrlY5ZrkSNErjDa/ri#gkrh'1Urf[8@reCE( -rdOijrcA'WrbDFFraYq8ra#M,r`9"tr_`Ykr_EGdr_!/]r^d#Yr^QcRr^?3BqEih$pd)GUpd*1lnjECE -qaLKRr^ZrYr^m)]r_3;cr_WSkr`&ktr`];+ra>_8rau7HC&i#JDuOhWGQ*'jK)UN(NrG4@QN!NUU].4k -YPtp.])KME`W"$Zci2DmfDaV*iVqp;kl0lHmJcSRo)A:\p\sseq>U9jr;6HlrlG,\s8N#prVl`oqu6Ej -q#:!doD\:Zn,DYPl2KlFiVq^5g]#_%dJhGj`r<jS^AbS?Z2Um)U]-qcSGn]NNrFt9K)U5uHiA*cE;j_R -BDuH@?iFC2>Q.b(<;oem:]=&e9E%N^8H)-Y7f,XR7.N_;6J+W&5g)Le6i0:N7JfRR8,c'Y8cDB^:&@`c -;Z9Yp=T2M'?N+=2@f^4T!,):Jrc%jXrd4Wordt--rf@&Arg`t[rhKIprj)O3rkABKrl4r_rmC_prnIG/ -ro*k>rosFJrpTjVrq$-_rqHEfrql]mqu-NnaT'H`rr2fnrqucmrqcWgrq??`rpg!WrpKdLroX4?ro!e1 -rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJraYq9ra5Y,r`9"ur_`Ykr_NMd -r_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5dr_WSkr`/r!r`K/,ra>h;@fU$< -C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYrg]$.1j8S3?kl1#Ln,DkVo`"O_ -p\t$gqu6NmrVQT;s3(HArqlZnqu6Hkq>U-fp&=R^nG_kTm/H2Ijo46<h>Z(+eGdenb5TE[_#CtF[Jm?. -WW&[lSc4uTP5^F>L]2o)I/\?hErKtUCAqlF@K'X5>lIe'<W5ts;#X5h:&[ca8cD9[8,c!T7K,^D6h*M+ -6N0935lO(!6LmMC7/KFP7fGpW8H)3[9)_Qa:]=2i<;ons<rQA'?3+JC!+Gk>rbDFMrc8!^rd=]sreLK3 -rf[8Jrgj%`ri#h!rjDa:rkSNQrlb;erm^r#rn[S4roF(Arp9XPrp]pYrq69brqZQirql]nqu4e=bQ%S@ -qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXol -rcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Acr^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQT -r^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtL -ao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[aq>U6iqu6Qkrlb>es8N#prVl`oqYp9hp\sjboD\7Yn,DYP -kl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1YDZ48IA,]j7>lIn*<rQ"r -;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^:&[rf;>sJm<rQ2%>[.86 -ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUkurndY4ro="Arp0RPrp]pY -rq69brqZQiqu$Hlqu5"CcN!nCrr)iorql]jrqQKerq69^rpTjRrosFFro3q7rnRM'rmLekrl4rRrk8<= -rilC&rhKIargEbJrf-o6rdk&srcnE^rbh^Nrac":ra,S-r`B(ur_WSir_EGcr_!/]r^ZrWqaLKPmmH;* -o0S!nnNb\mnjECEqaLKRr^ZrZr_!/_r_EGgr_WSnr`9,(=o_b*?N+C4AH$BDDZ4YTGlE*iJc:N*NW,(> -RJrfWU].=nYl;'0^&GnJ`r=9_dJh\qh#?41ir8-?lMg2Mn,DnWp&=^bq#:*gqu6NmrVQTAs3CZDrr2lq -r;QTmq>U0gp\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pb -E;j\QB`;H>?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N` -:&[ug;Z9\t=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A, -ro!e;roj@IrpTjWrq-3arqQKgrql]mrr)`ndJqVorr2fnrquclrqQKdrq69\rp]pTrosFEro3q7rn@A' -rm:YgrlG)Srk&0;ric=#rhKI`rg3VHreg]/rdauorcS3ZrbMLGraYq8r`oG*r`/qrr_NMgr_3;`r^m)[ -r^QcRr^?<Ei'IE0!C9#&5hSF%6/=m#6i0:N7K,dU8,c*Z9)_K_:B"&g;?9ct!*0#$r`oG1raYq?rbMLP -rcS3drdb!%reg];rg3VTrhKIlric=/rk&0FrlG)_rm:YrrnIG0ro3q>rosFMrpTjVrq69brqQKhrqlTk -rr1=FdJs4Fqu-NlrqcWgrq??arpg!Vrp9XJroO.<rn[S+rm^qnrlY5ZrkABBrj2U*rhf[frgNhNrf@&6 -re(3"rce?_rbqdLral(;ra#M,r`K/!r_`Yjr_3;`r^m)[r^ZrWr^HfSmmH,%rBUHM6%M;P5lO(-6LmMC -7/fXS7fGpW8H)3[9E%Wa:]=5m<)`isr`K/'ra#M3ral(BrbqdWrce?kre(3*rf@&CrgNhZrhf[rrj2U6 -rkABNrlY5drm^r#rn[S4roO.Crp9XPrpg!\rq??crqcWkqu-NndJq_rrr2fnrqucmrqcWgrq??_rp]pS -rp0RHroF(9rnIG'rmLejrlG)Vrk/6=rilC%rhTOcrg*PGrf-o1rdauqrcS3[rb_XIrac"8r`oG*r`9"q -r_WShr_*5_r^luWr^QlTnjD5"rBPp!d6QMSogAUEqaUQTr^m)]r_*5cr_EPl;#jJm<rQ5#>lJ+0A,^-? -D>nPSFoHdfJGt6$NW,+?QN!NUV#ICnYl;*1]`,hJaSsH`df.ktg]$+0j8S6@li-;NnG`%Yp&=^bqYpBk -r;QZlrm^tts8N#prVl]nqYp<ipAX^`nc&%Wm/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQL -NW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO -7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8rbDFLrc%j]rd=]qre^W6rfR2Lrh07driZ7+rjVmArl"fX -rm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQirql]nqu5+FeGoOIqu-NkrqcWhrq69^rp]pTrp0RJro="9 -rn[S)rmLekrl4rSrkAB=ric=%rhBC_rg<\Hrepc1rdXonrcS3YrbMLHraPk6r`oG'r`&kor_NMer_*5^ -r^d#YpdOa@j$NW/qETTsb<Z%mi'R*(pdP0Pr^d#[r_*5b!DcJk:]=5j<;oqt>lJ+0@fC'?C]88OFoH^d -J,Y3%MuJh;R/W]VUAh4mYl;$/^Ac"K`r=9_df.hsh>Z@3j8S<Bli->OnG`%Yp&=acq>U9jrVQTDs4%)J -rr2lqr;QQlq#:$eo`"F\n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"Kj -F8g(VCAqfD@/aI2>5hP$;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha -:/1dar_NMkr`/r$r`oG1ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5 -roj@HrpB^Rrpp'\rqHEfrqcWlrr)iqeGn%uqu-NlrqcWhrqHEarpp'Wrp9XJroO.;rnRM+rmC_jrlY5W -rk8<?rilC%rhTObrg<\Ireg]/rdXomrcJ-XrbMLFraPk6r`fA(r_reor_NMfr_!/]qa^WTr^?EHi'RE/ -nN_Xj`BaDgh*V!+qaC<Nr^ZrZr_!8d9`Roe:]=5j;uTnu>Q/"/@fC$>C]88OFT-RbJ,Y-#MZ/b;Qi<TU -V#ICnYl;-2^&GnJb5TZbdJhhuh>Z@3jo4KCm/HJQo)A:\p\t!fqYU3irRCkss8Murr;QTmq>U0gpAX[_ -nc&"VlMfuGj8Rs8g]#k)d/M8gaSs!S]Df5;Xo>6tUAgV\Q2ZjDM#N&+If=NiErKtUB`;TB@K'R3=oMJ$ -;Z9Ml:B!oc9)_E]8,c!W7Iih+6Mj(=5_22;5lO(-6M3_F7K,dU8,c*Z8c_RX!)*;dr_WSlr`9#$ra#M3 -ral(Brbh^Urc\9irdt-*rf@&CrgNh\ri#gurjDa;rkSNSrlkAgrn.5)rnm_8roa:GrpTjVrq$-_rqHEf -rql]mrr(@HfDkjLrr)iorql]jrqHEbrpp'XrpKdMroX4>rndY.rmh"orlY5[rkJHCrj2U)rh]Udrg<\K -rf6u3rdk&rrcJ-Yrb_XHraPk6r`];&r`/qor_EGer_!/]r^d#Xr^HfSnjDG(lTg"d^Hg^DogA^Hr^HfU -r^d#[!D5ra9)_Qa:]=2i<W6,">5hn.A,^*>D>nPSFT-[eJGt9%NrG4@R/W`WV>dOpZi7N7^])7PbPoie -ec+8$hYuO6k5OWEmf)_To)A=]p\t!fqu6NmrVQTJs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2 -fDa4tbl5Z^_Z%1H[JmB/W;`RkT)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U -7K,^M6fUN460LRb5eKA]6/t<,6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcs -reg]8rfd>QrhBCjric=/rk&0Hrl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfn,rr2fn -rquclrqHEcrq-3ZrpB^NroX4?rnm_0rmq(rrlb;\rk\TErj2U,rh]UergWnMrf-o5rdauprce?\rbVRI -raPk6r`oG'r`&kor_NMer_*5^r^d#Xr^HfSog@k.qa'F2JO$b2r^#[5ogA^Hr^HfUr^Qu\8H;?]9E%Zb -:]=5j<;oqt>lJ+0@fC'?D#SDQGQ*!hJGtB(NW,+?S,T)[V>dXsZi7N7_>_IRbPoogf)FG'hu;[8k5O]G -mf)_To`"O_p\t$gqtp?krn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49=hu;=.ec*nob5T?Y^](_A -ZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\8,c!W7.iq-6K17]5dir9 -6Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1rfI,Hrgs+`riQ1*rjVmA -rl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOgAh0Orr)inrqcWirq??`rpg!Vrp0RJ -ro="9rn[S)rmLelrl4rSrkAB<ric=$rh07[rg!JDreUQ*rd=]hrc.pRrb2:@ra>_1r`K/!r_i_kr_<Aa -r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_*5br_NMkr`&l!r`fA0raYq?rbVRRrc\9grdt-+rf@&D -rgWn[ri5t#rj2U<rkeZSrm1Smrmq))ro!e9rosFKrpTjVrq-3`rqZQirql]nrr1XOgAh0Orr)inrqcWi -rq69^rp]pTrp0RIro="9rnRM&rm:Yhrl"fOrk/69riQ0trh'1Xrfd>?reLK(rd4Werc%jPrau.=ra,S- -r`B(tr_`Yjr_*5_r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_!/_r_NMjr_retr`];-raPk>rbMLP -rc\9frdk''rf$i?rgEbXrhoatrj)O9rkSNOrltGirm^r&rnm_8roj@HrpKdTrq$-^rqZQirql]nrr1XO -h>dKRqu-NkrqcWhrq69^rp]pTrp'LGro*k5rnIG$rm:Ygrkn`Mrji$4ri?$prgj%Trf[8<re19#rcnE` -rbqdLral(;ra#M+r`B(sr_WShr_*5_r^d#Xr^HfSpd<k(i]r&[[QrY8pd>$Kr^?iW7K>pW8H)3[9E%]c -;#XAl=8lD&?2e:3Ac?BBDuOkXGlE3lK`6l.P5^jJSc5JbWrB7%\c0>B_u@mZci2Dmg]$(/iVr$>lMg5N -nG`%Yp&=acq>U9jrVQTMs5!_SrqlZnqYp9hp\sgao)A+Wm/H5Jjo43;h#?"+df.Pkb5T6V]`,A=YPtL" -UAgV\Q2ZjDL]2o)If=KhErKtUB)Z<>?iF:/=8l5!;#X5h9`@W_8H)-Y7K,^J6fp_g5_22&5itE+6iKIS -77@2Fr^ZrYr^m)_r_EGhr`/r"r`fA/raYq>rbh^TrcS3hrdt-)rf@&CrgNh\ri,n#rjMg=rk\TVrm(Mk -rn7;,ro!e;roj@JrpTjWrq-3arqZQirr)`nh>c=2rr2fnrqcWhrqHE`rpg!Vrp0RIroF(:rnRM*rmC_i -rlP/Trk&0;riQ0trh9=Zrfd>Are:?&rd=]erc%jQral(<ra5Y-r`B(tr_WShr_3;_r^d#Yr^HfSog@k. -fg(*RX[)#8ogA^H!C]EW7K,gV8H)3[9`@cc;#XDm<rQ8$?iFO6Ac?NFE;jtYI/\ZqL&R,3PQ%!LU&Lth -Xo>a-]DfVFao9QadJhetg]$.1jSnBBli-APnc&.Zp\t!fqYpHjrn[V1s8N#srVl`oqYp9hp\sd`nc%tU -lMfuGj8Rs8gA]\&d/M8ga8WmR])K)9X8\poTDk/UOoC@>K`6K#HiA'bDZ4GNAH$$:?N+(+<W5nq;#X5h -9`@W_8H)*X7.iq-6J4VT5cm<06Mj.J6i]XS7fGpW8cDE_:&[ug;Z9_r=T2Y+@K'g:C]88OErLFbJGt6$ -NW,+?QN!NUV>dOp[/RZ9_#DCRbPolff)FG'hu;[8kPjcGmf)_ToD\L`q>U6ir;QZorn[V1s82cor;QNk -q#:!do)A.Xmf)GLjo46<h>Z(+eGdhob5T?Y^&GM?Z2Ua%U]-nbPQ$XBMZ/2+IK"KjE;j\QC&VT@?iF=0 -=8l5!;>sAj9`@Z`8H)-Y7fGgK6fUMd5_22&5i>!+6i9=P7/f[T8,c'Y9)_N`:]=5j<;otu>lJ+0@fC*@ -D>nMRGlE*iJc:Q+NrG7ATDkYcWW'1%\,O)?`;[pYd/MPog&Bh,iVqs<kl1#LnG`"XpAXgcq>:*hrS@M0 -s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3f`'A!cMkrb_u@=J[f3N1VuEChSGn]NNW+b5JGsopG5cI[ -D#S,I@K'U4>Q.\&;uTVm:B!oc8cD6Z7fGjI6gR/76.nMS5cm<H60U`06NBLQ7K,dU8,c*Z9E%]c;#XGn -<rQ>&?N+C4B`;fHE;k%[I/\ZqM#ND5P5_!NU&LthYl;*1]`,hJaSsKae,Ituh#?:3jo4KCmJcSRnc&4\ -p\t!fqu6NmrS@M0s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3fDa4tc2Pc__Z%1H[/R9.V>d.eS,SNK -MuJJ1J,XcnFoH=YCAqlF@/aI2>Q.Y%;uTSl:&[ca8cD6Z7fGjO6fp_^5_21r5itE/6NBLQ7K,dU8,c*Z -9E%Zb:]=8k<W65%?N+@3BDu]GDuOnYHN&EnLAm/2OT(aKT`1eeYPts/]Df\HaSsH`df.kth#?:3jo4KC -mJcSRnc&4\p\t!fqu6NmrS@M0s8Murr;QTmq#:!do`"C[mf)POk5OE?hu;@/f)F(rbPoK[_#CnDZi7-, -U]-kaRJr<IMZ/;.IK"KjF8g%UB`;QA@/aF1=oMD";Z9Jk:&[ca8cD3Y7K,^M6fp_^5_21r5itE/6NBLQ -7/fXS7fH!Y9E%Zb:]=8k<;p&">lJ.1AH$<BD>nVUGlE-jK`6o/OT([IT)PMaY5Yd,\c0DD`r=0\dJh\q -gA^"/j8S3?li->Onc&1[pAXjdqu6NmrS@M0s8Murr;QTmp\smco`"C[mf)POjo49=hu;=.ec*qpb5TBZ -^](bBZMps)UAg__Qi<'FM>i/,I/\?hErKnSB`;QA?iF:/=oMA!;>sAj9E%Q_8cD3Y7K,^M6fp_^5_21r -5itE/6NBLQ7/fXS7fH!Y9)_K_:]=5j;uTr!>lJ+0AH$9AD#SJSGQ*!hKDp`,O8bLFSc5A_XT#L(\Gj8B -`;[pYd/MSpg&Bn.ir8'=li->Onc&1[p&=^bqu6NmrS@M3s8N#srVl`oqYp6gpAX[_nG_hSli-#Fir7j7 -f`'A!ci2#b_u@FM[f3N1X8\dkS,S]PNrFk6K)U,rG5cL\C]7uGA,]j7>Q.b(;uTYn:]=#d9)_B\7fGjU -7/K@36I7uK5bp['630G@!(6`Rr^HfUr^d#[r_*5dr_`Ynr`K/(ra5Y7rb)4Grc.p\rd4WrreUQ6rg!JP -rh07kriuI2rkJHNrlG)brm^r"rnm_7roO.FrpB^Srq$-^rqHEgrql]nqu5XUi;`fUrr)iorqcWgrq69^ -rp]pSrp'LDro*k5rmq(trm1Sbrkn`Lrj;[.ri5sjrgNhNrepc0rdaunrcJ-XrbDFEraGe3r`T5%r_i_l -r_EGbr^d#Yr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,gV8cD?]:B")h;Z9bs>5hh,@K'j;CAr/N -FT-RbJGt<&MuJt?S,T)[WrB4$[/Rf=_Z%XUci2Dmf)FP*iVqp;lMg2MnG`%Yp&=^bqYpBkrVQTSs5<qV -rr2lqr;QQlp\sjbo)A.Xm/H8Kj8S!9h>Z")df.Sl`r<gR^&GA;Y5YC!TDk8XPQ$I=L&QW%GlDd`DuOJM -Ac?*:>lIn*<rPtq:]=)f8cD9[8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^d#[r_<Afr_`Yq -r`K/)ra>_:rb;@MrcA'`rdb!%reg]=rgEbXri#h!rj2U;rkeZSrm1Smrmq))ro!e9rosFKrp]pXrq69b -rqcWkrr)`nj8\';rr2oprql]krqHEbrpp'Wrp0RJro="9rnRM(rmLekrl+lQrk/6:riZ6urgs+Vrf[8< -re19#rce?_rbqdLrac"9r`oG)r`/qpr_NMfr^m)[r^QlUr^?NKksGA8bs6hFTg8TCk!B)96iBCO7/fXS -7fGpW8cDH`:]=5j<W6,">lJ.1Ac?BBDuOhWGQ**kK`6l.P5^jJT)PYeXo>[+]`,_G`W"0^df.hsh#?41 -j8S<Bm/HJQo)A=]p\t$gqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1eGdhoc2PZ\^](kE -Z2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X7/K@66H;?B5at%%63'@O -6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5JbX8]C']DfVF`;\$\dJhYp -h#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I_nbl5NZ -^](kEZ2Ug'V#Hn`QN!!FM#N#*IK"BgEW0hSBDuE??iF4-=8l1u;#X5h9`@W_8H)*X7/K@66H;?B5at%% -63'@O6i0:N7fGpW8cDE_:&[ug<;otu=oMe-A,^-?D>nPSFoHggK)UT*OT(RFSGo>`X8]C']DfSE_u@mZ -ci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5 -gA]S#ci2,e_Z%7J\c/i4WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ -6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-N -U].:mYl;34^Ac"KbPoiee,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl]nqYp<ip&=R^ -nG_hSl2KlFiVq[4g&BJ"ci2,e_Z%7J\Gi`3WW&XkRf8QNNrFb3JGsopF8g+WC]7oE@fB^5=T2>";Z9Ml -:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?KEDuOhWHiAQp -L&R,3PQ%$MUAh.kYl;03^Ac"KbPoiee,J&"h>ZC4kPjcGmJcVSoD\F^q>U6iqu6Qnro=%=s8N#srVl]n -qYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtUC]7lD@K'U4 -=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4AH$BD -DuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6iqu6Qnro=%= -s8N#srVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtU -CAqcC@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3 -AH$?CDZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qn -ro=%=s8N#srVl]nqYp9hp&=R^nG_eRkl0ZBi;VO2g&BCuc2Pia_>_+H[f3H/VuE@gR/W9JNW+S0J,Xfo -ErKtUCAq`B@/aI2=8l5!;>sAj9`@]a8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9E%Zb:]=5j<;otu -?2e72A,^6BDZ4\UHiANoKDpl0P5^jJT`1kgY5Ym/]`,bHao9QadJhhuh#?72jSnBBm/HMRoD\F^q#:*g -qu6Qnro=%=s8N#srVl]nqYp9ho`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/ -J,XcnErKtUCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j -<;otu?2e72A,^6BDZ4\UHN&BmKDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C] -q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-H -N;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N` -:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQ -o)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pf`_#CtF[Jm<-VZ*7f -Qi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6Mj'_5_21`5lO(@63'@I6iKOR -7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEaSsH`dJhhuh#?72 -jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@tbl5Z^_#CtF -[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_5_21]5lO(C -63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEa8X<^ -d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@t -bl5Z^_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_ -5_21]5lO(C63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a- -])KMEa8X<^d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZB -i;VO2g&B@tbl5]__#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W -7JK7C6Mj'_5_21`5lO(@63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^H -T`1kgXo>a-]DfVFaSsE_d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\ -n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj -9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`. -OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9h -o`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/J,XcnErKtUCAq`B@/aI2=8l5! -;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BDZ4\UHN&Bm -KDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C]q#:*gqu6Qnro=%=s8N#srVl]n -qYp9ho`"F\nG_eRl2KiEi;VO2g&BCucMkuc_#CtF[Jm?.W;`LiQi<-HN;eM0J,XcnErKtUCAqcC@/aI2 -=T2>";>sAj9`@Z`8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9)_N`:]=5j<W6,"?2e:3AH$?CDZ4\U -HN&EnK`6r0OoC^HU&LthY5Yj.]DfVFb5TZbdJhhuh>Z@3k5OTDm/HMRoD\C]q#:*gqu6Qnro=%=s8N#s -rVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtUCAqcC -@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3AH$?C -DZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qnro=%= -s8N#srVl]nqYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtU -C]7lD@K'U4=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5# -?N+C4AH$BDDuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6i -qu6Qnro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KiEi;VR3gA]P"cMkuc_Z%7J\,NT1WW&[lRJrELNrF_2 -JGsrqErL"VD#RuE@K'U4=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y -9E%Zb;#XAl<rQ5#?N+C4AH$EEDuOeVI/\ZqK`7#2PQ%!LU].7lYPu$1^&GnJb5T]cdf.u"h>Z@3k5OWE -mJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5gA]S#ci2,e_Z%7J\c/i4 -WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u= -6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-NU].:mYl;34^Ac"KbPoie -e,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1 -eGdhobl5Q[^](hDYl:^&V>d"aQMusEL]2o)If=KhErKtUB)Z<>?iF:/=8l1u;#X5h9`@W_8H)*X7/K@6 -6H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<;otu>Q/"/A,^*>DZ4YTFoHjhK)UQ)O8bFDSGoAaX8]@& -])KJD`;\![d/MPoh#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@ -hu;F1eGdhoc2PZ\^](kEZ2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X -7/K@66H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5Jb -X8]C']DfVF`;\$\dJhYph#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp6gp&=O]n,DYP -l2K`Bi;VO2f)F+scMkf^_>_+HZi7-,VuE:eR/W9JMZ/;.J,XZkF8g+WB`;QA@/aF1=T2>";>sAj:&[`` -8H)*X7K,^M6g6r:6-VZG5bUIB60:K76UUf>r^?`Sr^QlWr^m)`r_NMjr`/r"r`oG1ral(BrbqdWrce?k -re19.rf[8Jrgs+eriQ1+rk/6Grl+l^rmLesrnRM1ro="Brp9XQrpp']rqHEgrql]mqu5XUi;`fUrqucm -rqcWgrq69]rpTjQrp'LDro!e3rmq(srm(M_rk\TIrj;[-ri#ggrgEbLrepc0rdXomrcJ-Xrb;@CraGe3 -r`T5$r_i_lr_EGbr^d#Xr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,dU8H)6\:B")h;Z9_r=oM_+ -@K'j;C&W&MFT-RbJ,Y0$MuJq>RJriXW;a""[/Rc<_Z%RScMl8kf)FM)iVqp;lMg/Ln,DnWp&=^bqYpBk -r;6KRs5<qVrr2lqr;QQlp\sjboD\7YmJcDMjSn-;hYu+*e,I\maSs*V^AbM=YPtR$T`1DZPl?U?L&QW% -H2_pbDuOMNB)Z6<?2e"+=8l+s;#X5h9)_B\8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^m)] -r_EGhr_i_sr`];,raGe;rbDFNrcJ-brdb!&repc?rgWn[ri5t$rj;[=rkeZUrm1Smrmq)*ro*k;rp'LM -rp]pYrq69brqcWkrr)`nj8\';rr2oqrquclrqHEcrq$-YrpB^NroO.=rnm_-rmUkmrlG)VrkJH@rilC& -rh07[rg!JCreUQ*rd4Wfrc.pQrb)4?ra5Y/r`K.ur_`Yjr_*5_r^d#Xr^HfSqa9C1cp3.IUd3j)!CK3S -6iKLQ7K,dU8H)3[9E%`d;>sMn=T2P(?iFR7BDu]GEW1.\HiAWrM#NG6Q2[9PT`2"kZ2V32^])1NaSsNb -eGe,"hu;X7jo4TFmJcVSoD\F^p\t$gqu6Qkro=%:s8N#srVl`oqYp9hpAX^`nG_hSli-&Gj8Rs8g&BM# -d/M2e`W!XO\Gif5XT"snSGniRO8b"8KDp8tGQ)X^D#S,IA,]j7>Q.b(<;obo:]=&e9)_B\7fGjU7/K@3 -6I7uK5bp['630G@!(6`Rr^HfUr^d#\r_3;er_i_pr`K/(ra5Y7rb)4Hrc8!^rd=]tre^W8rg*PSrhBCn -riuI4rkJHNrlY5ermh#$rnm_8roX4GrpKdTrq-3`rqQKhrql]nqu5XUh>dKQrqucmrqQKdrq-3[rpKdO -roX4?rnm_/rmq(rrlb;[rkSNDrj2U,rhKIargEbIreg].rdFcjrcA'Urb2:Ara>_1r`T5"r_i_kr_<Aa -r^m)Yr^HfSpd=11cp3.IUd4'/q*P-Lr^?`Sr^QlYr_*5br_NMkr`&l"r`oG1rac"Brb_XUrcnEjre19/ -rfI,Irgs+ariZ7,rji$Drl4r\rmC_qrn@A/ro="?rp0ROrpg![rq??drql]mrr([Qh>dKQrqucmrqZQf -rq69\rpTjRroj@Cro*k3rn%.trltG_rkeZHrj;[.rh]UergWnKrepc1rdXonrcS3YrbDFFra>_2r`fA% -r_relr_<Aar^m)Zr^QlUpd=11cp3.IUd4'/q*P-Lr^HfUr^ZrZr_*5br_NMkr`/r%ra,S3rb)4GrbqdY -rd+QnreCE2rfI,Krh07eric=/rk&0HrlG)`rmLetrnRM3roO.CrpB^Rrpg!\rqHEfrql]mrr([Qh>dBN -rquckrqQKdrpp'XrpKdLroO.<rn[S+rmUklrlP/Wrk/6=rilC#rhBC_rf[8?reUQ(rd4Wfrc%jQrb2:? -ra5Y0r`9"tr_`Yir_3;`r^d#Yr^QlTqa9L4pd*RuJO$>&pd+%/r^6TO!(?fUr^ZrYr_!/_r_EGir`&kt -r`oG0raPk?rbMLPrc\9frdb!(rf6u@rgj%_ri#h#rjMg=rkn`Vrm(Mlrn.5+ro*k<roj@Lrp]pXrq??c -rqZHhrr([Qh>dBNrquckrqQKdrpp'XrpKdLroO.<rn[S+rm^qorlY5Yrk8<?riuI%rhKIbrfd>Breg]+ -rdFcjrc%jQrb;@@ra5Y0r`B)!r_`Yjr_3;`r^d#Yr^QlTog@b+fg(*RX[(f2qa:9L!(?fUr^ZrYr_!/` -r_NMjr`&kur`oG0raPk@rb_XRrcnEirdk'+rf6uArh'1cri,n%rjVm?rl"fYrm:Yorn7;,ro*k<roj@L -rp]pXrq??crqZHhrr([Qh>dKRrr)iorqcWhrqHE`rpg!Urp'LGro="8rn@A&rm:Ygrl>#Rrjr*9ri?$o -rh'1UrfR2>re19#rd4Wbrbh^Nrac":ra,S+r`/qqr_WShr_3;_r^d#Xr^?EHj$MEaJO$>&i'R<.r'UNQ -r^QlWr^m)_r_<Agr_i_rr`K/+raGe:rbMLOrc8!brdb!$rf-o?rg*PUrh]Uprj;[9rkSNRrlb;frmq)' -rnm_8roa:GrpKdTrq$-`rqZQirqucorr1aRh>dKRrr)iorqcWhrqHEarpg!Vrp'LGro="8rnIG)rmC_i -rlP/Trk&0;riH*rrh07Xrfd>Bre:?&rd=]drc%jQral(<ra5Y-r`B(ur_WShr_3;_r^d#Xr^?EHj$MEa -JO$>&i'R<.r'UNQr^QlWr^m)_r_EGhr`&ktr`T5-raPk<rbVRPrcA'drdb!%rf@&Brg<\Xrhf[rrjDa; -rkSNTrltGirn.5)rnm_8roa:GrpTjWrq-3arqZQirqucorr1aRh>dKRqu-NjrqQKerq-3\rpTjQroj@C -ro!e2rn7;!rm(Mcrk\THrjMg0ri#gjrgNhOrf@&6rdt,urcS3\rbh^IraYq7r`fA'r`/qor_EGdr^m)[ -r^ZrVr^?EHk!I`dJO$>&k!J`.r^6cU70#dU8,c'Y8cDE_:B")h<W6,">Q/"/A,^*>DZ4YTFoHjhK)UQ) -O8bCCRf9&\WW'+#[f3r=_>_UVcMl8kg&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6irVQTMs5!_SrqlZnqu6Hk -q#9scoD\7Ymf)MNkPjH>hYu:/e,I_nbl5NZ^](eCYl:^&V>d%bQi<0IMZ/;.J,X]lF8g+WB`;TB@K'R3 -=oMM%;Z9Ml:B!oc9)_B\7fGjU7/0.*6K17]5dir66MNqI7/fUU7RdAIr^d#[r_*5cr_WSlr`B)&ra#M3 -ral(BrbqdXrcnElre19.rf[8Jrgj%bri5t%rji$Brkn`Zrm1SmrnIG/ro*k>rp'LNrp]pYrq69crqZQj -rr)`nh>c=2rr2fnrql]krqQKdrq-3[rpTjProj@@rnm_1rmh"qrltG]rkSNFriuI)rhoaergEbMrf$i2 -rdauorcS3ZrbDFEraPk5r`fA(r_renr_EGdr_!/\r^QlUr^?NKh*U*dJO$Y/h*Um(r^?`S!CfNY7fGsX -9)_N`:B")h;uTnu>5hk-@fC!=CAr2OFoH^dJGt<&N;f(@RJrfWVuEdsZ2VB7_#D=Pc2Q,iec+A'hu;X7 -kl0oIn,DkVo`"R`q#:*gqu6Qkrn[V.s8N#srVl]nqYp<ipAX^`nc&"Vli-/Jj8S!9h>Z")df.Sl`r<jS -^AbJ<YPtR$T`1G[Q2ZjDM#N#*I/\?hEW0eRB`;N@@/aF1=T2;!;Z9Jk:&[ca8cD3V7Iih+6K17]5dir9 -6M3_F7JoUT7fH!Y9E%Zb:]=8k<;p#!>Q/%0A,^-?D#SGRG5cmgK)UW+O8bFDS,T)[WrB1#Zi7]<_Z%RS -ci2Dmf)FM)i;Vd9l2L&Kn,DkVo`"R`q>U6iqu6Qnrn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49= -hu;=.ec*nob5T?Y^](_AZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\ -8,c!W7.iq-6K17]5dir96Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1 -rfI,Hrgs+`riQ1*rjVmArl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOfDkjLrqucm -rqcWgrq??`rp]pTrp9XHro="8rnIG'rmC_grl+lPrjr*9ric<trh07[rfR2>reUQ(rd4Wfrc%jQrb;@@ -ra5Y0r`B)!r_`Yjr_3;ar^d#Yr^QZNqa9C1qa'F2JO$b2r^#I/r^6HKr^QlW!D#`]8H)9]:&[rf;>sPo -=8lJ(?iFO6C&VrJE;k%[HiAQpM#ND5OoCjLT`1eeYPtp.])KME`r=0\dJh_rg]$+0j8S3?m/HGPnG`(Z -p&=^bqYpBkr;6KIs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2fDa4tbl5Z^_Z%1H[JmB/W;`Rk -T)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U7K,^M6fUN460LRb5eKA]6/t<, -6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcsreg]8rfd>QrhBCjric=/rk&0H -rl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfe)rr2oqrqucmrqZQfrq69]rp]pTrosFE -ro3q6rn@A%rm1Sdrl4rPrji$7ri?$prh'1Wrfd>Are:?&rd=]erc%jRrau.=ra5Y.r`B)!r_WShr_<Aa -r^m)[r^QlUr^?<Ej$N&sJO$t8i'R*(r^?`Sr^QlXr^d,_8cVK_:&[rf;#XJo=T2M'?iFR7B)ZZHEW1(Z -I/\ZqL&R,3P5^jJTDk\dX8]I)\c0AC`r=0\ci2Jog&Bk-ir8*>l2L,MnG`"Xp&=^bq>U9jr;QZlrn@D( -s8N#prVl`oqYp9hpAX[_nc%tUlMfuGj8Rs8gA]\&d/M8gao9*T]Df5;Xo>6tUAgY]Q2ZjDM#N&+If=Ni -ErL"VB`;QA@/aF1=oMM%;Z9Ml:B!oc9)_B\7f,XR7.iq-6Mj(=5_22;5lO(-6Mj.I7/fXP7fGsX8HDIW -!)*;dr_WSlr`B)%r`oG1ral(BrbqdWrc\9irdt-*rf@&DrgWn]ri#gurjDa;rkSNTrlkAgrmq)'rnm_8 -roa:GrpKdTrq$-_rqQKhqu$Hlqu5=LeGoFErquclrqQKerq-3\rpTjQroj@Cro!e2rn7:urm(McrkeZJ -rjVm2ri5snrgs+VrfR2;re:?$rd"KbrbqdOrau.=ra5Y/r`K.ur_i_kr_<Aar^luWr^QlTog@Y(r^$'> -JO%1>r^#@,qa:6KqaUQTr^m)^!DQ8g:&[rf;>sMn=T2P(?iFO6BDu]GDuOkXH2`<mK`6l.OoC^HT)PPb -WrB7%\,O)?_Z%^Wc2Q,ig&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6fr;QZEs4%)Jrr2lqr;QQlq#:$eo`"F\ -n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"KjF8g(VCAqfD@/aI2>5hP$ -;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha:/1dar_NMkr`/r$r`oG1 -ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5roj@HrpB^Rrpp'\rqHEf -rqcWlrr)iqeGn%urr2oqrquclrqZQgrq69_rpg!Urp0RIro="9rn[S(rmLelrl>#UrkAB>rilC&rhBC_ -rg3VGrepc0rdXonrcS3ZrbVRIraGe4r`fA'r`/qpr_NMer_*5]r^ZiTr^HfSpd<k(qa('DJO%CDr^#@, -pd>$Kr^H]Rr^ZrYr_*5b!DcJk:]=5j<;otu>Q.t.@K's>C]8;PFoH^dJ,Y0$MuJh;R/WZUUAh4mYl;'0 -^Ac"Ka8XEadf.erh>Z@3j8S9AlMg5Nnc&.Zp&=acq>U6ir;QZorm^tts8N#prVl]nqYp<ipAX^`nc&%W -m/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQLNW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr -;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8 -rbDFLrc%j]rd=]qre^W7rf[8Mrh07driZ7+rjVmArl"fXrm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQi -rql]nqu5+FeGoOIqu-Nlrql]krqHEcrq$-YrpB^Nroa:Arnm_0rmq(srltG`rkn`JrjMg1ri5snrh'1U -rfR2>re19$rd=]frc.pSrb)4@ra5Y0r`T5$r_`Ykr_EGcr_!/]qa^WTr^?<Eh*V'*JO%UJh*Ud%qaC<N -r^ZrZr_!/_r_EGg!Du\o;>sVq=T2S)?iFR7BDucIEW1+[I/\ZqK`6u1P5^dHTDkYcWrB7%[f3r=_u@aV -c2Q/jfDaP(hu;[8kPjfHmJcVSoD\F^p\t$gqu6NmrVQTDs4%)JrqlZnr;QTmqYp9hpAX^`nG_kTmJc>K -jo46<h#>t*eGdenb5TBZ^Ab\BZi7'*VuEChRJrHMO8aq6K)U5uGQ)[_DuOJMB)Z9=?N+.-=8l.t;>sAj -9`@]a9)_B\8,c!Q7/0.*6N'1N5s^&eej04#h*Um(pdG*Nr^ZrYr_!/_r_3;er_W\p;ZKbq=8lD&?N+F5 -B)ZNDDuOhWGQ*'jK)UQ)O8bCCRJroZVZ*[rZi7K6^Ac+Nb5T`deGe,"h#?:3jo4KCmJcSRnG`(ZpAXjd -qYpBkr;QZlrm^tqs8N#prVl`oqYp9hpAXaanc&%Wmf)JMk5OB>hu;@/fDa.rbl5]__#CtF[JmB/WW&[l -Sc4uTOoC7;L&QW%HN&'dE;jYPBDuE?@/aF1=oMG#;uTSl:B!rd9)_E]8H)*U7K,^G6f:925lj8;JO%mR -r^#@,ogAUEr^HfUr^ZrZr_!/_r_EGgr_`bs<<-%u=oM\*@/a[8BDu]GE;k"ZHN&HoL&Qu/OoC^HSc5D` -WW'+#[Jmf;_#DFSbl5ugfDaP(hu;X7k5OWEmf)\Snc&4\p\sseqYpBhrVlfDs3CZDrr2lqr;QTmq>U0g -p\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pbE;j\QB`;H> -?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N`:&[ug;Z9\t -=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A,ro!e;roj@I -rpTjWrq-3arqQKgrql]mrr)`ndJqMlrr2fnrquclrqQKerq-3\rpTjSrp'LGro*k5rnIG&rmLekrl4rS -rkAB=rilC'rhBC`rgNhJrf$i4rdauqrcnE^rbh^Mrac":ra,S,r`B)!r_`Yjr_<Abr_!/\qa^WTpdFmE -i^36'JO&`je3`ptpdG!Kr^ZrYr^m)^r_<Afr_`Ypr`9,'=TDV(?N+C4AH$?CD>nPSGlE*iJGtB(N;eq< -Rf8oXUAh7nYl;$/^Ac"K`r=9_dJh\qg]$(/iVr$>lMg5Nn,DnWo`"Uaq>U6fr;QZlrmCbks8N#prVl`o -qYp9hp\sjboD\7Yn,DYPkl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1Y -DZ48IA,]j7>lIn*<rQ"r;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^ -:&[rf;>sJm<rQ2%>[.86ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUku -rndY4ro="Arp0RPrp]pYrq69brqZQiqu$Hlqu5"CbQ%S@qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0 -rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXolrcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Ac -r^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQTr^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7 -BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtLao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[a -q>U6iqu6Qkrlb>bs8N#prVl`oqu6HkpAXaao`"@Zmf)VQkPjTBir7d5f`'D"ci2)d`r<aP])K,:Y5YF" -U]-h`Qi<0IMuJJ1Jc:&rGlDd`D>n8KB)Z3;?N+4/=8l5!;Z9Ml:B!ue9)_E]8GG[L7/0.86K^]76'";1 -6.&$o6hj(E7fGsX8cD?]:&[oe;#XAl<W6)!>lJ%1?sitBrau.Drb_XUrce?hrdk''repc=rg<\UrhKIk -riZ7.rjr*Drl4r\rm1Snrn7;,ro3q=roa:JrpTjUrq-3_rq??frql]mrr)`nbQ#ccrr2fnrqucmrqcWg -rq??`rpg!WrpKdLroX4?ro!e1rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJ -raYq9ra5Y,r`9"ur_`Ykr_NMdr_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5d -r_WSkr`/r!r`K/,ra>h;@fU$<C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYr -g]$.1j8S3?kl1#Ln,DkVo`"O_p\t$gqu6NmrVQT;s2b6>rqlZnr;QTmq>U0gpAX[_nc&"Vli-/JkPjH> -hYu:/eGdkpcMki__Z%:K[f3Q2Xo>*pT`1J\P5^L@MuJ>-If=]nF8g.XD>n2IAH#s8?N+1.=T2;!;Ys8h -9`@]a8cD9[8,c!T7K,^G6hE^t6Dm)l6M3_C7/fXP7fGpW8H)3[9E%Z_:]=8k<;p#!>5hk-?iFO9B4h3W -rb_XRrcA'crdXp!repc:rf[8Nrh'1briQ1*rjMg?rkeZSrm(Mjrm^r%rndY5roa:Frp0RPrpg!Zrq??c -rqZQjrquZlrr1"=`W,r:qu-NlrqcWhrq??`rpp'WrpKdOroj@Aro!e3rmq(trm1Scrl"fNrji$8ric=" -rhKIarg*PHrf6u4rdt,urce?`rbqdOrb)4?ra>_2r`];%r`&kpr_WShr_<Aar^m)[qa^WTpdFmEoKq1s -pd)GUpd*(ipd=gEqaUQTr^d#[r_!/ar_EGhr_i_qr`9#%r`oG1raYq?!GcHNC]88OF8gC_If=ruLAm54 -P5^dHT)PJ`W;a""[/RW8^])1Nao9Wce,Iqth>Z@3j8S9AlMg5Nn,DnWo`"R`q#:-er;QZlrlG,Ys8N#p -rVl`oqYp9hp\sjboDA%Vm/H8Kjo4<>hu;@/f)F(rc2Pc__Z%7J\,N]4XT#*rT`1DZQ2ZmEMZ/>/JGsrq -GQ)U]DuOMNBDu?=?iF@1=T2A#<;o_k:]=#d9)_E]8H)-Y7f,XR7.N_A6I/!/5fH(_6i0:N7K,dU8,c'Y -8cD?]9E%`a;#XGn<rQ5#?2e41@K'p=CB8?l!,qjVrc\9grdb!%reg]:rg!JOrh07friH+)rj_s@rkeZU -rltGirmh#%rnm_7roO.Drp9OOrq$-^rqHEfrqcNirr)`naT'-Wq#13hrqcWirqHEcrq$-YrpKdProj@B -ro!e3rn7;$rm:Ygrl>#Rrk/6?rilC&rhf[frgWnQrfI,;reCE&rd=]irc.pUrbVRGraYq7r`oG+r`K/! -r_`Yjr_EGer_32\r^cfRr^?0A!CK5q6H_X56LmM@7/07K8H)3[9`@cc:B"&g;Z9Yp=T2J&>lJ+0A,^*> -D#S;QEH(turcnEhrdb!&repc;rg*PQrh07fri?%&rj_s@rkSNSrlb;frmh#$rn[S3roO.Crp9XOrp]pY -rq69brqZQirqlKh_Z.LQrr2fnrqucmrqcWhrq??`rpg!VrpB^LroX4>rnm_0rn.4urm(Mdrkn`Nrk/6: -ric=%rhKIbrgWnNrf@&9re(3"rd4Werc8!Urb2:BraPk6r`fA)r`9"tr_`Ykr_EGer_*5_r^luWr^QcR -qaC0G!CK5q6MNk&5kmXa6Mj.C7/fXP7fGpW8cD?]9E%Zb:B")h;>sPo<rQ8$>lJ+0@fC!=B`;oKE<13) -!-S9frdXp"reg]8rfd>Nrh'1bri?%%rj2U:rkSNOrlb;ermLeurnIG0ro3q>rosFLrpTjVrq-3`rqQKh -rql]mrr)`n_Z.LQrr2fnrqucmrqcWhrq??arpp'XrpTjProj@Cro!e3rn@A$rmC_krl4rSrkJH@rj)O, -rhf[hrh'1Urf[8@reCE(rdXolrcJ-Yrb_XJral(;ra5Y0r`K/#r`&kor_WSir_3;ar_!/\qa^WTqaLKP -pI"XAa?n]J`Bs,_qaCEPqaUQTqag]Yr_*5ar_NMir_`Yor`9##r`oG/raGe;rb;@Krc%jZ!I/hhGlE3l -KDpW)NrG4@QN!NUU]..iYPtm-[f4&@_u@[Tci2AleGe2$h>Z@3jo4KCli-APnc&+Yp&=^bq#:-hqu6Nm -rVQT2s1eU5rqlZnr;QTmq>U0gp\sgao)A+Wmf)POkl0ZBiVqa6g&BP$d/M8ga8WsT^&GM?ZMq!*VuEFi -Sc4uTP5^L@M>i/,J,XcnGQ)R\D>n>MAc?3=?iF@1>5hY'<W5qo;#X5h9`@Z]8c)$W7f,XR7/]LE6bbte -62NqH6,,bT6i0:N7JfRR8,c*W9)_N`:&@cd;uTer=T2M'?2e41@fBs<C]85NE;k(\HNAVG!.Y!#reUQ6 -rf[8Jrgj%_ri#gurj)O5rk8<Jrl>#^rm:Yprn7;.ro3q<roj@HrpKdSrpp'\rqHEerqZQjrquZlrr0\4 -]`8!1qu-NlrqcWirqQKcrq-3[rp]pRrosFDro="9rnRM*rmUkmrlY5ZrkSNFrjMg1ri?$qrh07[rg3VG -rf$i5rdk&trd4Wdrc.pTrb2:CraYq7r`oG+r`B)!r_renr_NMfqb-o\r^coVr^QcRrC$QOpd;e_pd)PZ -pd=gEr^H]Rr^ZiVqb$i\r_<Afr_`Ynr`/r!r`];+ra5Y7rau.Crbh^TrcJ-drdFm!JH19#M>iM6OT(UG -S,T)[VZ*XqYl;*1]DfVF`W"$Zci2DmfDaS)i;Vd9jo4NDm/HMRnc&.Zp&=acq>U6fr;QZlrkJKGs8N#p -rVl`oqYp<iq#:!do`"I]nG_hSli-)Hjo46<hYu7.f)F%qbl5``_Z%:K]Df/9YPtU%U]-qcSGn`OOT(7= -K`6Q%J,XZkFT-7YD>n8KB)Z6<?iF@1=T2A#<W5nq;>X/g9`@]^8cD9U7f>aV77I2DmmD^ommHt?r^HTO -qag]Xr_*5bqbR2gr_i_qr`B)$ra#M1raGe<rb;@Krc%jYrce?krdk0(KE-])NW,%=PQ%*OTDkVbX8]=% -Zi7T9^])+Lao9Qad/MVqg&Bk-iVqp;kPjfHmf)_ToD\F^pAXjdq>U6fr;QZlrkJKDs8N#prVQKkqYp6g -pAXaao)A.Xmf)POl2KiEi;VR3g]#b&df.SlaSs-W^](hD[JmB/X8\spT`1G[QN!$GN;eV3K)U9!HN&-f -E;jbSD#S)HAG]a5>lIq+<rQ(t;>sDk:]=,g9`@]a9)_E]8H)-X7f5aQ7K,^D6^:",6i0:N7JK@O8,c'Y -8cD?]9E%W^:B")h;>sPo<rQ;%>l.n-A,^-?D#S>OE;k(\HiANoK)UN+N/RaqrfR2GrgWn[rhf[qric=. -rjr*Drl"fWrm1Slrmh#&rndY4roX4Drp0ROrp]pXrq69arqH<drql]nqu4/+\c;[.qu-Nlrql]krqQKe -rq??_rpg!VrpB^Mroa:@ro!e3rn.5#rmC_hrlG)Vrk8<@rj;[-ri,mmrgs+Xrg*PFrepc2rdk&trd4We -rc8!VrbDFFrac"9ra,S/r`K/$r`9"rr_`Yjr_EGdqb-o\r^m&Y!CoZW7f,XL7/0-76MNqC7/fXJ7fGpW -8cD?Z9E%Wa:B"&g;>sJm<rQ2"=T2S)?N+@3AH$6@CAr/NErL4\HiAKnJc:H(MZJp$!0I2GrgNhXrhTOm -riZ7-rji$Arkn`UrlkAhrmh##rn[S3ro="@rp'LMrpTjVrq$-_rqHEerqcWkrqucoqu4/+\c;[.q#13i -rql]jrqQKerq-3\qsaUOrosFDro="8rnIG(rmUknrlb;]rkSNGrj_s3riQ1"rh9=_rgWnNrfI,<re19% -rdXolrcS3[rbqdNrb)4?raGe5r`oG+r`K/"r`&kpr_WSir_EGdr_*5_r^d)\!D#c\8,,RN7K,^>6a/oD -6i0:N7JK@O8,c'Y8cD?]9E%Wa:B"&g;#XAl;uTer=T2M'>lJ+0@K'd9BDu]GDuObUFoHXbJ,Y'!K`6r0 -NrbH.!0dDOrgs+_ri5t"rilC3rk/6Grl>#]rm:Ynrn%/(rnm_7roO.Drp9OOrq$-]rqHEerqZQjrquZl -qu4/+ZiC%(qu-NlrqcWirqQKdrq-3\rp]pTrp9XJroO.=ro!e2rn7;!rm1Sfrl"fPrkJHArj2U-ri#gl -rh'1Zrg*PGrf-o5re(3"rd4Whrc.pUrb_XKrau.=ra>_3r`oG*r`K/#r_i_mr_NMir_EGer_*;b!D?)b -9)D3Z8GG[L7K,^86e"He6i0:H7JK@L8H)3[9)_K_9`@cc:B")h:]=5j;Z9_r=8lA%>lJ%.@/aX7B)ZND -D>nJQEW14^HiANoKDp]+NW,(>Q3!JE!1Wt[rhTOlric=-rjVmArkeZQrlkAfrmLf!rnRM2ro3q>roj@J -rpB^Srpp']rq??drqZQiqu$Hlqu4&(ZiC%(qu-NlrqcNfrq??arq-3[rpTjRrosFGroX4=rnm_1rmq(s -rm1Sbrl+lQrk/6>rj)O*ri#glrgs+Xrg*PFrf$i5rdt-!rd=]grcA'Xrb_XKrb)4?raGe5r`oG+r`K/# -r`&kqr_`Ykr_NMf!)*De9`%K^9)_EW8,,RK7J0(A6e"I"6h3Y?7JK@I8,c*Z9)D9\9`@cc:]=2i;>sMn -<W6%u=T2M'>lJ+0@K'd9BDuZFD>nMRFT-I_I/\WpK)UW+N;eq<QN!<RSt5qRrhTOmriQ1*rjVm>rk\TQ -rlG)brmUktrnRM0ro*k=roa:FrpB^Rrpg![rq69arqZHfqu$Hlqu4&(ZiC%(q#1*erqcWgrq??arpp'Y -rpTjQrp'LHro3q8rnm_-rmh"qrltG`rl"fOrk&0=rilC'ri,mjrgs+Yrfd>Drf6u4re(3"rd=]ircJ-Y -rb_XMrau.?raGe6ra,S/r`K/#r`/qqqbd>h!)EVk:]=,g9`@]a9)D3Z8GbpM7f,XO7)D=a7/fXG7fGpT -8H)3[9)_K_9`@fd:]=2i;>X8j<W6)!=T2S)?2e72@K'g:B)ZTFDZ4VSFT-L`I/\WpKDpW)NrG.>PQ%'N -ScPOY!29CkriQ1(rjVm=rkSNOrlP/armC_qrn.5-ro*k9roj@Grp9XQrpg!Yrq69arqH<drqlKhqu4&( -YlF_%qu-NlqtpBgrqQKerq-3\rp]pUrp9XMroa:Aro!e4rn@A'rm:Yhrlb;Zrk\TJrjVm5ric=#rh]Ue -rg`tSrf[8@reg]1rdaurrd4WercA'Wrbh^Nrb2:@raPk6ra,S/r`];'r`9"ur_`_n!Du_n:]=2i:]=,g -9`%K^9(bdT8GbpJ7asln7fGpT8Gc!U9)_K\9`%Ta;#X8i;>sJm<W6)!=T2M'>Q.t.?iFL5A,^0@CAr,M -DuOeVFoHaeIf=lsL]321NrG4@Qi<NST`1bgWMolsric=-rjVm@rk\TPrlb;drm:Yrrn@A.ro!e:roa:H -rpB^Rrp]pYrq-3arqQKgrqlTjrr)`nYlCs-q#:'drqcWirqQKcrq-3\rp]pTrpB^Lroa:Aro!e3rn@A$ -rmC_jrlG)WrkSNGrjVm4riZ7#rh]Uerg`tTrf[8@repc0rdt-!rd+QfrcS3Zrb_XMrb)4Brac"9ra,S0 -r`];(r`K/#!)rtu<;ohn;>X/d:&[i]9E%Q\8cD9L8(:$!8,c'V8cD?Z9D_E^:&[ob:]=2i;>sMn<W6%u -=T2J&>5hh,?iFI4AH$0>BDu]GDZ4VSFoHXbHN&EnK)UK'MuJe:P5^jJS,T)[V>dFpY-%c-rj)O4rk/6G -rl+lXrm(Mjrm^r$rn[S3roF(@rosFLrpKdTrpp'\rq69crqZQiq#'pdYlCa'rr2fnrquclqt^6crq??` -rpg!WrpTjProsFEro3q7rn[S*rm^qorltG`rl"fOrk&0=rilC(ri?$nrh07]rg*PIrf@&:reCE(rdauq -rd"Karc8!VrbVRJrb)4?raPb3r`oG,r`B/$!EN8#<Vo_o;Ys;i:]=2i:B!ue9`%K^9(bdQ8CU0&8Gc!U -9)_K\9`@cc:B")h:]!uc;Z9Vo<W6)!=T2P(?2J".@K'd9BDuWED#SAPEW1%YH2`3jJGt0"L]352O8b@B -QN!HST`1_cX8]7&Ycn,3rjVm=rkSNOrlP/arm:Yorn%/*ro!e8roX4Drp0RPrp]pWrq-3_rqHEfqtg3f -rr)`nXoGF$rr2]krqucmrqcWhqtL*^rposTrp9XLroO.>rnm_2rn7;%rm:Yhrlb;Zrk\TKrj_s7ric=% -rhf[hrh'1Yrg*PFrf-o8re19%rdXoorcnEarc%jSrb_XLrb2:CraPk7ra5Y1!*fP0>lIt,=T2D$<rQ+u -<;oep;>sDe:]=,d:%_3T9AN589CbdU:&@]_:]=2i;>sJm;uTer<rQ2"=T2P(>lJ%.?iFL5@fC!=B`;cG -D>nJQE;jtYGQ)sgJ,Y'!K`6o/NrG.>QN!?PTDkSaVuEarYPtm0\@;OKrkJHLrl"fZrm(Mirmq)%rn[S2 -ro3q=rp'LLqsXOTrq-3aqtU0erql]mq#1*hXoGF$qu6KkrqucmrqcNfrqQKcrq-3\rp]pTrp9XJroO.= -rnm_0rn7;#rmC_jrlG)Xrk\THrj_s7ric=%ri#gjrgs+Yrg!JGrf@&8reCE(rdaurrd+QdrcA'Xrbh^N -rb;@Drac"<ra5_5!FK45?N+1.>5MG$=8l8"<;ohn;Z9Pj;#X8f:@_-P9__9O9_D-T:B"&d;#X>h;Z9Vo -<;oqt=8Q,!=oMY)?N+=2@/a[8Ac?<@C&VoIDZ4VSF8g=]HN&<kJGt0"LAm&/O8b=AQ2[9PTDkSaW;`js -YPtp.\,j7T!5/<Irl+lXrm(Mjrm^r#rnRM1ro3q>roj@JrpB^Srpp'\rq60`rqZQirql]mrr)NhXoG=! -rr2]krqucmrqcWirqQKdrq69_rpg!WrpTjOroa:Bro*k6rn[S*rm^qorltG`rl+lPrk8<Brj2U.riQ0s -rhKIbrgWnQrf[8Arepc3rdt-"rdXomrce?`rc%jTrbh^Mrb2:CraPq;!FfO;?iFI4?N+4/>Q.h*=T2@u -<W5ts;u9Ji;=[Q_:]=2`:\[][:]=2i:\%?];>=&g;uTbq<Vohr=T2J&>Q.n,?2e72?iFL5A,^*>B`;cG -DZ4SRE;jtYG5cddJ,Y#uK)UT*MuJe:P5^gIS,T&ZU]..iXo>R(Zi7Q8]`Gpa!5STQrlP/arm:Yorn%/* -rnm_6roO.Crp'LOrp]pWrq-3_rq??drqZQirql]mqu-EkVuNIjrr2]kqtpBhrqQKerq??_rpp'WrpKdP -rp'LEro="8rn[S,rn%.srm1Sfrl4rTrkJHErjMg3ric=$rhf[frgs+Zrg!JGrf@&:reUQ-rdausrd=]i -rcS3\rc%jSrb_XL!,)CHB`;ZDA,]s:?iFI4?iFC2>lIt,>5MJ%=T2@r<W5ts;uT\E;>X8j;uTbn<Voho -=T2J&>5hb*>l.k,@/aO4@K'd9BDuWECAr)LDZ4VSErL7]GlE*iIf=lsL&Qo-MuJe:P5^aGSGo,ZT`1hf -WrB4$ZMq?4]DfSE_Z@cs!65#^rm(Mjrn%/'rn[S2ro3q=rp'LKrpKdSrpp'\rq??crqQBerqlKhqu3Dk -U&Y#hqu-Nlrql]krqZQgrq??arq-3[rp]pSrp0RIroO.=ro!e3rn@A%rmLelrlb;^rl"fNrk&0>rj)O, -riH*rrhKIbrgWnRrfd>Crf-o7re:?(rdXoqrd"KercJ-[rc%jS!,M[PD#S5LBDuNBAc?3=@f'R4?N+70 ->lIt,>5MJ"=T2D!<qTJT<;T\j<rQ1q=T2J&>5hb*>lJ%.?Me.0@fBm:Ac?<@BDu]GD#S>OE;jqXFT-L` -HN&?lJ,Y'!L&Qu/N;eq<PQ$pJS,T&ZU]..iXT#F&ZMqB5]DfSE`;[gYbKBn/rm1Slrmh#%rnRM2ro3q> -roj@IrpB^Srpg!Zrq69arqHEfrqcWkrqucop&:ceT)\fhqu-NlqtpBhrqQKerq??`rq$-Zrp]pTrp'LG -roO.=ro!e4rn.5#rmLemrlkA_rkeZLrk8<>rj2U-riH*trhTOdrgj%Wrfd>Drf@&9reLK+rdausrd=]j -rce?`rc%pW!H<#WDuOSPCAqrHB)ZB@AH$';@K'X5@/aO4?Me%->lIt,>5h[t=QW]U=T2J&>5hb'>lJ%+ -?N+@3?iFL5@fBp;Ac?<@C&VoID#SAPE;jkVFT-I_H2`3jIf=lsK`6c+MZ/\9OoCRDRf8lWT`1bdVuEds -YPtm-[f3u>_#D4MaSs?`d*Md>rmLesrn.5,ro!e8roO.Crp'LNrpTjVrq$-^rq??crqZQirqlTjrr)`n -T)Y2Xrr2fnrquZjrqcNdrq??_rposTrp9XLroX4?ro!e4rnIG*rmLemrm(Mbrl4rSrkJHErji$6ric=' -rhf[irh'1\rgEbOrfR2@rf-o6reCE(rdausrd=]i!-SBdG5cU_EW0qVDuOVQD#S5LC&VfFBDuH=A,B^6 -?iFI1?hdt&?12%n?2.b'?iFI4?iFI4@K'd6AH$6@B`;`FC]8/LD>nJQE;jkVFT-I_GlE*iIK"crK)UN( -M>iM6O8b:@QN!<OSc58\U]..iXo>R(ZMqE6]`,\F_Z%RSao9TbciMSC!7Ll"rnIG/ro!e:roX4Frp9ON -rpg!ZqtC$`qtg<hqu$Hlqu3)bR/d'_rr)`lrql]krqZQgrq??arq-3\rp]pTrp9XJroX4@ro!e4rnRM) -rm^qorm(Mcrl>#TrkJHGrjVm7riuI)ri,morh07^rg`tRrfmDErf6u9reUQ,rdt-!rd=cn!IK1mHN&*e -FoHL^EW0qVDuOVQD#S5LC&VfFBDZ9>AG]m9@e*t,?iFI+?iFI4?iFI+@JaO5A,Bg9Ac??AB`;`FC]8/L -D>nJQE;jkVFT-F^G5cgeHiAHmJ,Y'!K`6f,MZ/Y8OoCUEQN!ERT)PD^VZ*RoXo>U)[/RQ6^&GhH_Z%UT -b5T]cd/MMqf@L#SrnRM0ro!e:roX4Drp9XOrp]pXrq-3_rq??crqZQirqlTjrr)WkS,\lUqu6KkrquZj -rqcWhrqHEcrq69_rpg!WrpTjProsFFro3q9rnm_0rn%/"rm:YirlkA]rkn`Mrk8<ArjMg1riQ1#rh]Uh -rh'1\rgEbOrfR2Arf6u8reLK+rdb'"!J#_"J,XipHN&3hFoHL^ErL%TDuOVQD#S5LCAqoDBDuNBAbBU, -A,'O1A+F10Ac?<=BDuWECAr#JD#S;NDu4MQErL.ZFoH[cHiAElJ,XutJc:?%L]321NrG+=OoC[GRJrcV -TDkSaV>dOpY5Y[)[f3i:^&GeG_u@[Tbl5oed/MSpfE'a]!8IM1ro*k9roa:Frp0RPrp]pWrq-3_rq??c -rqZQirqlTjrr)NhS,\cRq#:0hrquZjrqcNdrq??`rposTrp9XMroj@Cro3q8rn[S.rmq(trm:Yirlb;^ -rkeZMrkABBrjMg2ric=%ri,mlrh9=`rgWnSrg!JFrfI,>re^]3!JlR2LAlf(JGt&tIK"WnHiA9hG5cU_ -F8g4WE;OSKD>nAKCY`b)C\qrCD>S8KE;jnWF8g:\G5cacHiAElIK"`qJc:9#LAm#.MZ/Y8O8b:@Q2[0M -S,T&ZU&LhdWW'!uYPtg+[Jm`9^AbqI_Z%XUb5T]cd/MPof)FG'h#ZHl!9!k9roX4Drp0RNqsXOTrq-*] -rqH<drqlTjrr)WkQ2d-Lp&=shqu$HjrqcWirqQKerq69_rpp'XrpKdQrosFGroX4>ro!e4rn7;&rmh"q -rm1Sfrl>#Wrk\TJrk&0>rj)O-riZ7!rhf[jrh07]rgNhQrg!JFrf7&=!KE*<N;eY4LAll*K)U<"J,Xip -HiA?jGlDpdG5cU\F8KtSE;OSQDWYg5DYnALE;OYSF8L(YG5c^bGlE$gHiAElJ,Y#uK)UH&LAm#.N;eh9 -O8b:@Pl@$KRf8lWT`1bdVZ*OnY5Y[)ZMqB5])KGC_>_CPa8X<^cMl5jec+2"g&Bk-huVis!94"?roa:F -rpB^Qrp]pXrq-3_rqHEerqZQirqlTjrr)NhQ2cpFqu6KkrquZjrqcWirqQKdrq69_rpg!WrpTjPrp'LH -roO.>ro!e4rnIG*rm^qqrm1SgrlP/Zrk\TKrk8<?rjDa1ric=%ri,mmrhBCargs+Yrg<\K!0RAGP5^OA -NrG":MZ/D1L&Q`(Jc:3!J,XlqI/\KlH2`'fGPcO^FSg.VEoqB7ErL.WFT-F^GQ)jdH2`0iI/\QnJ,Xut -Jc:<$L&Ql,MZ/P5NrG+=OoCRDR/WQRT)PA]UAgtfWW'!uYPtg+[/RQ6^&GeG_>_IRao9Qaci2AleGe/# -g]$(/i;Va;jlHL(roj@Grp0RPrp]pWrq-3_rq??drqZQirqlTjrr)NhP5gL@q#:0hrquZjrqcWhrqHEc -rq-3\qsaUQrp9XKroj@Dro*k7rnm_/rn.5$rmC_lrm(Mbrl>#UrkSNHrk&0;rj2U.riZ7$ri#gkrhBCa -rgj+Z!LoSXRJrKNPl?gEOT(:>NW+h7M#N/.K`6W'K)U;tJ,XooIJA0aHLH.SHMDjdIJ\KmJ,=cqK)UE% -K`6`*M#N;2NW+t;OT(CAPQ$jHRJr]TT)PA]U&LhdW;`grY5Y[)Zi7B3]DfMC_#D7N`r=*ZcMl/hdJh_r -f`'V(hu;R5iVr!=k5ji3!9sLLrpBUPrq$-]rq??crqQBerqlTjrr)WkN;nk:p&=shqu$HjrqcWirqQKe -rq69_rq$-Zrp]pTrp9XLroj@Bro=":rndY/rn7;$rmUknrm(MdrlP/XrkeZLrk&0>rjMg3rilC)ri,mq -rhf[h!2'@cT`1P^Rf8`SR/W?LPQ$^DO8b.<N;e_6M>i>1LAlo+K_U/rJGXiVIf"WlJG=`qK`6])LAm#. -M>iD3N;eh9O8b:@PQ$gGR/WNQRf8oXT`1\bVZ*LmWW'("Yl:s-[f3f9]DfSE_Z%LQao9K_cMl2ie,Ins -g&Bb*hYuL5j8S-=kl0iJm-F`=rpKdSrpg!Zrq-3_rqHEerqZQirqlTjrr)NhN;nY4qu6KkrquZjrqcWi -rqQKerq??`rpp'YrpTjUrpB^Nroa:CroF(:rndY1rn7;&rmh"prm(MfrlP/[rl"fOrkABErjMg5rj)O- -riQ1#rhogn!MuXlU]-qcT)P;[Rf8]RQi<3JP5^UCOT(=?Nr+b6MZ/G/L\QQ"KB@dbKD:-!L\lo)MZ/P5 -NrG+=OT(CAP5^[EQi<EPRf8lWTDkM_U]..iW;`jsXo>R(ZMq92[f3r=^AbqI`;[dUao9Qaci2;jec+2" -g&Bh,hu;R5jSn9?kPjfHm/c_G!:^!Vrpg!Yrq-3_rqHEerqZQirqlTjrr)NhM>r5.q#:'eqtpBhrqZQg -rqHEbrq-3]rp]pUrpKdOrp'LHroO.>qr%J0rnIG(rmh"qrm:Yhrlb;]rl+lRrkSNIrk/6>rjDa2ricC* -!NrU)Xo>=!VuEOlUAghbTDkG]SGo#WR/WENQ2?dEP5^R?O8b14NVe\0MtN&+NVeb8O8G%9P5^[EQ2[-L -R/WTSSc55[TDkP`UAh"gVuE[pXo>L&Yl:s-[JmZ7]`,VD_#D4M`W!pWbPoccd/MGleGe)!g]$%+i;Vd9 -jo4KCl2L#Jmf)YUnF-GIrq$-]rq69brqQKgqtg<hq#1!eKE$T(p&=jerquZjrqcWirqQKdqt9s[rpp'W -rpKdPrp'LHroX4Aro3q8rndY/rn7;&rmUkorm1SfrlY5]rl"fQrkJHGrjr*=rj;a5!OT65Z2Us+XT#:" -W;`[nV>d4gU&1J]SGo#TRJrTQQi<<MQ2$RBP3.o(P5(7?Q2[*KQi!0LRJr]TSbo&YU&LecV>dClW;`js -Xo>O'Z2V*/[Jm]8])KDB^])+L`;[jWb5TWaci2>ke,Itug&Bb*hYuI4ir8'=kPj]ElMg,Kmf)\SnH&7Q -!;$3_qtC$arqZQirqlTjrr)EeKE$N&qZ$Qop&4mfrqcNfqtL*`rq-3]rpp'XrpTjSrp'LIroj@Bro3h5 -rn[S.rmq(urmUknrm(MfrlP/[rl+lQrkSNIrjr0@!P,c?\,N`5ZMUj)XT#:"W;`^oVZ*@iUAgkcT`1S_ -T)P;[SGo#WRerNPR-'b4R/WNNRf8fUSGo)YT)PA]T`1YaUAgqeVZ*LmW;`jsXo#=$Z2V*/\,Nr;]DfPD -^])(K`W!pWao9Qaci2;je,Insf)FG'h>?.0j8S-=kl0iGlMg5Nn,DhUo)A4]o^i.UqtC$`rqZHfqu$?i -qu20HqYu-Ho`+piq#13iqtpBhrqZQgrqHEcrq69]rpfmSrpB^OrosFGroX4>ro!e5rn[S/rn@A&rm^qp -rm:YirltGbrl>#Wrk\ZN!PlMM^](qG]`,MA[f3]6[/R?0Yl:j*Xo>F$X8]*tW;`[nV>d:fU]."eU"uC@ -U&Le`U].(gV>d@kVuE[pX8]4"Xo>O'Yl:p,[/RK4[f3l;]DfMC^])(K_Z%ORaSs?]c2Q#fd/MGleGe%u -gA]k+h>Z=2iVqj9k5OQCl2L&KmJHAOnc&+Yp&=Xcp\+[^rqQKgrqcWkqu$6fqu20Hp]#gEo`+gfqu-<f -rqcNfrqQKerq??arq-3]rp]pUrpKdPrp'LHroX4@ro="9rndY1rn7;'rn%.urmLemrm(MerlY5\!6,&Z -`r<pU_Z%@M^AbeE]DfD@\,Ni8[/RE2ZMUm*Y5YR#X8]-uWW&jJVuEXoWV`^pX8]7#Y5>I&ZMq30[/RK4 -\,Nu<]DfJB^AbqI_Z%LQ`W!pWb5TT`cMl2idf._pfDaG%g&Bh,hu;R5j8S0>k5OTDlMg/Lmf)\SnG`%Y -o`"O_pAXdeq"OjarqZHfq#(-ip&9OBp]#gEnc/Ufp&4mfqtpBhrqZQgrqHEcrq69_rpp'YrpTjUrpB^N -roj@EroX4?ro3h4rnRM-rn%/#rm^qprm:YjrlbAb!QrRaao9<Z`;[[R_>_7L^](qG]`,MA\c0,<[f3Z2 -Zhq$,YPtd*YPYKbXnAjrYl:j*Yl:p,Zhq-/[f3c8\c02>]DfMC^])%J_>_@O`W!mVao9K_bl5rfd/MGl -eGe"tfDaP(h>?+/iVqm:k5OQCkl0oImJcVSn,DkVo)A:\p&=[ap\spgq=t$dqtg<hqu$?iqu20Hnc+1? -li6k]p&4mfq"k!bqtL!\rq-3ZqsXOOrp9XMroj@EroX4>ro*b3rn[S/rn7;&rmh"r!71bnd/MAjcMl)f -bl5``aSs3Y`;[[R_Z%@J^](tH^&G\D]DfD@\c0,9\,Nhu[JRE3\,3]7\c02>]DfJB^&GbF^\bhG_Z%IP -`;[dUa8X3[bl5ldcMl/hdJhSnec+2"g&Be+h>?+/iVqj9k5OQCkl0oIm/HDOn,)VOo`"O_p\Xa]q>gBh -r;6Hcrdk+;s+149s7QBgrVl`lqu6Hhq>U0gpA=O^oD\=XnG_kTmJcDMl2KoGk5OKAjSn-;i;VX5h#?%, -g&BS'ecF@Qrm^qqrm:YjrltGdrlb;`rlG)Zrl4rVrl"fQrk\KIrkJ?Erk83Aqn)=.rk%s<rk83CrkJ?G -rk\TNrl"fTrl4rXrlP/^rlb;brltGgrmC_nrm^qtrn%/&rnIG-rnm_5ro*k;roO.Aroj@Grp'LMrpK[Q -rpp'[rq60^qtU0dqt^?jqZ-Njr;QZcrdk+;s+140s8N#mrVl`lqu6Hhq=s^`o_\7Wnb_eSm/H>Mkl0cE -k5OH@j8S';i;VU4h>Z./g&]p]rn.5$rm^qrqpGDhrm:YirlkAbrlY5^rl>#Xrl+lTqnrEMqn_+(rk\KK -rknWOrl+lVrl>#[rlY5`rlkAdrm:Yjrm:YlrmUksrmq)$rn7;*rn[S2ro!e8ro="=roX4Croj@IrpBUO -rp]pWrq$$Zq"Od`qtg<hr;6Qmq#1*hJcFj3JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-huEBKqu-<fqtpBhrqZQgrqH3\rq$-[qsaURrpKdPrp0RKroj@EroX4@!94+? -j8S$:i;VX5hYu=0g]#q+g&BY'fDF+teGdqrdehGkd.krdcM5ZQbkTH[cMPred/25idf._meGe"tfDaG% -g&B_)g]$"*hYuI4iVqm:jSn<@kPj]ElMg,Km/-5JnG`"XoD&"Xp\sseq>:$fqtU*grVZZhrdk+,s+14$ -s8N#grVl`oqtp6eq>9pcpAX^]oDA(Wn,DhUmf)VQli-2Kkl0`FjoOW,roO.>ro3q9ro!\2rn[S/rnI>' -rn.5$qpk\qp!`ogpsJQWpsJueqpYGlrmgnsqq1o$rnIG-rn[S2qr%J4ro3q;roO.Aroa:ErosFJrpB^Q -rp]pUrp]pWrq$$ZqtC$`rqZ?crql]mp&4gf!<.QLf)L=$c2[eBo)8RcrqlThqt^-`rq?6^rq-*XrpTjU -rpTjSrp0XN!UK(NlMg#EkPjQ>j87g7hu;R2htu7,h##k*g@Eqcf_*qpgA]k"h#?.,hu;R5hu;R5iVqm7 -jSn?>kl0lHli-8Jmf)_Tn,DhUnb_tXp&"I^p\t!`qYpBkr:U$crqZSFs4..#s3:T:rqlZnr:TsdqYp<i -q"sgbpAXaao_\7Znc&%Wn,D_Tm/cVArp9OJrp'LHqrdk<roEt:ro3q9ro!S/rndG+ptY>mptYZ#qqh5- -ro!e7qr7V8qrIb<roa1Bqs+1Hrp9XOrpKdSrp]pWrq$$Zrq69aqtL*brqZHfqtp9grr)Eeq>Z$Gec14# -a8c&9o)8RcqtpBhqt^6dqtL*`rq69_rq$-[qXFUVnc&"VnG_kTmJcJOli-2KkkjQBk549>jSS!:iq;9[ -i;;L1ir8!8jSn9<k5OQ@kl0lHli-8MmJcPQnG_nUnGDbTo)A7[o`"O_pAXg`q#:*dqYpBhr:U$]rq?AC -s4..#s1\O1rpp$er;6BdqYp9bp\smcp&=R`o)\ISrposVrpTjUrpTaPrpB^Oq!7hAqrm_9roX+>k2cO' -qr[e=p#uD>q!7qGrpBLKrp]pUrp]pWrpp'[rq-3_rq?6`qtTs_rqlTjp&4R_mJhb;ec14#^Amd'qu-<f -qtpBhq"apaqtL'^r:U']qt'gXrpfmTrpTaPqsFCLqs3q?ror%uros+@rp0IJrpBLKrpTaRrpg!Yrq$$Z -q"=X\qtTs^qtg<hq#(-im/HDPJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjU -qsX=JqsDo"rpBLKqsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#WW2bmo)8Rc -qtp6dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0do(r@_qu$-c -q#8hDJcF:#JcD_Lm/I"_qu$3cr;6Kio(i(To(DnPo(1].p%.kKp%A+Sp%eL]p&"O^rr)3_ec14#ec14# -RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcCc1q#:6joDSI^ -q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\])R?]ec14#NrSbNoD\Xcp&+(Orqah6qtf[Vo)/Lck5MslJcF:# -JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#JcFg2o)>llm/E4KJcF:#JcC<$jSt2<PQ-46ec14# -JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$ -JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec1. -~> %APLeod -EI -76 0 0 76 63 90 cm -BI -/Width 228 -/Height 228 -/BitsPerComponent 8 -/Decode[ -0 1 -0 1 -0 1 -] -/Interpolate true -/DataSource cg_aiproc -ID -JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$ -JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$df6QN -JcC<$ec14#JcFg2o)>llm/E4KJcF:#JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#L&_,Nr;Q0` -n,2tXm/$VTn+cnXl2(2Pn,2YQq#7PuJcF:#JcCc1q#:6joDSI^q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\ -])R?]ec14#RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcDDC -rr2Keq#(*fr;6Kiqt]p[rqH*Zqt9jYp%-](qt'LQrq5sXrqH*\rqZHfq"sjap&4debl<7oec14#WW2bm -o)8Rcq"t$dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0dq"jd_ -qu$-cq#8hDJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjUqsX=JqsDo"rpBLK -qsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#[K$7*o)8Rcq"ssaqtU0bqt:$_ -r:U']rq$$Xqsj[TqsX=Io'?;?o',<#p$)A=p$;D?rpTaRrpfdSrq$-]rq6'[rqH3_rqZ?dqu$-cqu5[V -JcF:#JcEIaqu60brquZjq"k!bq"Od]rq69_!:p6_oD\=Xnc&"VnG_nRmf)VQm.foDl20];kPjW@jlYY' -jnn3;kOn'<l1jTDm/HDImf)_Tn,DhUnc&+YoD\C]p&=[^p\Xa\qYpBhr:U$]rpB`:s4..#s2Y0:rpp$e -r;6BjqYU*fq"sgbpAXaao`"I]o(qkWnaZVIrp]pTrpB^Orp0RKroj7BroX+>roEt:ro3V0eDU5_qr7V8 -qrIb<qr[n@qrn%Erp0RMrpB^Qrp]pUrp]gTrpp'[rq-3_rq??cqtU0dqtg<hqu$-cp&=[bJcF:#JcEmm -rr2BbrquZjrqcEbq"F^Zrq$-[qsj[SrpTpU!UfCTmJcGNlMg&IkkjQ?jo4?9iqq[5hu;R5htu:0h:LH] -h>#k+i;VX2i:u=/jSn9?kPOKBl2KuIli-;Nmf)_Tn,DhUnc&+YoD\CWpA"F[qYpBhr:9gcrq?ACs4..# -s3:TCrpp$er;QTjqYU*cp\sm`p&=U\nc&"VnG_nUmf)PQlN->;rp'LHqrdt>qr@S4rnm_5qqq;,qqV)' -rn?qrn(@<dqqD&(p"]Q&qqqD2rnm_5ro*k:qrIb>qrn%Erp0RMqsOIQrpTjUrpfmXrq60^rqHEfq"k!e -rquHfqu6EkJcF:#JcF=$rr2Kerqucmqtg3cqtL*`rq-*Zqsj[Srp]pTrpB^Nrp'LHroX:D!TrPDjo4<> -ir7p9i;;F2h>Z4/g\]\'f`'J!ec+(ke,IejdI5HWdJMAhe,.Yoebdqpf`'S'g]$"-h>Z=/i;V^7ir8!; -jo4EAkPj]El2L#JmJcPQnG_nUnG_tWoDA1WpAXgcq=sgcqu6NdrVZWprdk+#s+14$s76-fr;QTmqYp<c -q#:!dp&=U_o)%tVnG_kTmJcGNlMg&Ikl0`Djo4<@irS3#ro3q8rnm_3rnRM-rn@A(rn%%urmh"tpsT/g -p!<W_ps&9Ops&]]qp5/dpsT/krmgnsrn%/%rn@A+rnRM0rnm_5ro3q;roF(?roa:ErosFIrp0RNrpTjU -rpfmVrq-3_rq?-^rqZQirqlTjpAG!iJcF=$JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-irB#Wq#13iqtpBhqt^$]rq-*ZqsjRPrp9XMroj@EroX4@ro=";ro!e4rn[S. -!87J-gA]b(f)F1ue,.Plci2;jcMl&ebPoZ`ao9?[`r<sV`;@IO_Y_1*_#D1I_Z%IM`;[aT`r=$Xao9H^ -bPo`bc2Q)hci2;jdJhVoec+/!f`'S'g]$%.hu;R5ir8!;jSn<@kPj]Eli-;Kn,DhUnc&.Wo_A1[q>:$f -qu$?lr:p6frdk+2s+143s8N#jrV69eq>U0apAXX^nb_hTmf)VQli-2Kl2KfDjSn3=iVqd7hu;F1gA]e) -ec=5$e^aZKrmLenrm1ShrlkAbrlP/\rl>#Wrl"]OrkeQJrkJHHpq>Lqpq?R=qnW3JqnrEOrl+lWrlG)\ -rlb;brm(MhrmC_nrm^qtrmq)%rnIG-rnm_5ro*k:roF(?rosFIrp0RNrpK[QqssOUqtU0dq>10hp&4mh -JcFj3JcG'9qu69erquQfrqQBbqt9s\rp]gRrpB^Orp0RIroa:Cro3q9qqqD/rnRM+rn%/"rmCen!RT3m -ci25hc2Prdao9B\`r<pU_u@OP_#(nG^AbhF]`,PB])K8>\GNc7[cY!p[f3c5\Gj&<])K>@]`,VD^AbnE -_#D4M_u@UR`r=$Xao9N`c2Q#fci2>kdf.erfDaJ&h#?.,hu;U6ir8*>kPj]Eli-8MmJcSOnGDkWp&=^_ -q"aadqYU3frUp/@s6fo<s7--grq66hr;6BjqYp<iq#:$epAXaao`"F\nc&"VnG_hSli-,IkPjWCj8S'8 -hu;F1g]#h(f)F1udJhMlci2,gaoTZ-rlP/Zrl"fRrk\TLrkJHGrk/6Arji$<rjMg5qm61)ric=*ric4% -k,n<ZrilC*rilC,rj2L/rjMg8rji$>rk&0CrkJHJrk\TOrl+lVrlP/_rlkAfrm:Ylrm^qtrn%/(rn[J/ -ro*k:roX4Croj@IrpB^SrpTjVrpp'\rq69arqHEe!VuNkq>:$fqtp<grVQSFs7-,?s7--^rVl`lqu6Hk -q>U0gp\smco`"I]o)A.Xn,DbSli-2Kl2KfDjSn3=i;VU4h>Z.-f`'J$eGdnnci2/fb5TE]`W=*!rl"fP -rkSNJrk/6Arji$;rjMg6rj)O.ric=*riZ7&riH+"ri5jpri#^lk,/-Uql'Lnri5suriH+$riZ7)ric=+ -rj)O2rjMg8rji$?rk/6FrkSNLrl"fTrl>#\rlk8crmLeqrmq)$rn@A-rnm_5ro="=roO.Drp'LKrpKdS -rp]pXrq$-]rq??c!VlEiq#:*gqYU0hr:U#>s7-,?s7H?jrqQHkr;6BjqYp<iq#:$epAXaao)A1Vn,D_R -m/H8Kkl0`Dir7m8hu;I2h#?%,f)F1udJhMlcMl)fb5TH\`W!^S^]D6drkJHGrk/6ArjMg6rj;[0rilC* -riQ1$ri?$tri#gnrh]UiqkO.brh8/@rh9=cqkO.drh]Ukrhoapri?%"riQ1'rilC,rj;[4rjMg;rk&0C -rkJHKrkeZRrlG)]rltGfrm:Ylrm^qurn@A+rn[S2ro*k9roX4CrosFKrpBUOrpg!Yrq69a!Vc<gp\sse -q>U6iqtp<drVQSFs7cPEs8)cprq66hr;QQiq>9pcpAX^`oD\=[nG_nUmf)MNl2KoGjSn09i;VR3g]#e' -eGdqrd/M>ic2Piaa8X'W_>_7L^Ab_E\H07OrjVm5rj)F)riH+"ri#gorhf[irhBCcrh07_rgs+[rg`tW -rgN_Prg;i7qj@ANqjRMRrg`tYrgs+]rh07arhBCerhf[mri#gsriQ($riuI/rjVm;rk&0DrkJHKrl+lW -rlP/arm1SjrmUksrmq)'rn[J0ro="=roj@Grp'LNrpTjUrpp'[!VH!ao_\@]p\t!cqYU3frVQSFs8)bH -s8)cjrVl`lqtp3gq#:!dp&=U_o)A1Yn,DbSm/H>MkPjWCjo46<i;VU4gA]b(f)F.tdJhJkbl5caaSs*V -_Z%@M^AbbD\c/u:ZN7D=qlp(%ri?$srhf[krhKIeqk*kYrg`tVrgEbQrg*GHrfmDGqi^W7plPB8plbW? -rfmDIqj.5KrgEbSrg`tYqk*k]rhKIhrhoaori?%#qlp(+rjDa9rk&0DrkSNMrkn`VrlY5arm1SkrmUkt -rn.5(rndY3ro*k<roX4Crp0RMrpKdSrp^$[nc87[o`"O_pA=Xaq>U9gr:p5As8)bJs7lTgrVQKkqYp<i -q#:$ep&=U_oD\7Yn,DbSli-2Kkl0]Cj87d6h>Z1.fDa>"dJhMlc2Poca8X'W_Z%@M^AbeE\,Nf7ZMq'. -XoY].riQ1!rhoalrhBCbrh'1]rg`tWrg<\Nrg!AErf[8BqiC`:oo8j-pl"g(qi1K5rf?r<qi^rBrg!JL -rg<\Srgj%[rh'1`rhBCgrhoapriQ1&rilC-rjDa7rk/6DrkSNMrl+lWrlb;crm:Ylrm^r!rnIG.qr%J6 -roO.CrosFJrpKdS!V#RYnG`%Yo`"O_p\sseq>:$fqtU-bre(6*s82fmrVl`lqu6Hkq>U0gp\smco`"F\ -nc&"VnG_hSli-)Hk5OH@i;VU4h>Z+,fDa>"d/M>ic2Piaa8X$V_#D(I]`,A=[/RB1Yl:d(X8]$tV#dEh -rhKIcrgs+[rgNhRrg3VJrf[8CrfI,?rf6l6reg]2qhOs"qh+$_re(!!reLB,qhkB2rf6u=rfI,Arf[8E -rg3VPrgNhWrh'1_rhKIiri#gsriQ1(rj)O2rjMg=rkABIrl"fUrlP/arm1Sjrmh#"rn7;,rnm_5roF(? -roa:Hrp9aUn,VtWn,DkVo)A:\p&=^bq#:*gqYpBhr;QZfre^Z0s8N#mrV69hq>U0gp\smco`"I]nG_nU -mf)POlMg&Ijo4<>i;VU4g]#n*f)F1udJhDib5TK]_u@LO^](kE\c0);Z2V!,Y5YF"VuEOlU&^heTV2:U -rgWnTrg3VLrfd5@rf6u:reg]3reUH*re19'rdt#tomcsimsY(^pj`0krdt-%qh4s&reUQ1reg]6rf-f: -rfd>Hrg3VPrgWnYrh07brh]Ulri,n"ric=+rjVm;rk&0Erk\TOrlG)]rltGirm^qurn7;*rndY4ro="> -rosFI!UK%Oli->On,DhUoD\F^pAXgcq#:*aqtU-ere^Z6s7lTjrVl`lqu6Hkq#:$epAX^`o)%qUmf)SP -l2KoGk5O?=i;VX5gA]b(f)F(rd/M>iao9?[_u@IN^&GYC[JmN3Yl:g)X8]'sU]."eTDkD^RfT"JrgEbN -rfmDErfI,>rf-o7reUQ.re19'rdt-"qg\ToqgJ6dpj2CSpj2^^rdFZmrdXfqrdt-%re19*reUQ2rf-o; -rfI,Arfd>HrgEbTrgs+]rh9=dri#grriZ7)rj2U3rk&0CrkSNNrl4rZrm(MhrmC_rrn.5(rnm_5ro*k= -roX=HklBuIm/HDLnG`%Yo`"R`p\ssbqYpBhr;QZirf$l<s82fmrVl`lqu6Hkq>U0gpAXaao`"C[nG_nU -li-2Kkl0]Cj8S!9hYu:/g&BM#df.Slc2Pia`r<gR^](qG\,Nf7Z2Us+X8]*tV#I+fTDkG]S,SfSP5paH -P*5g*rf6u:reg]1re:?(rdk'!rdXoqrd=]lrd"Kfrce6^rcJ$Yqf:h=olC%QqfMg[rce?drd"Kird=]n -rdXotrdk'$re:?,reg]5rf6u=rfR2Drg<\Rrgs+]rhBCfri,muric=+rj;[6rk8<Grk\TRrlP/arm1Sl -rm^r#rnIG/ro!e9!TiDCjo4KCl2L#Jn,DhUnc&1[p&=[aq#:*gqYpBhr;QZfrf[;Bs8N#mrV69hq"sgb -p&=U_o)A.Xmf)SPlMg#Hk5OB>i;VU4g&BY'f)F%qcMl&ea8X'W_>_1J])K2<Zi73.Xo>=!VZ*=hT`1M] -S,ScRQ2ZsGO8t7@NK*pqreLK-re:?&rdautrdFcmrd"Kfrce?brcJ$Yqf2LPrbpD+rbqRNrc.pYqfMg\ -rce?drd"KirdFcqrdb!!re:?+reLK2rf-o=rf[8Grg3VRrgj%]rhBChri,n!rilC.rjVm<rkABJrl"fV -rlkAerm:Yqrn%/&rndY4!TN)=ir8*>kl0lHm/HGPnG`"XoD\F^p\Xa\qtU-erf[;Hs7lTjrVl`lqu6Hh -p\smco`"FYn,D\Qli-,Ijo49=i;VR3g]#e'e,I_ncMl#daSs'U_#D(I\c0&:Z2Us+X8]*tU]-tdTDk>Z -R/WBMOoCIANrFn9L]N<freCE(rdautrdFcnrd4Whrc\9_rcA'Zqf)FNphg"HqeP#&rbMCIphfnHqf)OT -rcA'\rc\9crd4WlrdFcqrdk'#reCE.reg]8rf@&@rg!JMrgWnZrh9=dri,muric=+rjDa9rkABIrkeZU -rlY5crm:Yormq)'rnRV5huM^7ir8*>kl0oImJHAOo)A:YpAXg`qYpBhr;QZirg!MNs82fmrVl`lqu6Hk -q#:$epAXaao`"C[nG_nUli-/JkPjK?iVqa6g]#h(ec*qpcMl&e`r<mT^](qG\c0&:Yl:d(X8\spU]-nb -Sc5&VQN!$GOT(:>MZ/D1L&QW'J,t1NrdXoprd+QhrcS3^rc8!WqeuINrbVRLrbDFGqe,n?rakb5ojdc+ -qd]2-ral(@qe,nBrbDFJrbVRNrbq[Qrc8!ZrcS3crd4WlrdXotrdk'&reUQ2rf6u=rfR2GrgEbVrh'1a -rh]UpriZ7)rjMg:rk8<Grkn`TrlkAerm:Yprn%8+gAp"-hu;U6ir8-?l2L#Jn,DhUnc&1[p&=[ap\t!f -qYpBhr;QZfrgWqTs8N#mrV69hq"sgbo`"I]o)A.Xmf)SPl2KlFjSn*:hYu=0f)F1udJhDib5TK]_Z%=L -]`,D>[/R</XT#0tV>d1fT)P5YQi<6KOT(:>MuJS4L&Q`(JGsutHNAJ?rd"Kerc\9_rc.pVrbh^OrbMLJ -rb21Arau.@qdf\9raPY2ojIQ%nmM6$raPk:qdf\;rau.Bqe5tDrbMLLrbh^Rrc.pZrcS3ard"KirdOis -re(3(re^W4rf6u>rfmDKrgWnYrh9=fri#gtrilC/rjVm>rkJHLrlG)]rltGirmUu"ec=;#h#?./i;Vg: -kPj`Fm/HGPnG`"XoD\C]p\Xa\qtU-ergWqTs8N#prVl`lqu6Hhp\smcoD\=Xn,D\QlMfrFj8S!9hYu:/ -g&BG!d/M>iao9<Z_Z%=L]DfA?ZMq',Xo>3sU]-nbSc5&VQN!$GO8b.<M>i8/K)U<"If=`oGQ;mfG'<k, -rc.pVrbqdQrbVRLrb;@Frb)4@qd]M3ra5Y4qd9,)pg*>npg*Z$qd9>1ra5Y4raGe9qdf\=rb2:FrbMLL -rb_XQrc%jVrcJ-_rcnEirdFcrrdt-(re^W6rf@&@rg*POrgj%\rhKIiriQ1(rj)O6rk/6FrkeZSrlP/b -rm1\odK%_pg&Bb*hYuI4jSn<@lMg/In,DkVoDA7\p\Xgdqtp<jrVQS`s.98irqlZnr;6BjqYp9hp\smc -o`"I]nc&%Wmf)MNkPjTBir7m8hYu1,ec+"rd/M8gaSs'U^](qG[f3W4YPtX&W;`UlT`1M]Rf8NMOoCF@ -MZ/D1K`6N$If=`oH2`$eFT-7[DujosrbqdPrbDFHrau.@rac";raGe5ra>_4ra,J-r`oG,r`];(oiU?X -nlYlor`];*qcs,+qd080ra5Y5raPk;ral(@rb;@IrbVRPrc%jVrcJ-_rd"KjrdOisre19+reg]9rfR2D -rgNhWrh07drhoasric=-rjMg>rkSNMrlG)^!RT0nd/MJmf)F>$hYuI4ir8'=kl0lHmf)\Snc&.Zp&=[a -p\t!fqYpBhr;QZlrgs.]s7lQfqu6Ejq#:$eo`"I]nc&%Wmf)SPkPjTBir7m8h>Z.-ec+%sci2,ea8X!U -^](kE\Gif5Y5YL$V>d7hTDkA[R/W?LOT(7=MZ/>/KDpB"IK"QlGlDgaEr0bTC]S?grbDFGrau.?raYq: -qdBD0ra#;'qcWo#pfGX=pfI>pr`T##ra#M0qdBD4raYq<rau.CrbDFKqeuISrcJ-ard+QlrdXp!re:?/ -rf$i<rfmDLrg`t[rhBCgri?%%rj)O5rk&0Erkn`U!R&XdbPoiedf.ergA]n,i;Va8jo4HBm/HDOnG_tW -oD\C]p\sseq=sj^rLX%_s8N#mrVQKkqYp9hp\smcoD\=[n,DbSm/H;Ljo4<>hu;I2g&BV&dJhJkbl5W] -_u@FM]Df8<ZMq',WrAmpT`1P^SGnfQP5^OAMuJP3L&QW%If=`oGlDjbErL%WDZ4MPC&hoJBP@BXraYq: -ra5Y4ra5Y2r`oG,r`]2%r`K/#pf7;mr_reoe5?*@r_reqqc3MoqcNi#r`];*r`o>,ra>_4raGe9rb)4E -rbDFLrbh^Src8!]rcnEirdOisre:?-repc:rf[8Grg`tZrh07fri5t$rj)O4rk&0ErkecV`W4$Xbl5oe -dJhbsgA]q-hu;X7jo4QEli->On,DkVoD\I_p\ssbqYpBerVQSis/5nrrqQHkr;QTmqYp<iq#:!dp&=U_ -nc&%Wn,DVOkPjTBiVqa6h>Z%*eGdhoc2Pf``W![P^&GVBZi73.Xo>3sU]-nbS,S`QP5^OAMuJP3K)U<" -J,X`mGQ)^`E;jeTDZ4DMB`;WC@fTs=@Uf=Dra>_3r`oG,r`];'r`8nrr`&kqqbm;gnkf<]r_W8`peLT[ -r_WSinkf<_peq)ir`&ksqc<\ur`T5)r`oG.ra>_4raGe9rau.CrbDFMrbqdTrcJ-_rd"Kmrdk'#reUQ3 -rf@&Arg3VRrh'1brhf[srilC.rjr*B!PlJN_#D=Pao9Qad/MPofDaV*hu;U6jo4KClMg8OnG_tWo`"O_ -pAXjdq>U6iqu6NjrVQSls/5nirVl`oqu6Ejq#:$ep&=U_o)A.Xmf)SPkPjTBir7m8h#?"+eGdkpcMkoa -`W!^Q^&GP@[/R</XT#0tUAgb`S,S]PP5^OAM>i;0KDpB"HiA<iFT-=[DuOYRD#S2KB)Z??A,]j9?3+A= -ra#M-r`];(r`B)"r`/qsqc!Ahr_NMiqbQu^peBR<peCNYqbR2fr_NMir_`Ynqc*Ppr`9#"r`T5(r`fA- -ra5Y4raYq=rau.ErbMLNrbqdVrcJ-brd=]pre(3)re^W8rf[8GrgWnZrhBCjri?%&rj;[8!PQ/H^&GkI -`W!sXcMl5jeGe/#h#?72ir8'=kPjiImf)_To)A7[p&=^bq#:*gqu6NdrMT[qs8N#mrVl`oqu6Hkq"sgb -o`"FYn,D\QlMfoEj8Rs8h>Z+,f)F%qc2Poc`;[UP^](bB[/R9.X8]!qUAgeaRf8WPOT(7=MuJD/Jc:/u -HiA9hFT-7YDZ4MPCAqoGB)Z9=@/aO4>l\+1>[784r`K/$r`9"ur`&kpr_`YkpeUlaqb?`Wpe0F8pe10O -r_<8bqbR2fr_`Ymr_rerr`9#"r`K/(r`oG.ra5Y5raPk=rb2:Grb_XQrc%jYrce?grdXp!re19/rf6u> -rg*PPrh'1arhoarric=.!P#W>\Gj8B_Z%LQbPofdd/MVqg&Bh,hu;X7jo4QEm/-8No)A:\p\XabqYpBk -r:p6friQ4#s8N#prVl`oqYU*fp\smco`"C[nG_nUli-/Jk5OB>hu;I2fDa;!d/M;haSs-W_#CtF\,NW2 -Xo>C#U]-qcSc4rSPQ$XBMuJJ1K)U<"I/\EjF8g4ZDuOSPC&VcEA,]s7?iF=0>Q._)<WQ6%r`/hor_iVi -r_NMir_EGer_32^r^uiTqaf4,ognsOqb$i\qb6u`r_EGhr_NDfqbmDlr`/r!r`K/(ra#D.raGe9rb)4E -rbVRPrc.pYrd"Kjrdb!"reLK2rf@&Brg*PSrh07cri?%$!O/d.Yl;-2]DfVF`;[mXc2Q)heGe)!h>Z@3 -ir8*>kl0oIn,DhUnc&1[p&=^bq>:$cr;QZlriQ4&s8N#prVl`oqtp3gq#:!do`"I]nG_kTm/H8KkPjN@ -i;VO2g&BM#dJhGjaSs0X_>_(G\,N`5Xo>=!V>d.eSGnoTOoCC?MuJG0K)U9!HN&-fFT-7YDZ4JOBDuNB -AH$!9?N+70>Q.e)=8l2";uortr_r\kqbR)`r_3;aoh+mJogdM$qa^3Joh,3Vr_3;cr_E>dr_WSkr_req -r`/r!r`T5)ra#M1ra>_9ral(ArbVROrc%jYrce?frdXp!re:?0rf6u?rg<\Srh07eri#q#XT5L&Zi7H5 -]DfYG`W!sXcMl5jeGe/#h#?72j8S3?l2L&Kmf)_ToD\F^pA=Xaq>U9jr;6HlriQ4)s8N#prVl`lqu6Ej -q#:$eo`"F\nG_nUm/H>MkPjQAi;VU4gA]_'d/M;hbPoHZ_>_1J\,N`5YPtO#V>d.eSGnlSP5^L@MZ/D1 -JGsurHiA0eF8g+WDZ4GNB`;N@@fBa6?N+4/>5hY'<rQ+u;?0Pp;,R<gr_WSir_EGdqb-o\oh#-Rqa^3H -e4&^nr^ZiVqapZWr_*,^qbI,er_NMjr_i_qr`B)$r`];*ra,S2raGe9rb2:Grbh^Rrc8!\rd4Wnrdb!' -reg]8rf[8Irg`t\rhTXpW;rpsYPtm-\,O,@_>_CPbPofdd/MYrgA]t.i;Vg:kPjfHmJcSRnG`%Yo`"Ua -q#:*gqtp<jrVQSus0Mb)rqQHhqu6Hkp\smcp&=O]nc&"Vm/H;Lkl0T@i;VX5f`'G#dJhDiaSs-W_#CtF -\,NW2XT#3uU&LY_S,SWNOoCC?LAli)J,XipGlDgaE;j_RC]7rFAH$$:@/aL3>lIk)<rQ+u;Ys>j:]O8l -:J^sbr_3;ar_!&Zr^coVog\gIqaA:gogJdJnj`UKqag]Xr_!/_r_3;dr_NMir_`Pjr`/r!r`K/)ra#M2 -raGe:rau.Frbh^SrcJ-`rd=]pre(3)rf6u>rfd>Nrgj.aT`CecWW'%!Yl;-2]DfVF`;[mXc2Q,iec+5# -hu;U6ir80@l2L&Kn,DkVo)A=]pAXg`qYpBerVQT&s0Mb)rqQHkqu6Hkq>U-fpAX^`nc&%Wmf)MNkl0`D -i;VR3g]#b&df.SlaSs0X_>_(G\,N`5Xo>9uU]-nbRf8WPOT(4<M>i,+J,XipG5cR^DuOVQC&VcEA,]p9 -?iF:/>5h\(<W5ts;uTVj:]=)h9`[s_r_3;`qapcXqa^WTogSaGYXA(OqaLBOr^ZiVr^luZr_3;cr_EGg -qb[8jr`&ksr`T5(r`fA/raGe9rb)4Frb_XQrcA'^rd=]prdt-+rf-o=rg*PP!M>taTDkVbW;`puZi7H5 -]DfYG`W!sXci2Alec+>&hYuI4k5OTDlMg5Nn,DkVo`"O_p\t!fqYpBerVQT&s0Mb)rqlZnr;QQlq>U0g -pAX^`o)A.Xmf)SPkl0]Cir7m8h#?"+df.Slbl5Q[_>_4K\,N`5YPtL"V#I"cS,S`QOoC@>M#N&+J,Xfo -GlD^^DuOVQC&V`D@fBd7?N+4/=oMP&<rQ"r;>sAj;#X5h:&[fd9*%[Yr_!&Zr^cfRpdP0Mj$V<_ksP>9 -pdOsIqag]Xr_!/_r_3;cr_EGhr_NMjr_i_rr`B)%r`oG.ra>_7rau.Drb_XQrc.p^rd4Wore(3+rf-o> -rg!SSRfJrWTDkYcW;a""Zi7H5^])+L`;\![ci2Alg&Be+i;Va8k5OTDm/HDOnG`"Xp&=[aq#:*gqYU3i -rVQT&s1/1/rqQHkr;QTmq>U0gp\sgao)%qUm/H8Kjo4<>hu;C0fDa7ud/M5fa8WmR]`,G?Yl:d(WrA^k -T)P5YPQ$[CN;eM0Jc:/uGlDjbEW0nUCAqlFA,]p9?iF=0>5hY'<W5ts;Z9Ml:]=,g9`@]a9)_B^8-)7P -r^Z`QqaLKPksM[AlpLY<r^HTOr^ZrYr^m)]r_*5ar_EGgr_WSlr_rerr`K/'r`oG0raGe9rb)4GrbqdU -rcS3brdXp!re190rf7)DP5pgGS,T#YU&M(kXo>R(\Gj/?_#DCRbPolfe,Itug]$+0ir8'=l2L&HnG`%Y -o`"Uaq#:*gqu6NjrVQT)s1/1/rqlZnr;6Bjq#:$epAX[_o)A+WmJcDMkl0WAi;VR3fDa;!d/M8gaSs*V -^&GP@Zi7-,WrAjoTDk;YQ2ZmEN;eY4Jc:,tHN&$cEW0nUCAqlFAH$$:?iF=0=oMM%<W5qr;Ys8h:&[ic -9)_EZ8,u0X8,,OP7,pY=6Kpl77/04M8,,XS8cD?]9`@c`:]=5j;uTer=8lA%>lJ(/@K'g:BDuZFDuOeV -FT-UcIK"fsM#N;5OH9I(rg!JOrh'1dri,n"rj2U6rk8<Krl>#^rm:Yorn%/*ro!e9roj@HrpB^Rrpg!Z -rq??crqQKiqu$Hlqu4/+\c;[.qu-EhrqcWgrq??arpp'XrpKdOrosFEro!e3rnIG&rmLelrlG)WrkJHD -rjDa/ri?$prh07[rg*PGrf$i3rdt-!rd+Qfrc%jSrbVRHrabn5r`oG+r`9"tr_`Ykr_NMgr_3;ar_!/] -r^d#YrC6]SqaLKPmmE@,mmHt?r^HTOr^ZrYr^m)]r_*5aqbI,er_`Yor`9#%r`o>-raYq?rbVROrc%j\ -rd4Wordt-)!K;s;N;et=QN!BQT`1hfX8]=%[/RZ9^])1NaSsNbdf.erg]$(/i;Vm<kl0oImf)_To)A=] -pAXg`qYpBkrVQT)s1JC2rqlZnr;QQlq>U0gpAX^`oD\7YmJcGNkPjTBiVq^5gA]\&d/M8gao90V^AbbD -Zi70-X8\mnT`1J\PQ$[CNW+V1Jc:/uGQ)^`E;j_RC&V`D@K'X5?2dt*<rQ+u;Z9Pj:]=&e9D_<[8GG[Q -70,hGr^?3BK0o#oqaCEPpdY-Or^m)^r_<8cr_`Ymr`/r!r`K/*ra5Y5rau.Drb_XRrcJ-`rdXp!!JH++ -K`6u1OT(ICSGo/[U].=nYPtm-]DfSE_Z%[Vc2Q)hf)FA%hYuL5jSn?Ali->OnG`%Yp&=[aq#:*gqYU3i -rVQT/s1eU5rqlZnr;QTmq>U0gp\sjbo`"C[n,D\QlMfrFj8Rs8g]#h(e,IYlb5TE[_#CtF\,NW2X8]$r -T`1J\R/W3HN;eY4Jc:,tHN&$cEW0kTB`;TB@fBd7?2e%,<rQ+u<;o_n:]=,g9`@]a9)_BY8,,OP6i]U> -6c_Uh6,c1W6i0:H7K,gS8H)6\9E%Wa:B"&g;#XGn<W6%u>5he+@/aX7B)ZKCDZ4YTFT-UcI0"nM!.k-* -rf$i<rg<\Trh07griH+'rjVm=rkSNQrlY5crmUkurnIG0ro="?rp'LLrpTjVrq$-^rqHEerqZQjrquZl -rr0\4^]4<4qu-Nlrql]jrqQKerq-3\rpTjSrp0RIroF(;rnm_.rmh"prlkA^rkeZJrjVm4riQ0trhBC_ -rg3VIrf6u7re(3"rd+Qfrc%jRrbMLEraYq7ra#M,r`K/"r_r\jr_EGdr_!&Zqa^WTqaLKPrBp0D^I%oc -q`t-H^I%BVqaCEPqaUQTr^luZr_3;cqb[8jr`/r"r`];,ra5Y6ral(Erbh^Srce?g!IoS!J,Y*"M#NG6 -P5^jJSc5A_W;`puZMqB5^&GnJa8X<^d/MSpg&Bn.ir8$<kl0lHmf)\So)A:\p\sseq>U9jr;6HlrkJKM -s8N#prVl`oqu6Hkq#:!dp&=O]nG_nUli-,Ijo43;h>Z.-eGdkpci1r`_Z%=L[f3T3YPtEuUAgeaQN!'H -NrFe4K)U9!GlDgaE;j_RB`;TB@K'X5>lIk)<rQ(t;>sDk:]=&e9E%Q_8GbpV7f,XR7/'(B6c_UM5fH(\ -6i0:N7JfRR8,GjV9)_K_9`@ie;#X>k<;oqt=T2S)?N+C4Ac?ECD>nMRFTH`3!-nKmre(3)rf6u@rg*PU -rhKIiric=-rjMg@rkn`Trm1Slrm^r$rn[S3roO.Crp0RPrpg!Yrq69brqQKhrql]mrr)`n_Z.LQq#13h -rqcWirqHEcrq69\rpTjRrp'LGro="8rnIG)rmLekrlb;YrkJHErj2U-ri5slrgs+Xrf[8@reg]-rdXoo -rcS3\rbqdMrau.=ra5Y0r`];%r`&kpr_WShr_<AaqapQQqaLKPoL&=>d6dUoh*Ca$c9gkbqaCEPpdb<T -qb$i^r_NMir_i_pr`9#%r`oG0raPk=rb;@Mrc/$^FT?R`HiANoKDpc-NrG4@Rf8oXUAh1lY5Yd,]DfSE -_u@jYci2Alf`'Y)hu;[8kPjcGmJcSRnc&4\pAXgcq>U6iqtU-,s2+g2rVl]nqYp<ip\smcoD\7Ymf)SP -kl0ZBi;VR3g&BP$d/M8ga8WmR]`,G?Yl:^&VZ*7fS,S`QOT(1;LAl`&I/\BiEW0nUD#S&GA,]j7>lIq+ -=T2;!;>sAj:B!ue9`%E\8GG[R7.*DC6USp]b<X$5njE:BpdY-Or^m)_r_<Aer_NMkr`&l!r`T5*ra5Y7 -rau.Grb_aVE<("XGlE'hJGt<&MuJh;QN!BQT`1hfX8]@&\Gj/?_#DCRbPolfec+8$h>Z@3jo4KCm/HDO -nG`%Yp&=^bq>U6iqtU-,s2G$;rqlZnr;QQlq#:$ep&=R[nG_eRl2KfDj8Rs8gA]\&dJhDia8WsT^&GM? -ZMps)VZ*7fRf8TOOT(.:L&QW%I/\?hEW0nUCAqlF@K'X5?2dt*<rQ(t;#=&f9E%Q_8cD9[8,c!T7K,^G -6i'-q6FfA#6M3_C7/fXS7fGpW8H)3[9)_K_:]!uf<;oqt=T2V*?iFL5BDuZIDf5Vorc.p\rd=]qre:?/ -rfI,ErgNhZrhf[rrj)O5rk8<JrlG)`rmC_qrn@A/ro3q=rosFKqsaUVrq69brqZQiqu$Hlqu4\:aT)8= -qu-Nlrql]jrqQKerq-3\rpTjRrp'LHroF(:rn[S*rm^qnrlY5ZrkSNErjDa/ri#gkrh'1Urf[8@reCE( -rdOijrcA'WrbDFFraYq8ra#M,r`9"tr_`Ykr_EGdr_!/]r^d#Yr^QcRr^?3BqEih$pd)GUpd*1lnjECE -qaLKRr^ZrYr^m)]r_3;cr_WSkr`&ktr`];+ra>_8rau7HC&i#JDuOhWGQ*'jK)UN(NrG4@QN!NUU].4k -YPtp.])KME`W"$Zci2DmfDaV*iVqp;kl0lHmJcSRo)A:\p\sseq>U9jr;6HlrlG,\s8N#prVl`oqu6Ej -q#:!doD\:Zn,DYPl2KlFiVq^5g]#_%dJhGj`r<jS^AbS?Z2Um)U]-qcSGn]NNrFt9K)U5uHiA*cE;j_R -BDuH@?iFC2>Q.b(<;oem:]=&e9E%N^8H)-Y7f,XR7.N_;6J+W&5g)Le6i0:N7JfRR8,c'Y8cDB^:&@`c -;Z9Yp=T2M'?N+=2@f^4T!,):Jrc%jXrd4Wordt--rf@&Arg`t[rhKIprj)O3rkABKrl4r_rmC_prnIG/ -ro*k>rosFJrpTjVrq$-_rqHEfrql]mqu-NnaT'H`rr2fnrqucmrqcWgrq??`rpg!WrpKdLroX4?ro!e1 -rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJraYq9ra5Y,r`9"ur_`Ykr_NMd -r_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5dr_WSkr`/r!r`K/,ra>h;@fU$< -C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYrg]$.1j8S3?kl1#Ln,DkVo`"O_ -p\t$gqu6NmrVQT;s3(HArqlZnqu6Hkq>U-fp&=R^nG_kTm/H2Ijo46<h>Z(+eGdenb5TE[_#CtF[Jm?. -WW&[lSc4uTP5^F>L]2o)I/\?hErKtUCAqlF@K'X5>lIe'<W5ts;#X5h:&[ca8cD9[8,c!T7K,^D6h*M+ -6N0935lO(!6LmMC7/KFP7fGpW8H)3[9)_Qa:]=2i<;ons<rQA'?3+JC!+Gk>rbDFMrc8!^rd=]sreLK3 -rf[8Jrgj%`ri#h!rjDa:rkSNQrlb;erm^r#rn[S4roF(Arp9XPrp]pYrq69brqZQirql]nqu4e=bQ%S@ -qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXol -rcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Acr^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQT -r^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtL -ao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[aq>U6iqu6Qkrlb>es8N#prVl`oqYp9hp\sjboD\7Yn,DYP -kl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1YDZ48IA,]j7>lIn*<rQ"r -;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^:&[rf;>sJm<rQ2%>[.86 -ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUkurndY4ro="Arp0RPrp]pY -rq69brqZQiqu$Hlqu5"CcN!nCrr)iorql]jrqQKerq69^rpTjRrosFFro3q7rnRM'rmLekrl4rRrk8<= -rilC&rhKIargEbJrf-o6rdk&srcnE^rbh^Nrac":ra,S-r`B(ur_WSir_EGcr_!/]r^ZrWqaLKPmmH;* -o0S!nnNb\mnjECEqaLKRr^ZrZr_!/_r_EGgr_WSnr`9,(=o_b*?N+C4AH$BDDZ4YTGlE*iJc:N*NW,(> -RJrfWU].=nYl;'0^&GnJ`r=9_dJh\qh#?41ir8-?lMg2Mn,DnWp&=^bq#:*gqu6NmrVQTAs3CZDrr2lq -r;QTmq>U0gp\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pb -E;j\QB`;H>?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N` -:&[ug;Z9\t=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A, -ro!e;roj@IrpTjWrq-3arqQKgrql]mrr)`ndJqVorr2fnrquclrqQKdrq69\rp]pTrosFEro3q7rn@A' -rm:YgrlG)Srk&0;ric=#rhKI`rg3VHreg]/rdauorcS3ZrbMLGraYq8r`oG*r`/qrr_NMgr_3;`r^m)[ -r^QcRr^?<Ei'IE0!C9#&5hSF%6/=m#6i0:N7K,dU8,c*Z9)_K_:B"&g;?9ct!*0#$r`oG1raYq?rbMLP -rcS3drdb!%reg];rg3VTrhKIlric=/rk&0FrlG)_rm:YrrnIG0ro3q>rosFMrpTjVrq69brqQKhrqlTk -rr1=FdJs4Fqu-NlrqcWgrq??arpg!Vrp9XJroO.<rn[S+rm^qnrlY5ZrkABBrj2U*rhf[frgNhNrf@&6 -re(3"rce?_rbqdLral(;ra#M,r`K/!r_`Yjr_3;`r^m)[r^ZrWr^HfSmmH,%rBUHM6%M;P5lO(-6LmMC -7/fXS7fGpW8H)3[9E%Wa:]=5m<)`isr`K/'ra#M3ral(BrbqdWrce?kre(3*rf@&CrgNhZrhf[rrj2U6 -rkABNrlY5drm^r#rn[S4roO.Crp9XPrpg!\rq??crqcWkqu-NndJq_rrr2fnrqucmrqcWgrq??_rp]pS -rp0RHroF(9rnIG'rmLejrlG)Vrk/6=rilC%rhTOcrg*PGrf-o1rdauqrcS3[rb_XIrac"8r`oG*r`9"q -r_WShr_*5_r^luWr^QlTnjD5"rBPp!d6QMSogAUEqaUQTr^m)]r_*5cr_EPl;#jJm<rQ5#>lJ+0A,^-? -D>nPSFoHdfJGt6$NW,+?QN!NUV#ICnYl;*1]`,hJaSsH`df.ktg]$+0j8S6@li-;NnG`%Yp&=^bqYpBk -r;QZlrm^tts8N#prVl]nqYp<ipAX^`nc&%Wm/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQL -NW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO -7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8rbDFLrc%j]rd=]qre^W6rfR2Lrh07driZ7+rjVmArl"fX -rm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQirql]nqu5+FeGoOIqu-NkrqcWhrq69^rp]pTrp0RJro="9 -rn[S)rmLekrl4rSrkAB=ric=%rhBC_rg<\Hrepc1rdXonrcS3YrbMLHraPk6r`oG'r`&kor_NMer_*5^ -r^d#YpdOa@j$NW/qETTsb<Z%mi'R*(pdP0Pr^d#[r_*5b!DcJk:]=5j<;oqt>lJ+0@fC'?C]88OFoH^d -J,Y3%MuJh;R/W]VUAh4mYl;$/^Ac"K`r=9_df.hsh>Z@3j8S<Bli->OnG`%Yp&=acq>U9jrVQTDs4%)J -rr2lqr;QQlq#:$eo`"F\n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"Kj -F8g(VCAqfD@/aI2>5hP$;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha -:/1dar_NMkr`/r$r`oG1ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5 -roj@HrpB^Rrpp'\rqHEfrqcWlrr)iqeGn%uqu-NlrqcWhrqHEarpp'Wrp9XJroO.;rnRM+rmC_jrlY5W -rk8<?rilC%rhTObrg<\Ireg]/rdXomrcJ-XrbMLFraPk6r`fA(r_reor_NMfr_!/]qa^WTr^?EHi'RE/ -nN_Xj`BaDgh*V!+qaC<Nr^ZrZr_!8d9`Roe:]=5j;uTnu>Q/"/@fC$>C]88OFT-RbJ,Y-#MZ/b;Qi<TU -V#ICnYl;-2^&GnJb5TZbdJhhuh>Z@3jo4KCm/HJQo)A:\p\t!fqYU3irRCkss8Murr;QTmq>U0gpAX[_ -nc&"VlMfuGj8Rs8g]#k)d/M8gaSs!S]Df5;Xo>6tUAgV\Q2ZjDM#N&+If=NiErKtUB`;TB@K'R3=oMJ$ -;Z9Ml:B!oc9)_E]8,c!W7Iih+6Mj(=5_22;5lO(-6M3_F7K,dU8,c*Z8c_RX!)*;dr_WSlr`9#$ra#M3 -ral(Brbh^Urc\9irdt-*rf@&CrgNh\ri#gurjDa;rkSNSrlkAgrn.5)rnm_8roa:GrpTjVrq$-_rqHEf -rql]mrr(@HfDkjLrr)iorql]jrqHEbrpp'XrpKdMroX4>rndY.rmh"orlY5[rkJHCrj2U)rh]Udrg<\K -rf6u3rdk&rrcJ-Yrb_XHraPk6r`];&r`/qor_EGer_!/]r^d#Xr^HfSnjDG(lTg"d^Hg^DogA^Hr^HfU -r^d#[!D5ra9)_Qa:]=2i<W6,">5hn.A,^*>D>nPSFT-[eJGt9%NrG4@R/W`WV>dOpZi7N7^])7PbPoie -ec+8$hYuO6k5OWEmf)_To)A=]p\t!fqu6NmrVQTJs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2 -fDa4tbl5Z^_Z%1H[JmB/W;`RkT)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U -7K,^M6fUN460LRb5eKA]6/t<,6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcs -reg]8rfd>QrhBCjric=/rk&0Hrl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfn,rr2fn -rquclrqHEcrq-3ZrpB^NroX4?rnm_0rmq(rrlb;\rk\TErj2U,rh]UergWnMrf-o5rdauprce?\rbVRI -raPk6r`oG'r`&kor_NMer_*5^r^d#Xr^HfSog@k.qa'F2JO$b2r^#[5ogA^Hr^HfUr^Qu\8H;?]9E%Zb -:]=5j<;oqt>lJ+0@fC'?D#SDQGQ*!hJGtB(NW,+?S,T)[V>dXsZi7N7_>_IRbPoogf)FG'hu;[8k5O]G -mf)_To`"O_p\t$gqtp?krn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49=hu;=.ec*nob5T?Y^](_A -ZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\8,c!W7.iq-6K17]5dir9 -6Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1rfI,Hrgs+`riQ1*rjVmA -rl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOgAh0Orr)inrqcWirq??`rpg!Vrp0RJ -ro="9rn[S)rmLelrl4rSrkAB<ric=$rh07[rg!JDreUQ*rd=]hrc.pRrb2:@ra>_1r`K/!r_i_kr_<Aa -r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_*5br_NMkr`&l!r`fA0raYq?rbVRRrc\9grdt-+rf@&D -rgWn[ri5t#rj2U<rkeZSrm1Smrmq))ro!e9rosFKrpTjVrq-3`rqZQirql]nrr1XOgAh0Orr)inrqcWi -rq69^rp]pTrp0RIro="9rnRM&rm:Yhrl"fOrk/69riQ0trh'1Xrfd>?reLK(rd4Werc%jPrau.=ra,S- -r`B(tr_`Yjr_*5_r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_!/_r_NMjr_retr`];-raPk>rbMLP -rc\9frdk''rf$i?rgEbXrhoatrj)O9rkSNOrltGirm^r&rnm_8roj@HrpKdTrq$-^rqZQirql]nrr1XO -h>dKRqu-NkrqcWhrq69^rp]pTrp'LGro*k5rnIG$rm:Ygrkn`Mrji$4ri?$prgj%Trf[8<re19#rcnE` -rbqdLral(;ra#M+r`B(sr_WShr_*5_r^d#Xr^HfSpd<k(i]r&[[QrY8pd>$Kr^?iW7K>pW8H)3[9E%]c -;#XAl=8lD&?2e:3Ac?BBDuOkXGlE3lK`6l.P5^jJSc5JbWrB7%\c0>B_u@mZci2Dmg]$(/iVr$>lMg5N -nG`%Yp&=acq>U9jrVQTMs5!_SrqlZnqYp9hp\sgao)A+Wm/H5Jjo43;h#?"+df.Pkb5T6V]`,A=YPtL" -UAgV\Q2ZjDL]2o)If=KhErKtUB)Z<>?iF:/=8l5!;#X5h9`@W_8H)-Y7K,^J6fp_g5_22&5itE+6iKIS -77@2Fr^ZrYr^m)_r_EGhr`/r"r`fA/raYq>rbh^TrcS3hrdt-)rf@&CrgNh\ri,n#rjMg=rk\TVrm(Mk -rn7;,ro!e;roj@JrpTjWrq-3arqZQirr)`nh>c=2rr2fnrqcWhrqHE`rpg!Vrp0RIroF(:rnRM*rmC_i -rlP/Trk&0;riQ0trh9=Zrfd>Are:?&rd=]erc%jQral(<ra5Y-r`B(tr_WShr_3;_r^d#Yr^HfSog@k. -fg(*RX[)#8ogA^H!C]EW7K,gV8H)3[9`@cc;#XDm<rQ8$?iFO6Ac?NFE;jtYI/\ZqL&R,3PQ%!LU&Lth -Xo>a-]DfVFao9QadJhetg]$.1jSnBBli-APnc&.Zp\t!fqYpHjrn[V1s8N#srVl`oqYp9hp\sd`nc%tU -lMfuGj8Rs8gA]\&d/M8ga8WmR])K)9X8\poTDk/UOoC@>K`6K#HiA'bDZ4GNAH$$:?N+(+<W5nq;#X5h -9`@W_8H)*X7.iq-6J4VT5cm<06Mj.J6i]XS7fGpW8cDE_:&[ug;Z9_r=T2Y+@K'g:C]88OErLFbJGt6$ -NW,+?QN!NUV>dOp[/RZ9_#DCRbPolff)FG'hu;[8kPjcGmf)_ToD\L`q>U6ir;QZorn[V1s82cor;QNk -q#:!do)A.Xmf)GLjo46<h>Z(+eGdhob5T?Y^&GM?Z2Ua%U]-nbPQ$XBMZ/2+IK"KjE;j\QC&VT@?iF=0 -=8l5!;>sAj9`@Z`8H)-Y7fGgK6fUMd5_22&5i>!+6i9=P7/f[T8,c'Y9)_N`:]=5j<;otu>lJ+0@fC*@ -D>nMRGlE*iJc:Q+NrG7ATDkYcWW'1%\,O)?`;[pYd/MPog&Bh,iVqs<kl1#LnG`"XpAXgcq>:*hrS@M0 -s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3f`'A!cMkrb_u@=J[f3N1VuEChSGn]NNW+b5JGsopG5cI[ -D#S,I@K'U4>Q.\&;uTVm:B!oc8cD6Z7fGjI6gR/76.nMS5cm<H60U`06NBLQ7K,dU8,c*Z9E%]c;#XGn -<rQ>&?N+C4B`;fHE;k%[I/\ZqM#ND5P5_!NU&LthYl;*1]`,hJaSsKae,Ituh#?:3jo4KCmJcSRnc&4\ -p\t!fqu6NmrS@M0s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3fDa4tc2Pc__Z%1H[/R9.V>d.eS,SNK -MuJJ1J,XcnFoH=YCAqlF@/aI2>Q.Y%;uTSl:&[ca8cD6Z7fGjO6fp_^5_21r5itE/6NBLQ7K,dU8,c*Z -9E%Zb:]=8k<W65%?N+@3BDu]GDuOnYHN&EnLAm/2OT(aKT`1eeYPts/]Df\HaSsH`df.kth#?:3jo4KC -mJcSRnc&4\p\t!fqu6NmrS@M0s8Murr;QTmq#:!do`"C[mf)POk5OE?hu;@/f)F(rbPoK[_#CnDZi7-, -U]-kaRJr<IMZ/;.IK"KjF8g%UB`;QA@/aF1=oMD";Z9Jk:&[ca8cD3Y7K,^M6fp_^5_21r5itE/6NBLQ -7/fXS7fH!Y9E%Zb:]=8k<;p&">lJ.1AH$<BD>nVUGlE-jK`6o/OT([IT)PMaY5Yd,\c0DD`r=0\dJh\q -gA^"/j8S3?li->Onc&1[pAXjdqu6NmrS@M0s8Murr;QTmp\smco`"C[mf)POjo49=hu;=.ec*qpb5TBZ -^](bBZMps)UAg__Qi<'FM>i/,I/\?hErKnSB`;QA?iF:/=oMA!;>sAj9E%Q_8cD3Y7K,^M6fp_^5_21r -5itE/6NBLQ7/fXS7fH!Y9)_K_:]=5j;uTr!>lJ+0AH$9AD#SJSGQ*!hKDp`,O8bLFSc5A_XT#L(\Gj8B -`;[pYd/MSpg&Bn.ir8'=li->Onc&1[p&=^bqu6NmrS@M3s8N#srVl`oqYp6gpAX[_nG_hSli-#Fir7j7 -f`'A!ci2#b_u@FM[f3N1X8\dkS,S]PNrFk6K)U,rG5cL\C]7uGA,]j7>Q.b(;uTYn:]=#d9)_B\7fGjU -7/K@36I7uK5bp['630G@!(6`Rr^HfUr^d#[r_*5dr_`Ynr`K/(ra5Y7rb)4Grc.p\rd4WrreUQ6rg!JP -rh07kriuI2rkJHNrlG)brm^r"rnm_7roO.FrpB^Srq$-^rqHEgrql]nqu5XUi;`fUrr)iorqcWgrq69^ -rp]pSrp'LDro*k5rmq(trm1Sbrkn`Lrj;[.ri5sjrgNhNrepc0rdaunrcJ-XrbDFEraGe3r`T5%r_i_l -r_EGbr^d#Yr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,gV8cD?]:B")h;Z9bs>5hh,@K'j;CAr/N -FT-RbJGt<&MuJt?S,T)[WrB4$[/Rf=_Z%XUci2Dmf)FP*iVqp;lMg2MnG`%Yp&=^bqYpBkrVQTSs5<qV -rr2lqr;QQlp\sjbo)A.Xm/H8Kj8S!9h>Z")df.Sl`r<gR^&GA;Y5YC!TDk8XPQ$I=L&QW%GlDd`DuOJM -Ac?*:>lIn*<rPtq:]=)f8cD9[8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^d#[r_<Afr_`Yq -r`K/)ra>_:rb;@MrcA'`rdb!%reg]=rgEbXri#h!rj2U;rkeZSrm1Smrmq))ro!e9rosFKrp]pXrq69b -rqcWkrr)`nj8\';rr2oprql]krqHEbrpp'Wrp0RJro="9rnRM(rmLekrl+lQrk/6:riZ6urgs+Vrf[8< -re19#rce?_rbqdLrac"9r`oG)r`/qpr_NMfr^m)[r^QlUr^?NKksGA8bs6hFTg8TCk!B)96iBCO7/fXS -7fGpW8cDH`:]=5j<W6,">lJ.1Ac?BBDuOhWGQ**kK`6l.P5^jJT)PYeXo>[+]`,_G`W"0^df.hsh#?41 -j8S<Bm/HJQo)A=]p\t$gqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1eGdhoc2PZ\^](kE -Z2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X7/K@66H;?B5at%%63'@O -6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5JbX8]C']DfVF`;\$\dJhYp -h#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I_nbl5NZ -^](kEZ2Ug'V#Hn`QN!!FM#N#*IK"BgEW0hSBDuE??iF4-=8l1u;#X5h9`@W_8H)*X7/K@66H;?B5at%% -63'@O6i0:N7fGpW8cDE_:&[ug<;otu=oMe-A,^-?D>nPSFoHggK)UT*OT(RFSGo>`X8]C']DfSE_u@mZ -ci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5 -gA]S#ci2,e_Z%7J\c/i4WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ -6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-N -U].:mYl;34^Ac"KbPoiee,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl]nqYp<ip&=R^ -nG_hSl2KlFiVq[4g&BJ"ci2,e_Z%7J\Gi`3WW&XkRf8QNNrFb3JGsopF8g+WC]7oE@fB^5=T2>";Z9Ml -:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?KEDuOhWHiAQp -L&R,3PQ%$MUAh.kYl;03^Ac"KbPoiee,J&"h>ZC4kPjcGmJcVSoD\F^q>U6iqu6Qnro=%=s8N#srVl]n -qYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtUC]7lD@K'U4 -=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4AH$BD -DuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6iqu6Qnro=%= -s8N#srVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtU -CAqcC@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3 -AH$?CDZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qn -ro=%=s8N#srVl]nqYp9hp&=R^nG_eRkl0ZBi;VO2g&BCuc2Pia_>_+H[f3H/VuE@gR/W9JNW+S0J,Xfo -ErKtUCAq`B@/aI2=8l5!;>sAj9`@]a8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9E%Zb:]=5j<;otu -?2e72A,^6BDZ4\UHiANoKDpl0P5^jJT`1kgY5Ym/]`,bHao9QadJhhuh#?72jSnBBm/HMRoD\F^q#:*g -qu6Qnro=%=s8N#srVl]nqYp9ho`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/ -J,XcnErKtUCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j -<;otu?2e72A,^6BDZ4\UHN&BmKDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C] -q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-H -N;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N` -:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQ -o)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pf`_#CtF[Jm<-VZ*7f -Qi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6Mj'_5_21`5lO(@63'@I6iKOR -7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEaSsH`dJhhuh#?72 -jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@tbl5Z^_#CtF -[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_5_21]5lO(C -63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEa8X<^ -d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@t -bl5Z^_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_ -5_21]5lO(C63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a- -])KMEa8X<^d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZB -i;VO2g&B@tbl5]__#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W -7JK7C6Mj'_5_21`5lO(@63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^H -T`1kgXo>a-]DfVFaSsE_d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\ -n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj -9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`. -OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9h -o`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/J,XcnErKtUCAq`B@/aI2=8l5! -;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BDZ4\UHN&Bm -KDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C]q#:*gqu6Qnro=%=s8N#srVl]n -qYp9ho`"F\nG_eRl2KiEi;VO2g&BCucMkuc_#CtF[Jm?.W;`LiQi<-HN;eM0J,XcnErKtUCAqcC@/aI2 -=T2>";>sAj9`@Z`8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9)_N`:]=5j<W6,"?2e:3AH$?CDZ4\U -HN&EnK`6r0OoC^HU&LthY5Yj.]DfVFb5TZbdJhhuh>Z@3k5OTDm/HMRoD\C]q#:*gqu6Qnro=%=s8N#s -rVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtUCAqcC -@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3AH$?C -DZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qnro=%= -s8N#srVl]nqYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtU -C]7lD@K'U4=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5# -?N+C4AH$BDDuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6i -qu6Qnro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KiEi;VR3gA]P"cMkuc_Z%7J\,NT1WW&[lRJrELNrF_2 -JGsrqErL"VD#RuE@K'U4=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y -9E%Zb;#XAl<rQ5#?N+C4AH$EEDuOeVI/\ZqK`7#2PQ%!LU].7lYPu$1^&GnJb5T]cdf.u"h>Z@3k5OWE -mJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5gA]S#ci2,e_Z%7J\c/i4 -WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u= -6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-NU].:mYl;34^Ac"KbPoie -e,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1 -eGdhobl5Q[^](hDYl:^&V>d"aQMusEL]2o)If=KhErKtUB)Z<>?iF:/=8l1u;#X5h9`@W_8H)*X7/K@6 -6H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<;otu>Q/"/A,^*>DZ4YTFoHjhK)UQ)O8bFDSGoAaX8]@& -])KJD`;\![d/MPoh#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@ -hu;F1eGdhoc2PZ\^](kEZ2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X -7/K@66H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5Jb -X8]C']DfVF`;\$\dJhYph#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp6gp&=O]n,DYP -l2K`Bi;VO2f)F+scMkf^_>_+HZi7-,VuE:eR/W9JMZ/;.J,XZkF8g+WB`;QA@/aF1=T2>";>sAj:&[`` -8H)*X7K,^M6g6r:6-VZG5bUIB60:K76UUf>r^?`Sr^QlWr^m)`r_NMjr`/r"r`oG1ral(BrbqdWrce?k -re19.rf[8Jrgs+eriQ1+rk/6Grl+l^rmLesrnRM1ro="Brp9XQrpp']rqHEgrql]mqu5XUi;`fUrqucm -rqcWgrq69]rpTjQrp'LDro!e3rmq(srm(M_rk\TIrj;[-ri#ggrgEbLrepc0rdXomrcJ-Xrb;@CraGe3 -r`T5$r_i_lr_EGbr^d#Xr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,dU8H)6\:B")h;Z9_r=oM_+ -@K'j;C&W&MFT-RbJ,Y0$MuJq>RJriXW;a""[/Rc<_Z%RScMl8kf)FM)iVqp;lMg/Ln,DnWp&=^bqYpBk -r;6KRs5<qVrr2lqr;QQlp\sjboD\7YmJcDMjSn-;hYu+*e,I\maSs*V^AbM=YPtR$T`1DZPl?U?L&QW% -H2_pbDuOMNB)Z6<?2e"+=8l+s;#X5h9)_B\8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^m)] -r_EGhr_i_sr`];,raGe;rbDFNrcJ-brdb!&repc?rgWn[ri5t$rj;[=rkeZUrm1Smrmq)*ro*k;rp'LM -rp]pYrq69brqcWkrr)`nj8\';rr2oqrquclrqHEcrq$-YrpB^NroO.=rnm_-rmUkmrlG)VrkJH@rilC& -rh07[rg!JCreUQ*rd4Wfrc.pQrb)4?ra5Y/r`K.ur_`Yjr_*5_r^d#Xr^HfSqa9C1cp3.IUd3j)!CK3S -6iKLQ7K,dU8H)3[9E%`d;>sMn=T2P(?iFR7BDu]GEW1.\HiAWrM#NG6Q2[9PT`2"kZ2V32^])1NaSsNb -eGe,"hu;X7jo4TFmJcVSoD\F^p\t$gqu6Qkro=%:s8N#srVl`oqYp9hpAX^`nG_hSli-&Gj8Rs8g&BM# -d/M2e`W!XO\Gif5XT"snSGniRO8b"8KDp8tGQ)X^D#S,IA,]j7>Q.b(<;obo:]=&e9)_B\7fGjU7/K@3 -6I7uK5bp['630G@!(6`Rr^HfUr^d#\r_3;er_i_pr`K/(ra5Y7rb)4Hrc8!^rd=]tre^W8rg*PSrhBCn -riuI4rkJHNrlY5ermh#$rnm_8roX4GrpKdTrq-3`rqQKhrql]nqu5XUh>dKQrqucmrqQKdrq-3[rpKdO -roX4?rnm_/rmq(rrlb;[rkSNDrj2U,rhKIargEbIreg].rdFcjrcA'Urb2:Ara>_1r`T5"r_i_kr_<Aa -r^m)Yr^HfSpd=11cp3.IUd4'/q*P-Lr^?`Sr^QlYr_*5br_NMkr`&l"r`oG1rac"Brb_XUrcnEjre19/ -rfI,Irgs+ariZ7,rji$Drl4r\rmC_qrn@A/ro="?rp0ROrpg![rq??drql]mrr([Qh>dKQrqucmrqZQf -rq69\rpTjRroj@Cro*k3rn%.trltG_rkeZHrj;[.rh]UergWnKrepc1rdXonrcS3YrbDFFra>_2r`fA% -r_relr_<Aar^m)Zr^QlUpd=11cp3.IUd4'/q*P-Lr^HfUr^ZrZr_*5br_NMkr`/r%ra,S3rb)4GrbqdY -rd+QnreCE2rfI,Krh07eric=/rk&0HrlG)`rmLetrnRM3roO.CrpB^Rrpg!\rqHEfrql]mrr([Qh>dBN -rquckrqQKdrpp'XrpKdLroO.<rn[S+rmUklrlP/Wrk/6=rilC#rhBC_rf[8?reUQ(rd4Wfrc%jQrb2:? -ra5Y0r`9"tr_`Yir_3;`r^d#Yr^QlTqa9L4pd*RuJO$>&pd+%/r^6TO!(?fUr^ZrYr_!/_r_EGir`&kt -r`oG0raPk?rbMLPrc\9frdb!(rf6u@rgj%_ri#h#rjMg=rkn`Vrm(Mlrn.5+ro*k<roj@Lrp]pXrq??c -rqZHhrr([Qh>dBNrquckrqQKdrpp'XrpKdLroO.<rn[S+rm^qorlY5Yrk8<?riuI%rhKIbrfd>Breg]+ -rdFcjrc%jQrb;@@ra5Y0r`B)!r_`Yjr_3;`r^d#Yr^QlTog@b+fg(*RX[(f2qa:9L!(?fUr^ZrYr_!/` -r_NMjr`&kur`oG0raPk@rb_XRrcnEirdk'+rf6uArh'1cri,n%rjVm?rl"fYrm:Yorn7;,ro*k<roj@L -rp]pXrq??crqZHhrr([Qh>dKRrr)iorqcWhrqHE`rpg!Urp'LGro="8rn@A&rm:Ygrl>#Rrjr*9ri?$o -rh'1UrfR2>re19#rd4Wbrbh^Nrac":ra,S+r`/qqr_WShr_3;_r^d#Xr^?EHj$MEaJO$>&i'R<.r'UNQ -r^QlWr^m)_r_<Agr_i_rr`K/+raGe:rbMLOrc8!brdb!$rf-o?rg*PUrh]Uprj;[9rkSNRrlb;frmq)' -rnm_8roa:GrpKdTrq$-`rqZQirqucorr1aRh>dKRrr)iorqcWhrqHEarpg!Vrp'LGro="8rnIG)rmC_i -rlP/Trk&0;riH*rrh07Xrfd>Bre:?&rd=]drc%jQral(<ra5Y-r`B(ur_WShr_3;_r^d#Xr^?EHj$MEa -JO$>&i'R<.r'UNQr^QlWr^m)_r_EGhr`&ktr`T5-raPk<rbVRPrcA'drdb!%rf@&Brg<\Xrhf[rrjDa; -rkSNTrltGirn.5)rnm_8roa:GrpTjWrq-3arqZQirqucorr1aRh>dKRqu-NjrqQKerq-3\rpTjQroj@C -ro!e2rn7;!rm(Mcrk\THrjMg0ri#gjrgNhOrf@&6rdt,urcS3\rbh^IraYq7r`fA'r`/qor_EGdr^m)[ -r^ZrVr^?EHk!I`dJO$>&k!J`.r^6cU70#dU8,c'Y8cDE_:B")h<W6,">Q/"/A,^*>DZ4YTFoHjhK)UQ) -O8bCCRf9&\WW'+#[f3r=_>_UVcMl8kg&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6irVQTMs5!_SrqlZnqu6Hk -q#9scoD\7Ymf)MNkPjH>hYu:/e,I_nbl5NZ^](eCYl:^&V>d%bQi<0IMZ/;.J,X]lF8g+WB`;TB@K'R3 -=oMM%;Z9Ml:B!oc9)_B\7fGjU7/0.*6K17]5dir66MNqI7/fUU7RdAIr^d#[r_*5cr_WSlr`B)&ra#M3 -ral(BrbqdXrcnElre19.rf[8Jrgj%bri5t%rji$Brkn`Zrm1SmrnIG/ro*k>rp'LNrp]pYrq69crqZQj -rr)`nh>c=2rr2fnrql]krqQKdrq-3[rpTjProj@@rnm_1rmh"qrltG]rkSNFriuI)rhoaergEbMrf$i2 -rdauorcS3ZrbDFEraPk5r`fA(r_renr_EGdr_!/\r^QlUr^?NKh*U*dJO$Y/h*Um(r^?`S!CfNY7fGsX -9)_N`:B")h;uTnu>5hk-@fC!=CAr2OFoH^dJGt<&N;f(@RJrfWVuEdsZ2VB7_#D=Pc2Q,iec+A'hu;X7 -kl0oIn,DkVo`"R`q#:*gqu6Qkrn[V.s8N#srVl]nqYp<ipAX^`nc&"Vli-/Jj8S!9h>Z")df.Sl`r<jS -^AbJ<YPtR$T`1G[Q2ZjDM#N#*I/\?hEW0eRB`;N@@/aF1=T2;!;Z9Jk:&[ca8cD3V7Iih+6K17]5dir9 -6M3_F7JoUT7fH!Y9E%Zb:]=8k<;p#!>Q/%0A,^-?D#SGRG5cmgK)UW+O8bFDS,T)[WrB1#Zi7]<_Z%RS -ci2Dmf)FM)i;Vd9l2L&Kn,DkVo`"R`q>U6iqu6Qnrn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49= -hu;=.ec*nob5T?Y^](_AZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\ -8,c!W7.iq-6K17]5dir96Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1 -rfI,Hrgs+`riQ1*rjVmArl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOfDkjLrqucm -rqcWgrq??`rp]pTrp9XHro="8rnIG'rmC_grl+lPrjr*9ric<trh07[rfR2>reUQ(rd4Wfrc%jQrb;@@ -ra5Y0r`B)!r_`Yjr_3;ar^d#Yr^QZNqa9C1qa'F2JO$b2r^#I/r^6HKr^QlW!D#`]8H)9]:&[rf;>sPo -=8lJ(?iFO6C&VrJE;k%[HiAQpM#ND5OoCjLT`1eeYPtp.])KME`r=0\dJh_rg]$+0j8S3?m/HGPnG`(Z -p&=^bqYpBkr;6KIs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2fDa4tbl5Z^_Z%1H[JmB/W;`Rk -T)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U7K,^M6fUN460LRb5eKA]6/t<, -6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcsreg]8rfd>QrhBCjric=/rk&0H -rl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfe)rr2oqrqucmrqZQfrq69]rp]pTrosFE -ro3q6rn@A%rm1Sdrl4rPrji$7ri?$prh'1Wrfd>Are:?&rd=]erc%jRrau.=ra5Y.r`B)!r_WShr_<Aa -r^m)[r^QlUr^?<Ej$N&sJO$t8i'R*(r^?`Sr^QlXr^d,_8cVK_:&[rf;#XJo=T2M'?iFR7B)ZZHEW1(Z -I/\ZqL&R,3P5^jJTDk\dX8]I)\c0AC`r=0\ci2Jog&Bk-ir8*>l2L,MnG`"Xp&=^bq>U9jr;QZlrn@D( -s8N#prVl`oqYp9hpAX[_nc%tUlMfuGj8Rs8gA]\&d/M8gao9*T]Df5;Xo>6tUAgY]Q2ZjDM#N&+If=Ni -ErL"VB`;QA@/aF1=oMM%;Z9Ml:B!oc9)_B\7f,XR7.iq-6Mj(=5_22;5lO(-6Mj.I7/fXP7fGsX8HDIW -!)*;dr_WSlr`B)%r`oG1ral(BrbqdWrc\9irdt-*rf@&DrgWn]ri#gurjDa;rkSNTrlkAgrmq)'rnm_8 -roa:GrpKdTrq$-_rqQKhqu$Hlqu5=LeGoFErquclrqQKerq-3\rpTjQroj@Cro!e2rn7:urm(McrkeZJ -rjVm2ri5snrgs+VrfR2;re:?$rd"KbrbqdOrau.=ra5Y/r`K.ur_i_kr_<Aar^luWr^QlTog@Y(r^$'> -JO%1>r^#@,qa:6KqaUQTr^m)^!DQ8g:&[rf;>sMn=T2P(?iFO6BDu]GDuOkXH2`<mK`6l.OoC^HT)PPb -WrB7%\,O)?_Z%^Wc2Q,ig&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6fr;QZEs4%)Jrr2lqr;QQlq#:$eo`"F\ -n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"KjF8g(VCAqfD@/aI2>5hP$ -;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha:/1dar_NMkr`/r$r`oG1 -ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5roj@HrpB^Rrpp'\rqHEf -rqcWlrr)iqeGn%urr2oqrquclrqZQgrq69_rpg!Urp0RIro="9rn[S(rmLelrl>#UrkAB>rilC&rhBC_ -rg3VGrepc0rdXonrcS3ZrbVRIraGe4r`fA'r`/qpr_NMer_*5]r^ZiTr^HfSpd<k(qa('DJO%CDr^#@, -pd>$Kr^H]Rr^ZrYr_*5b!DcJk:]=5j<;otu>Q.t.@K's>C]8;PFoH^dJ,Y0$MuJh;R/WZUUAh4mYl;'0 -^Ac"Ka8XEadf.erh>Z@3j8S9AlMg5Nnc&.Zp&=acq>U6ir;QZorm^tts8N#prVl]nqYp<ipAX^`nc&%W -m/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQLNW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr -;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8 -rbDFLrc%j]rd=]qre^W7rf[8Mrh07driZ7+rjVmArl"fXrm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQi -rql]nqu5+FeGoOIqu-Nlrql]krqHEcrq$-YrpB^Nroa:Arnm_0rmq(srltG`rkn`JrjMg1ri5snrh'1U -rfR2>re19$rd=]frc.pSrb)4@ra5Y0r`T5$r_`Ykr_EGcr_!/]qa^WTr^?<Eh*V'*JO%UJh*Ud%qaC<N -r^ZrZr_!/_r_EGg!Du\o;>sVq=T2S)?iFR7BDucIEW1+[I/\ZqK`6u1P5^dHTDkYcWrB7%[f3r=_u@aV -c2Q/jfDaP(hu;[8kPjfHmJcVSoD\F^p\t$gqu6NmrVQTDs4%)JrqlZnr;QTmqYp9hpAX^`nG_kTmJc>K -jo46<h#>t*eGdenb5TBZ^Ab\BZi7'*VuEChRJrHMO8aq6K)U5uGQ)[_DuOJMB)Z9=?N+.-=8l.t;>sAj -9`@]a9)_B\8,c!Q7/0.*6N'1N5s^&eej04#h*Um(pdG*Nr^ZrYr_!/_r_3;er_W\p;ZKbq=8lD&?N+F5 -B)ZNDDuOhWGQ*'jK)UQ)O8bCCRJroZVZ*[rZi7K6^Ac+Nb5T`deGe,"h#?:3jo4KCmJcSRnG`(ZpAXjd -qYpBkr;QZlrm^tqs8N#prVl`oqYp9hpAXaanc&%Wmf)JMk5OB>hu;@/fDa.rbl5]__#CtF[JmB/WW&[l -Sc4uTOoC7;L&QW%HN&'dE;jYPBDuE?@/aF1=oMG#;uTSl:B!rd9)_E]8H)*U7K,^G6f:925lj8;JO%mR -r^#@,ogAUEr^HfUr^ZrZr_!/_r_EGgr_`bs<<-%u=oM\*@/a[8BDu]GE;k"ZHN&HoL&Qu/OoC^HSc5D` -WW'+#[Jmf;_#DFSbl5ugfDaP(hu;X7k5OWEmf)\Snc&4\p\sseqYpBhrVlfDs3CZDrr2lqr;QTmq>U0g -p\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pbE;j\QB`;H> -?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N`:&[ug;Z9\t -=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A,ro!e;roj@I -rpTjWrq-3arqQKgrql]mrr)`ndJqMlrr2fnrquclrqQKerq-3\rpTjSrp'LGro*k5rnIG&rmLekrl4rS -rkAB=rilC'rhBC`rgNhJrf$i4rdauqrcnE^rbh^Mrac":ra,S,r`B)!r_`Yjr_<Abr_!/\qa^WTpdFmE -i^36'JO&`je3`ptpdG!Kr^ZrYr^m)^r_<Afr_`Ypr`9,'=TDV(?N+C4AH$?CD>nPSGlE*iJGtB(N;eq< -Rf8oXUAh7nYl;$/^Ac"K`r=9_dJh\qg]$(/iVr$>lMg5Nn,DnWo`"Uaq>U6fr;QZlrmCbks8N#prVl`o -qYp9hp\sjboD\7Yn,DYPkl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1Y -DZ48IA,]j7>lIn*<rQ"r;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^ -:&[rf;>sJm<rQ2%>[.86ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUku -rndY4ro="Arp0RPrp]pYrq69brqZQiqu$Hlqu5"CbQ%S@qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0 -rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXolrcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Ac -r^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQTr^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7 -BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtLao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[a -q>U6iqu6Qkrlb>bs8N#prVl`oqu6HkpAXaao`"@Zmf)VQkPjTBir7d5f`'D"ci2)d`r<aP])K,:Y5YF" -U]-h`Qi<0IMuJJ1Jc:&rGlDd`D>n8KB)Z3;?N+4/=8l5!;Z9Ml:B!ue9)_E]8GG[L7/0.86K^]76'";1 -6.&$o6hj(E7fGsX8cD?]:&[oe;#XAl<W6)!>lJ%1?sitBrau.Drb_XUrce?hrdk''repc=rg<\UrhKIk -riZ7.rjr*Drl4r\rm1Snrn7;,ro3q=roa:JrpTjUrq-3_rq??frql]mrr)`nbQ#ccrr2fnrqucmrqcWg -rq??`rpg!WrpKdLroX4?ro!e1rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJ -raYq9ra5Y,r`9"ur_`Ykr_NMdr_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5d -r_WSkr`/r!r`K/,ra>h;@fU$<C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYr -g]$.1j8S3?kl1#Ln,DkVo`"O_p\t$gqu6NmrVQT;s2b6>rqlZnr;QTmq>U0gpAX[_nc&"Vli-/JkPjH> -hYu:/eGdkpcMki__Z%:K[f3Q2Xo>*pT`1J\P5^L@MuJ>-If=]nF8g.XD>n2IAH#s8?N+1.=T2;!;Ys8h -9`@]a8cD9[8,c!T7K,^G6hE^t6Dm)l6M3_C7/fXP7fGpW8H)3[9E%Z_:]=8k<;p#!>5hk-?iFO9B4h3W -rb_XRrcA'crdXp!repc:rf[8Nrh'1briQ1*rjMg?rkeZSrm(Mjrm^r%rndY5roa:Frp0RPrpg!Zrq??c -rqZQjrquZlrr1"=`W,r:qu-NlrqcWhrq??`rpp'WrpKdOroj@Aro!e3rmq(trm1Scrl"fNrji$8ric=" -rhKIarg*PHrf6u4rdt,urce?`rbqdOrb)4?ra>_2r`];%r`&kpr_WShr_<Aar^m)[qa^WTpdFmEoKq1s -pd)GUpd*(ipd=gEqaUQTr^d#[r_!/ar_EGhr_i_qr`9#%r`oG1raYq?!GcHNC]88OF8gC_If=ruLAm54 -P5^dHT)PJ`W;a""[/RW8^])1Nao9Wce,Iqth>Z@3j8S9AlMg5Nn,DnWo`"R`q#:-er;QZlrlG,Ys8N#p -rVl`oqYp9hp\sjboDA%Vm/H8Kjo4<>hu;@/f)F(rc2Pc__Z%7J\,N]4XT#*rT`1DZQ2ZmEMZ/>/JGsrq -GQ)U]DuOMNBDu?=?iF@1=T2A#<;o_k:]=#d9)_E]8H)-Y7f,XR7.N_A6I/!/5fH(_6i0:N7K,dU8,c'Y -8cD?]9E%`a;#XGn<rQ5#?2e41@K'p=CB8?l!,qjVrc\9grdb!%reg]:rg!JOrh07friH+)rj_s@rkeZU -rltGirmh#%rnm_7roO.Drp9OOrq$-^rqHEfrqcNirr)`naT'-Wq#13hrqcWirqHEcrq$-YrpKdProj@B -ro!e3rn7;$rm:Ygrl>#Rrk/6?rilC&rhf[frgWnQrfI,;reCE&rd=]irc.pUrbVRGraYq7r`oG+r`K/! -r_`Yjr_EGer_32\r^cfRr^?0A!CK5q6H_X56LmM@7/07K8H)3[9`@cc:B"&g;Z9Yp=T2J&>lJ+0A,^*> -D#S;QEH(turcnEhrdb!&repc;rg*PQrh07fri?%&rj_s@rkSNSrlb;frmh#$rn[S3roO.Crp9XOrp]pY -rq69brqZQirqlKh_Z.LQrr2fnrqucmrqcWhrq??`rpg!VrpB^LroX4>rnm_0rn.4urm(Mdrkn`Nrk/6: -ric=%rhKIbrgWnNrf@&9re(3"rd4Werc8!Urb2:BraPk6r`fA)r`9"tr_`Ykr_EGer_*5_r^luWr^QcR -qaC0G!CK5q6MNk&5kmXa6Mj.C7/fXP7fGpW8cD?]9E%Zb:B")h;>sPo<rQ8$>lJ+0@fC!=B`;oKE<13) -!-S9frdXp"reg]8rfd>Nrh'1bri?%%rj2U:rkSNOrlb;ermLeurnIG0ro3q>rosFLrpTjVrq-3`rqQKh -rql]mrr)`n_Z.LQrr2fnrqucmrqcWhrq??arpp'XrpTjProj@Cro!e3rn@A$rmC_krl4rSrkJH@rj)O, -rhf[hrh'1Urf[8@reCE(rdXolrcJ-Yrb_XJral(;ra5Y0r`K/#r`&kor_WSir_3;ar_!/\qa^WTqaLKP -pI"XAa?n]J`Bs,_qaCEPqaUQTqag]Yr_*5ar_NMir_`Yor`9##r`oG/raGe;rb;@Krc%jZ!I/hhGlE3l -KDpW)NrG4@QN!NUU]..iYPtm-[f4&@_u@[Tci2AleGe2$h>Z@3jo4KCli-APnc&+Yp&=^bq#:-hqu6Nm -rVQT2s1eU5rqlZnr;QTmq>U0gp\sgao)A+Wmf)POkl0ZBiVqa6g&BP$d/M8ga8WsT^&GM?ZMq!*VuEFi -Sc4uTP5^L@M>i/,J,XcnGQ)R\D>n>MAc?3=?iF@1>5hY'<W5qo;#X5h9`@Z]8c)$W7f,XR7/]LE6bbte -62NqH6,,bT6i0:N7JfRR8,c*W9)_N`:&@cd;uTer=T2M'?2e41@fBs<C]85NE;k(\HNAVG!.Y!#reUQ6 -rf[8Jrgj%_ri#gurj)O5rk8<Jrl>#^rm:Yprn7;.ro3q<roj@HrpKdSrpp'\rqHEerqZQjrquZlrr0\4 -]`8!1qu-NlrqcWirqQKcrq-3[rp]pRrosFDro="9rnRM*rmUkmrlY5ZrkSNFrjMg1ri?$qrh07[rg3VG -rf$i5rdk&trd4Wdrc.pTrb2:CraYq7r`oG+r`B)!r_renr_NMfqb-o\r^coVr^QcRrC$QOpd;e_pd)PZ -pd=gEr^H]Rr^ZiVqb$i\r_<Afr_`Ynr`/r!r`];+ra5Y7rau.Crbh^TrcJ-drdFm!JH19#M>iM6OT(UG -S,T)[VZ*XqYl;*1]DfVF`W"$Zci2DmfDaS)i;Vd9jo4NDm/HMRnc&.Zp&=acq>U6fr;QZlrkJKGs8N#p -rVl`oqYp<iq#:!do`"I]nG_hSli-)Hjo46<hYu7.f)F%qbl5``_Z%:K]Df/9YPtU%U]-qcSGn`OOT(7= -K`6Q%J,XZkFT-7YD>n8KB)Z6<?iF@1=T2A#<W5nq;>X/g9`@]^8cD9U7f>aV77I2DmmD^ommHt?r^HTO -qag]Xr_*5bqbR2gr_i_qr`B)$ra#M1raGe<rb;@Krc%jYrce?krdk0(KE-])NW,%=PQ%*OTDkVbX8]=% -Zi7T9^])+Lao9Qad/MVqg&Bk-iVqp;kPjfHmf)_ToD\F^pAXjdq>U6fr;QZlrkJKDs8N#prVQKkqYp6g -pAXaao)A.Xmf)POl2KiEi;VR3g]#b&df.SlaSs-W^](hD[JmB/X8\spT`1G[QN!$GN;eV3K)U9!HN&-f -E;jbSD#S)HAG]a5>lIq+<rQ(t;>sDk:]=,g9`@]a9)_E]8H)-X7f5aQ7K,^D6^:",6i0:N7JK@O8,c'Y -8cD?]9E%W^:B")h;>sPo<rQ;%>l.n-A,^-?D#S>OE;k(\HiANoK)UN+N/RaqrfR2GrgWn[rhf[qric=. -rjr*Drl"fWrm1Slrmh#&rndY4roX4Drp0ROrp]pXrq69arqH<drql]nqu4/+\c;[.qu-Nlrql]krqQKe -rq??_rpg!VrpB^Mroa:@ro!e3rn.5#rmC_hrlG)Vrk8<@rj;[-ri,mmrgs+Xrg*PFrepc2rdk&trd4We -rc8!VrbDFFrac"9ra,S/r`K/$r`9"rr_`Yjr_EGdqb-o\r^m&Y!CoZW7f,XL7/0-76MNqC7/fXJ7fGpW -8cD?Z9E%Wa:B"&g;>sJm<rQ2"=T2S)?N+@3AH$6@CAr/NErL4\HiAKnJc:H(MZJp$!0I2GrgNhXrhTOm -riZ7-rji$Arkn`UrlkAhrmh##rn[S3ro="@rp'LMrpTjVrq$-_rqHEerqcWkrqucoqu4/+\c;[.q#13i -rql]jrqQKerq-3\qsaUOrosFDro="8rnIG(rmUknrlb;]rkSNGrj_s3riQ1"rh9=_rgWnNrfI,<re19% -rdXolrcS3[rbqdNrb)4?raGe5r`oG+r`K/"r`&kpr_WSir_EGdr_*5_r^d)\!D#c\8,,RN7K,^>6a/oD -6i0:N7JK@O8,c'Y8cD?]9E%Wa:B"&g;#XAl;uTer=T2M'>lJ+0@K'd9BDu]GDuObUFoHXbJ,Y'!K`6r0 -NrbH.!0dDOrgs+_ri5t"rilC3rk/6Grl>#]rm:Ynrn%/(rnm_7roO.Drp9OOrq$-]rqHEerqZQjrquZl -qu4/+ZiC%(qu-NlrqcWirqQKdrq-3\rp]pTrp9XJroO.=ro!e2rn7;!rm1Sfrl"fPrkJHArj2U-ri#gl -rh'1Zrg*PGrf-o5re(3"rd4Whrc.pUrb_XKrau.=ra>_3r`oG*r`K/#r_i_mr_NMir_EGer_*;b!D?)b -9)D3Z8GG[L7K,^86e"He6i0:H7JK@L8H)3[9)_K_9`@cc:B")h:]=5j;Z9_r=8lA%>lJ%.@/aX7B)ZND -D>nJQEW14^HiANoKDp]+NW,(>Q3!JE!1Wt[rhTOlric=-rjVmArkeZQrlkAfrmLf!rnRM2ro3q>roj@J -rpB^Srpp']rq??drqZQiqu$Hlqu4&(ZiC%(qu-NlrqcNfrq??arq-3[rpTjRrosFGroX4=rnm_1rmq(s -rm1Sbrl+lQrk/6>rj)O*ri#glrgs+Xrg*PFrf$i5rdt-!rd=]grcA'Xrb_XKrb)4?raGe5r`oG+r`K/# -r`&kqr_`Ykr_NMf!)*De9`%K^9)_EW8,,RK7J0(A6e"I"6h3Y?7JK@I8,c*Z9)D9\9`@cc:]=2i;>sMn -<W6%u=T2M'>lJ+0@K'd9BDuZFD>nMRFT-I_I/\WpK)UW+N;eq<QN!<RSt5qRrhTOmriQ1*rjVm>rk\TQ -rlG)brmUktrnRM0ro*k=roa:FrpB^Rrpg![rq69arqZHfqu$Hlqu4&(ZiC%(q#1*erqcWgrq??arpp'Y -rpTjQrp'LHro3q8rnm_-rmh"qrltG`rl"fOrk&0=rilC'ri,mjrgs+Yrfd>Drf6u4re(3"rd=]ircJ-Y -rb_XMrau.?raGe6ra,S/r`K/#r`/qqqbd>h!)EVk:]=,g9`@]a9)D3Z8GbpM7f,XO7)D=a7/fXG7fGpT -8H)3[9)_K_9`@fd:]=2i;>X8j<W6)!=T2S)?2e72@K'g:B)ZTFDZ4VSFT-L`I/\WpKDpW)NrG.>PQ%'N -ScPOY!29CkriQ1(rjVm=rkSNOrlP/armC_qrn.5-ro*k9roj@Grp9XQrpg!Yrq69arqH<drqlKhqu4&( -YlF_%qu-NlqtpBgrqQKerq-3\rp]pUrp9XMroa:Aro!e4rn@A'rm:Yhrlb;Zrk\TJrjVm5ric=#rh]Ue -rg`tSrf[8@reg]1rdaurrd4WercA'Wrbh^Nrb2:@raPk6ra,S/r`];'r`9"ur_`_n!Du_n:]=2i:]=,g -9`%K^9(bdT8GbpJ7asln7fGpT8Gc!U9)_K\9`%Ta;#X8i;>sJm<W6)!=T2M'>Q.t.?iFL5A,^0@CAr,M -DuOeVFoHaeIf=lsL]321NrG4@Qi<NST`1bgWMolsric=-rjVm@rk\TPrlb;drm:Yrrn@A.ro!e:roa:H -rpB^Rrp]pYrq-3arqQKgrqlTjrr)`nYlCs-q#:'drqcWirqQKcrq-3\rp]pTrpB^Lroa:Aro!e3rn@A$ -rmC_jrlG)WrkSNGrjVm4riZ7#rh]Uerg`tTrf[8@repc0rdt-!rd+QfrcS3Zrb_XMrb)4Brac"9ra,S0 -r`];(r`K/#!)rtu<;ohn;>X/d:&[i]9E%Q\8cD9L8(:$!8,c'V8cD?Z9D_E^:&[ob:]=2i;>sMn<W6%u -=T2J&>5hh,?iFI4AH$0>BDu]GDZ4VSFoHXbHN&EnK)UK'MuJe:P5^jJS,T)[V>dFpY-%c-rj)O4rk/6G -rl+lXrm(Mjrm^r$rn[S3roF(@rosFLrpKdTrpp'\rq69crqZQiq#'pdYlCa'rr2fnrquclqt^6crq??` -rpg!WrpTjProsFEro3q7rn[S*rm^qorltG`rl"fOrk&0=rilC(ri?$nrh07]rg*PIrf@&:reCE(rdauq -rd"Karc8!VrbVRJrb)4?raPb3r`oG,r`B/$!EN8#<Vo_o;Ys;i:]=2i:B!ue9`%K^9(bdQ8CU0&8Gc!U -9)_K\9`@cc:B")h:]!uc;Z9Vo<W6)!=T2P(?2J".@K'd9BDuWED#SAPEW1%YH2`3jJGt0"L]352O8b@B -QN!HST`1_cX8]7&Ycn,3rjVm=rkSNOrlP/arm:Yorn%/*ro!e8roX4Drp0RPrp]pWrq-3_rqHEfqtg3f -rr)`nXoGF$rr2]krqucmrqcWhqtL*^rposTrp9XLroO.>rnm_2rn7;%rm:Yhrlb;Zrk\TKrj_s7ric=% -rhf[hrh'1Yrg*PFrf-o8re19%rdXoorcnEarc%jSrb_XLrb2:CraPk7ra5Y1!*fP0>lIt,=T2D$<rQ+u -<;oep;>sDe:]=,d:%_3T9AN589CbdU:&@]_:]=2i;>sJm;uTer<rQ2"=T2P(>lJ%.?iFL5@fC!=B`;cG -D>nJQE;jtYGQ)sgJ,Y'!K`6o/NrG.>QN!?PTDkSaVuEarYPtm0\@;OKrkJHLrl"fZrm(Mirmq)%rn[S2 -ro3q=rp'LLqsXOTrq-3aqtU0erql]mq#1*hXoGF$qu6KkrqucmrqcNfrqQKcrq-3\rp]pTrp9XJroO.= -rnm_0rn7;#rmC_jrlG)Xrk\THrj_s7ric=%ri#gjrgs+Yrg!JGrf@&8reCE(rdaurrd+QdrcA'Xrbh^N -rb;@Drac"<ra5_5!FK45?N+1.>5MG$=8l8"<;ohn;Z9Pj;#X8f:@_-P9__9O9_D-T:B"&d;#X>h;Z9Vo -<;oqt=8Q,!=oMY)?N+=2@/a[8Ac?<@C&VoIDZ4VSF8g=]HN&<kJGt0"LAm&/O8b=AQ2[9PTDkSaW;`js -YPtp.\,j7T!5/<Irl+lXrm(Mjrm^r#rnRM1ro3q>roj@JrpB^Srpp'\rq60`rqZQirql]mrr)NhXoG=! -rr2]krqucmrqcWirqQKdrq69_rpg!WrpTjOroa:Bro*k6rn[S*rm^qorltG`rl+lPrk8<Brj2U.riQ0s -rhKIbrgWnQrf[8Arepc3rdt-"rdXomrce?`rc%jTrbh^Mrb2:CraPq;!FfO;?iFI4?N+4/>Q.h*=T2@u -<W5ts;u9Ji;=[Q_:]=2`:\[][:]=2i:\%?];>=&g;uTbq<Vohr=T2J&>Q.n,?2e72?iFL5A,^*>B`;cG -DZ4SRE;jtYG5cddJ,Y#uK)UT*MuJe:P5^gIS,T&ZU]..iXo>R(Zi7Q8]`Gpa!5STQrlP/arm:Yorn%/* -rnm_6roO.Crp'LOrp]pWrq-3_rq??drqZQirql]mqu-EkVuNIjrr2]kqtpBhrqQKerq??_rpp'WrpKdP -rp'LEro="8rn[S,rn%.srm1Sfrl4rTrkJHErjMg3ric=$rhf[frgs+Zrg!JGrf@&:reUQ-rdausrd=]i -rcS3\rc%jSrb_XL!,)CHB`;ZDA,]s:?iFI4?iFC2>lIt,>5MJ%=T2@r<W5ts;uT\E;>X8j;uTbn<Voho -=T2J&>5hb*>l.k,@/aO4@K'd9BDuWECAr)LDZ4VSErL7]GlE*iIf=lsL&Qo-MuJe:P5^aGSGo,ZT`1hf -WrB4$ZMq?4]DfSE_Z@cs!65#^rm(Mjrn%/'rn[S2ro3q=rp'LKrpKdSrpp'\rq??crqQBerqlKhqu3Dk -U&Y#hqu-Nlrql]krqZQgrq??arq-3[rp]pSrp0RIroO.=ro!e3rn@A%rmLelrlb;^rl"fNrk&0>rj)O, -riH*rrhKIbrgWnRrfd>Crf-o7re:?(rdXoqrd"KercJ-[rc%jS!,M[PD#S5LBDuNBAc?3=@f'R4?N+70 ->lIt,>5MJ"=T2D!<qTJT<;T\j<rQ1q=T2J&>5hb*>lJ%.?Me.0@fBm:Ac?<@BDu]GD#S>OE;jqXFT-L` -HN&?lJ,Y'!L&Qu/N;eq<PQ$pJS,T&ZU]..iXT#F&ZMqB5]DfSE`;[gYbKBn/rm1Slrmh#%rnRM2ro3q> -roj@IrpB^Srpg!Zrq69arqHEfrqcWkrqucop&:ceT)\fhqu-NlqtpBhrqQKerq??`rq$-Zrp]pTrp'LG -roO.=ro!e4rn.5#rmLemrlkA_rkeZLrk8<>rj2U-riH*trhTOdrgj%Wrfd>Drf@&9reLK+rdausrd=]j -rce?`rc%pW!H<#WDuOSPCAqrHB)ZB@AH$';@K'X5@/aO4?Me%->lIt,>5h[t=QW]U=T2J&>5hb'>lJ%+ -?N+@3?iFL5@fBp;Ac?<@C&VoID#SAPE;jkVFT-I_H2`3jIf=lsK`6c+MZ/\9OoCRDRf8lWT`1bdVuEds -YPtm-[f3u>_#D4MaSs?`d*Md>rmLesrn.5,ro!e8roO.Crp'LNrpTjVrq$-^rq??crqZQirqlTjrr)`n -T)Y2Xrr2fnrquZjrqcNdrq??_rposTrp9XLroX4?ro!e4rnIG*rmLemrm(Mbrl4rSrkJHErji$6ric=' -rhf[irh'1\rgEbOrfR2@rf-o6reCE(rdausrd=]i!-SBdG5cU_EW0qVDuOVQD#S5LC&VfFBDuH=A,B^6 -?iFI1?hdt&?12%n?2.b'?iFI4?iFI4@K'd6AH$6@B`;`FC]8/LD>nJQE;jkVFT-I_GlE*iIK"crK)UN( -M>iM6O8b:@QN!<OSc58\U]..iXo>R(ZMqE6]`,\F_Z%RSao9TbciMSC!7Ll"rnIG/ro!e:roX4Frp9ON -rpg!ZqtC$`qtg<hqu$Hlqu3)bR/d'_rr)`lrql]krqZQgrq??arq-3\rp]pTrp9XJroX4@ro!e4rnRM) -rm^qorm(Mcrl>#TrkJHGrjVm7riuI)ri,morh07^rg`tRrfmDErf6u9reUQ,rdt-!rd=cn!IK1mHN&*e -FoHL^EW0qVDuOVQD#S5LC&VfFBDZ9>AG]m9@e*t,?iFI+?iFI4?iFI+@JaO5A,Bg9Ac??AB`;`FC]8/L -D>nJQE;jkVFT-F^G5cgeHiAHmJ,Y'!K`6f,MZ/Y8OoCUEQN!ERT)PD^VZ*RoXo>U)[/RQ6^&GhH_Z%UT -b5T]cd/MMqf@L#SrnRM0ro!e:roX4Drp9XOrp]pXrq-3_rq??crqZQirqlTjrr)WkS,\lUqu6KkrquZj -rqcWhrqHEcrq69_rpg!WrpTjProsFFro3q9rnm_0rn%/"rm:YirlkA]rkn`Mrk8<ArjMg1riQ1#rh]Uh -rh'1\rgEbOrfR2Arf6u8reLK+rdb'"!J#_"J,XipHN&3hFoHL^ErL%TDuOVQD#S5LCAqoDBDuNBAbBU, -A,'O1A+F10Ac?<=BDuWECAr#JD#S;NDu4MQErL.ZFoH[cHiAElJ,XutJc:?%L]321NrG+=OoC[GRJrcV -TDkSaV>dOpY5Y[)[f3i:^&GeG_u@[Tbl5oed/MSpfE'a]!8IM1ro*k9roa:Frp0RPrp]pWrq-3_rq??c -rqZQirqlTjrr)NhS,\cRq#:0hrquZjrqcNdrq??`rposTrp9XMroj@Cro3q8rn[S.rmq(trm:Yirlb;^ -rkeZMrkABBrjMg2ric=%ri,mlrh9=`rgWnSrg!JFrfI,>re^]3!JlR2LAlf(JGt&tIK"WnHiA9hG5cU_ -F8g4WE;OSKD>nAKCY`b)C\qrCD>S8KE;jnWF8g:\G5cacHiAElIK"`qJc:9#LAm#.MZ/Y8O8b:@Q2[0M -S,T&ZU&LhdWW'!uYPtg+[Jm`9^AbqI_Z%XUb5T]cd/MPof)FG'h#ZHl!9!k9roX4Drp0RNqsXOTrq-*] -rqH<drqlTjrr)WkQ2d-Lp&=shqu$HjrqcWirqQKerq69_rpp'XrpKdQrosFGroX4>ro!e4rn7;&rmh"q -rm1Sfrl>#Wrk\TJrk&0>rj)O-riZ7!rhf[jrh07]rgNhQrg!JFrf7&=!KE*<N;eY4LAll*K)U<"J,Xip -HiA?jGlDpdG5cU\F8KtSE;OSQDWYg5DYnALE;OYSF8L(YG5c^bGlE$gHiAElJ,Y#uK)UH&LAm#.N;eh9 -O8b:@Pl@$KRf8lWT`1bdVZ*OnY5Y[)ZMqB5])KGC_>_CPa8X<^cMl5jec+2"g&Bk-huVis!94"?roa:F -rpB^Qrp]pXrq-3_rqHEerqZQirqlTjrr)NhQ2cpFqu6KkrquZjrqcWirqQKdrq69_rpg!WrpTjPrp'LH -roO.>ro!e4rnIG*rm^qqrm1SgrlP/Zrk\TKrk8<?rjDa1ric=%ri,mmrhBCargs+Yrg<\K!0RAGP5^OA -NrG":MZ/D1L&Q`(Jc:3!J,XlqI/\KlH2`'fGPcO^FSg.VEoqB7ErL.WFT-F^GQ)jdH2`0iI/\QnJ,Xut -Jc:<$L&Ql,MZ/P5NrG+=OoCRDR/WQRT)PA]UAgtfWW'!uYPtg+[/RQ6^&GeG_>_IRao9Qaci2AleGe/# -g]$(/i;Va;jlHL(roj@Grp0RPrp]pWrq-3_rq??drqZQirqlTjrr)NhP5gL@q#:0hrquZjrqcWhrqHEc -rq-3\qsaUQrp9XKroj@Dro*k7rnm_/rn.5$rmC_lrm(Mbrl>#UrkSNHrk&0;rj2U.riZ7$ri#gkrhBCa -rgj+Z!LoSXRJrKNPl?gEOT(:>NW+h7M#N/.K`6W'K)U;tJ,XooIJA0aHLH.SHMDjdIJ\KmJ,=cqK)UE% -K`6`*M#N;2NW+t;OT(CAPQ$jHRJr]TT)PA]U&LhdW;`grY5Y[)Zi7B3]DfMC_#D7N`r=*ZcMl/hdJh_r -f`'V(hu;R5iVr!=k5ji3!9sLLrpBUPrq$-]rq??crqQBerqlTjrr)WkN;nk:p&=shqu$HjrqcWirqQKe -rq69_rq$-Zrp]pTrp9XLroj@Bro=":rndY/rn7;$rmUknrm(MdrlP/XrkeZLrk&0>rjMg3rilC)ri,mq -rhf[h!2'@cT`1P^Rf8`SR/W?LPQ$^DO8b.<N;e_6M>i>1LAlo+K_U/rJGXiVIf"WlJG=`qK`6])LAm#. -M>iD3N;eh9O8b:@PQ$gGR/WNQRf8oXT`1\bVZ*LmWW'("Yl:s-[f3f9]DfSE_Z%LQao9K_cMl2ie,Ins -g&Bb*hYuL5j8S-=kl0iJm-F`=rpKdSrpg!Zrq-3_rqHEerqZQirqlTjrr)NhN;nY4qu6KkrquZjrqcWi -rqQKerq??`rpp'YrpTjUrpB^Nroa:CroF(:rndY1rn7;&rmh"prm(MfrlP/[rl"fOrkABErjMg5rj)O- -riQ1#rhogn!MuXlU]-qcT)P;[Rf8]RQi<3JP5^UCOT(=?Nr+b6MZ/G/L\QQ"KB@dbKD:-!L\lo)MZ/P5 -NrG+=OT(CAP5^[EQi<EPRf8lWTDkM_U]..iW;`jsXo>R(ZMq92[f3r=^AbqI`;[dUao9Qaci2;jec+2" -g&Bh,hu;R5jSn9?kPjfHm/c_G!:^!Vrpg!Yrq-3_rqHEerqZQirqlTjrr)NhM>r5.q#:'eqtpBhrqZQg -rqHEbrq-3]rp]pUrpKdOrp'LHroO.>qr%J0rnIG(rmh"qrm:Yhrlb;]rl+lRrkSNIrk/6>rjDa2ricC* -!NrU)Xo>=!VuEOlUAghbTDkG]SGo#WR/WENQ2?dEP5^R?O8b14NVe\0MtN&+NVeb8O8G%9P5^[EQ2[-L -R/WTSSc55[TDkP`UAh"gVuE[pXo>L&Yl:s-[JmZ7]`,VD_#D4M`W!pWbPoccd/MGleGe)!g]$%+i;Vd9 -jo4KCl2L#Jmf)YUnF-GIrq$-]rq69brqQKgqtg<hq#1!eKE$T(p&=jerquZjrqcWirqQKdqt9s[rpp'W -rpKdPrp'LHroX4Aro3q8rndY/rn7;&rmUkorm1SfrlY5]rl"fQrkJHGrjr*=rj;a5!OT65Z2Us+XT#:" -W;`[nV>d4gU&1J]SGo#TRJrTQQi<<MQ2$RBP3.o(P5(7?Q2[*KQi!0LRJr]TSbo&YU&LecV>dClW;`js -Xo>O'Z2V*/[Jm]8])KDB^])+L`;[jWb5TWaci2>ke,Itug&Bb*hYuI4ir8'=kPj]ElMg,Kmf)\SnH&7Q -!;$3_qtC$arqZQirqlTjrr)EeKE$N&qZ$Qop&4mfrqcNfqtL*`rq-3]rpp'XrpTjSrp'LIroj@Bro3h5 -rn[S.rmq(urmUknrm(MfrlP/[rl+lQrkSNIrjr0@!P,c?\,N`5ZMUj)XT#:"W;`^oVZ*@iUAgkcT`1S_ -T)P;[SGo#WRerNPR-'b4R/WNNRf8fUSGo)YT)PA]T`1YaUAgqeVZ*LmW;`jsXo#=$Z2V*/\,Nr;]DfPD -^])(K`W!pWao9Qaci2;je,Insf)FG'h>?.0j8S-=kl0iGlMg5Nn,DhUo)A4]o^i.UqtC$`rqZHfqu$?i -qu20HqYu-Ho`+piq#13iqtpBhrqZQgrqHEcrq69]rpfmSrpB^OrosFGroX4>ro!e5rn[S/rn@A&rm^qp -rm:YirltGbrl>#Wrk\ZN!PlMM^](qG]`,MA[f3]6[/R?0Yl:j*Xo>F$X8]*tW;`[nV>d:fU]."eU"uC@ -U&Le`U].(gV>d@kVuE[pX8]4"Xo>O'Yl:p,[/RK4[f3l;]DfMC^])(K_Z%ORaSs?]c2Q#fd/MGleGe%u -gA]k+h>Z=2iVqj9k5OQCl2L&KmJHAOnc&+Yp&=Xcp\+[^rqQKgrqcWkqu$6fqu20Hp]#gEo`+gfqu-<f -rqcNfrqQKerq??arq-3]rp]pUrpKdPrp'LHroX4@ro="9rndY1rn7;'rn%.urmLemrm(MerlY5\!6,&Z -`r<pU_Z%@M^AbeE]DfD@\,Ni8[/RE2ZMUm*Y5YR#X8]-uWW&jJVuEXoWV`^pX8]7#Y5>I&ZMq30[/RK4 -\,Nu<]DfJB^AbqI_Z%LQ`W!pWb5TT`cMl2idf._pfDaG%g&Bh,hu;R5j8S0>k5OTDlMg/Lmf)\SnG`%Y -o`"O_pAXdeq"OjarqZHfq#(-ip&9OBp]#gEnc/Ufp&4mfqtpBhrqZQgrqHEcrq69_rpp'YrpTjUrpB^N -roj@EroX4?ro3h4rnRM-rn%/#rm^qprm:YjrlbAb!QrRaao9<Z`;[[R_>_7L^](qG]`,MA\c0,<[f3Z2 -Zhq$,YPtd*YPYKbXnAjrYl:j*Yl:p,Zhq-/[f3c8\c02>]DfMC^])%J_>_@O`W!mVao9K_bl5rfd/MGl -eGe"tfDaP(h>?+/iVqm:k5OQCkl0oImJcVSn,DkVo)A:\p&=[ap\spgq=t$dqtg<hqu$?iqu20Hnc+1? -li6k]p&4mfq"k!bqtL!\rq-3ZqsXOOrp9XMroj@EroX4>ro*b3rn[S/rn7;&rmh"r!71bnd/MAjcMl)f -bl5``aSs3Y`;[[R_Z%@J^](tH^&G\D]DfD@\c0,9\,Nhu[JRE3\,3]7\c02>]DfJB^&GbF^\bhG_Z%IP -`;[dUa8X3[bl5ldcMl/hdJhSnec+2"g&Be+h>?+/iVqj9k5OQCkl0oIm/HDOn,)VOo`"O_p\Xa]q>gBh -r;6Hcrdk+;s+149s7QBgrVl`lqu6Hhq>U0gpA=O^oD\=XnG_kTmJcDMl2KoGk5OKAjSn-;i;VX5h#?%, -g&BS'ecF@Qrm^qqrm:YjrltGdrlb;`rlG)Zrl4rVrl"fQrk\KIrkJ?Erk83Aqn)=.rk%s<rk83CrkJ?G -rk\TNrl"fTrl4rXrlP/^rlb;brltGgrmC_nrm^qtrn%/&rnIG-rnm_5ro*k;roO.Aroj@Grp'LMrpK[Q -rpp'[rq60^qtU0dqt^?jqZ-Njr;QZcrdk+;s+140s8N#mrVl`lqu6Hhq=s^`o_\7Wnb_eSm/H>Mkl0cE -k5OH@j8S';i;VU4h>Z./g&]p]rn.5$rm^qrqpGDhrm:YirlkAbrlY5^rl>#Xrl+lTqnrEMqn_+(rk\KK -rknWOrl+lVrl>#[rlY5`rlkAdrm:Yjrm:YlrmUksrmq)$rn7;*rn[S2ro!e8ro="=roX4Croj@IrpBUO -rp]pWrq$$Zq"Od`qtg<hr;6Qmq#1*hJcFj3JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-huEBKqu-<fqtpBhrqZQgrqH3\rq$-[qsaURrpKdPrp0RKroj@EroX4@!94+? -j8S$:i;VX5hYu=0g]#q+g&BY'fDF+teGdqrdehGkd.krdcM5ZQbkTH[cMPred/25idf._meGe"tfDaG% -g&B_)g]$"*hYuI4iVqm:jSn<@kPj]ElMg,Km/-5JnG`"XoD&"Xp\sseq>:$fqtU*grVZZhrdk+,s+14$ -s8N#grVl`oqtp6eq>9pcpAX^]oDA(Wn,DhUmf)VQli-2Kkl0`FjoOW,roO.>ro3q9ro!\2rn[S/rnI>' -rn.5$qpk\qp!`ogpsJQWpsJueqpYGlrmgnsqq1o$rnIG-rn[S2qr%J4ro3q;roO.Aroa:ErosFJrpB^Q -rp]pUrp]pWrq$$ZqtC$`rqZ?crql]mp&4gf!<.QLf)L=$c2[eBo)8RcrqlThqt^-`rq?6^rq-*XrpTjU -rpTjSrp0XN!UK(NlMg#EkPjQ>j87g7hu;R2htu7,h##k*g@Eqcf_*qpgA]k"h#?.,hu;R5hu;R5iVqm7 -jSn?>kl0lHli-8Jmf)_Tn,DhUnb_tXp&"I^p\t!`qYpBkr:U$crqZSFs4..#s3:T:rqlZnr:TsdqYp<i -q"sgbpAXaao_\7Znc&%Wn,D_Tm/cVArp9OJrp'LHqrdk<roEt:ro3q9ro!S/rndG+ptY>mptYZ#qqh5- -ro!e7qr7V8qrIb<roa1Bqs+1Hrp9XOrpKdSrp]pWrq$$Zrq69aqtL*brqZHfqtp9grr)Eeq>Z$Gec14# -a8c&9o)8RcqtpBhqt^6dqtL*`rq69_rq$-[qXFUVnc&"VnG_kTmJcJOli-2KkkjQBk549>jSS!:iq;9[ -i;;L1ir8!8jSn9<k5OQ@kl0lHli-8MmJcPQnG_nUnGDbTo)A7[o`"O_pAXg`q#:*dqYpBhr:U$]rq?AC -s4..#s1\O1rpp$er;6BdqYp9bp\smcp&=R`o)\ISrposVrpTjUrpTaPrpB^Oq!7hAqrm_9roX+>k2cO' -qr[e=p#uD>q!7qGrpBLKrp]pUrp]pWrpp'[rq-3_rq?6`qtTs_rqlTjp&4R_mJhb;ec14#^Amd'qu-<f -qtpBhq"apaqtL'^r:U']qt'gXrpfmTrpTaPqsFCLqs3q?ror%uros+@rp0IJrpBLKrpTaRrpg!Yrq$$Z -q"=X\qtTs^qtg<hq#(-im/HDPJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjU -qsX=JqsDo"rpBLKqsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#WW2bmo)8Rc -qtp6dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0do(r@_qu$-c -q#8hDJcF:#JcD_Lm/I"_qu$3cr;6Kio(i(To(DnPo(1].p%.kKp%A+Sp%eL]p&"O^rr)3_ec14#ec14# -RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcCc1q#:6joDSI^ -q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\])R?]ec14#NrSbNoD\Xcp&+(Orqah6qtf[Vo)/Lck5MslJcF:# -JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#JcFg2o)>llm/E4KJcF:#JcC<$jSt2<PQ-46ec14# -JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$ -JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec1. -~> %APLeod -EI -76 0 0 76 63 0 cm -BI -/Width 228 -/Height 228 -/BitsPerComponent 8 -/Decode[ -0 1 -0 1 -0 1 -] -/Interpolate true -/DataSource cg_aiproc -ID -JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$ -JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$JcC<$JcF:#JcC<$df6QN -JcC<$ec14#JcFg2o)>llm/E4KJcF:#JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#L&_,Nr;Q0` -n,2tXm/$VTn+cnXl2(2Pn,2YQq#7PuJcF:#JcCc1q#:6joDSI^q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\ -])R?]ec14#RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcDDC -rr2Keq#(*fr;6Kiqt]p[rqH*Zqt9jYp%-](qt'LQrq5sXrqH*\rqZHfq"sjap&4debl<7oec14#WW2bm -o)8Rcq"t$dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0dq"jd_ -qu$-cq#8hDJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjUqsX=JqsDo"rpBLK -qsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#[K$7*o)8Rcq"ssaqtU0bqt:$_ -r:U']rq$$Xqsj[TqsX=Io'?;?o',<#p$)A=p$;D?rpTaRrpfdSrq$-]rq6'[rqH3_rqZ?dqu$-cqu5[V -JcF:#JcEIaqu60brquZjq"k!bq"Od]rq69_!:p6_oD\=Xnc&"VnG_nRmf)VQm.foDl20];kPjW@jlYY' -jnn3;kOn'<l1jTDm/HDImf)_Tn,DhUnc&+YoD\C]p&=[^p\Xa\qYpBhr:U$]rpB`:s4..#s2Y0:rpp$e -r;6BjqYU*fq"sgbpAXaao`"I]o(qkWnaZVIrp]pTrpB^Orp0RKroj7BroX+>roEt:ro3V0eDU5_qr7V8 -qrIb<qr[n@qrn%Erp0RMrpB^Qrp]pUrp]gTrpp'[rq-3_rq??cqtU0dqtg<hqu$-cp&=[bJcF:#JcEmm -rr2BbrquZjrqcEbq"F^Zrq$-[qsj[SrpTpU!UfCTmJcGNlMg&IkkjQ?jo4?9iqq[5hu;R5htu:0h:LH] -h>#k+i;VX2i:u=/jSn9?kPOKBl2KuIli-;Nmf)_Tn,DhUnc&+YoD\CWpA"F[qYpBhr:9gcrq?ACs4..# -s3:TCrpp$er;QTjqYU*cp\sm`p&=U\nc&"VnG_nUmf)PQlN->;rp'LHqrdt>qr@S4rnm_5qqq;,qqV)' -rn?qrn(@<dqqD&(p"]Q&qqqD2rnm_5ro*k:qrIb>qrn%Erp0RMqsOIQrpTjUrpfmXrq60^rqHEfq"k!e -rquHfqu6EkJcF:#JcF=$rr2Kerqucmqtg3cqtL*`rq-*Zqsj[Srp]pTrpB^Nrp'LHroX:D!TrPDjo4<> -ir7p9i;;F2h>Z4/g\]\'f`'J!ec+(ke,IejdI5HWdJMAhe,.Yoebdqpf`'S'g]$"-h>Z=/i;V^7ir8!; -jo4EAkPj]El2L#JmJcPQnG_nUnG_tWoDA1WpAXgcq=sgcqu6NdrVZWprdk+#s+14$s76-fr;QTmqYp<c -q#:!dp&=U_o)%tVnG_kTmJcGNlMg&Ikl0`Djo4<@irS3#ro3q8rnm_3rnRM-rn@A(rn%%urmh"tpsT/g -p!<W_ps&9Ops&]]qp5/dpsT/krmgnsrn%/%rn@A+rnRM0rnm_5ro3q;roF(?roa:ErosFIrp0RNrpTjU -rpfmVrq-3_rq?-^rqZQirqlTjpAG!iJcF=$JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-irB#Wq#13iqtpBhqt^$]rq-*ZqsjRPrp9XMroj@EroX4@ro=";ro!e4rn[S. -!87J-gA]b(f)F1ue,.Plci2;jcMl&ebPoZ`ao9?[`r<sV`;@IO_Y_1*_#D1I_Z%IM`;[aT`r=$Xao9H^ -bPo`bc2Q)hci2;jdJhVoec+/!f`'S'g]$%.hu;R5ir8!;jSn<@kPj]Eli-;Kn,DhUnc&.Wo_A1[q>:$f -qu$?lr:p6frdk+2s+143s8N#jrV69eq>U0apAXX^nb_hTmf)VQli-2Kl2KfDjSn3=iVqd7hu;F1gA]e) -ec=5$e^aZKrmLenrm1ShrlkAbrlP/\rl>#Wrl"]OrkeQJrkJHHpq>Lqpq?R=qnW3JqnrEOrl+lWrlG)\ -rlb;brm(MhrmC_nrm^qtrmq)%rnIG-rnm_5ro*k:roF(?rosFIrp0RNrpK[QqssOUqtU0dq>10hp&4mh -JcFj3JcG'9qu69erquQfrqQBbqt9s\rp]gRrpB^Orp0RIroa:Cro3q9qqqD/rnRM+rn%/"rmCen!RT3m -ci25hc2Prdao9B\`r<pU_u@OP_#(nG^AbhF]`,PB])K8>\GNc7[cY!p[f3c5\Gj&<])K>@]`,VD^AbnE -_#D4M_u@UR`r=$Xao9N`c2Q#fci2>kdf.erfDaJ&h#?.,hu;U6ir8*>kPj]Eli-8MmJcSOnGDkWp&=^_ -q"aadqYU3frUp/@s6fo<s7--grq66hr;6BjqYp<iq#:$epAXaao`"F\nc&"VnG_hSli-,IkPjWCj8S'8 -hu;F1g]#h(f)F1udJhMlci2,gaoTZ-rlP/Zrl"fRrk\TLrkJHGrk/6Arji$<rjMg5qm61)ric=*ric4% -k,n<ZrilC*rilC,rj2L/rjMg8rji$>rk&0CrkJHJrk\TOrl+lVrlP/_rlkAfrm:Ylrm^qtrn%/(rn[J/ -ro*k:roX4Croj@IrpB^SrpTjVrpp'\rq69arqHEe!VuNkq>:$fqtp<grVQSFs7-,?s7--^rVl`lqu6Hk -q>U0gp\smco`"I]o)A.Xn,DbSli-2Kl2KfDjSn3=i;VU4h>Z.-f`'J$eGdnnci2/fb5TE]`W=*!rl"fP -rkSNJrk/6Arji$;rjMg6rj)O.ric=*riZ7&riH+"ri5jpri#^lk,/-Uql'Lnri5suriH+$riZ7)ric=+ -rj)O2rjMg8rji$?rk/6FrkSNLrl"fTrl>#\rlk8crmLeqrmq)$rn@A-rnm_5ro="=roO.Drp'LKrpKdS -rp]pXrq$-]rq??c!VlEiq#:*gqYU0hr:U#>s7-,?s7H?jrqQHkr;6BjqYp<iq#:$epAXaao)A1Vn,D_R -m/H8Kkl0`Dir7m8hu;I2h#?%,f)F1udJhMlcMl)fb5TH\`W!^S^]D6drkJHGrk/6ArjMg6rj;[0rilC* -riQ1$ri?$tri#gnrh]UiqkO.brh8/@rh9=cqkO.drh]Ukrhoapri?%"riQ1'rilC,rj;[4rjMg;rk&0C -rkJHKrkeZRrlG)]rltGfrm:Ylrm^qurn@A+rn[S2ro*k9roX4CrosFKrpBUOrpg!Yrq69a!Vc<gp\sse -q>U6iqtp<drVQSFs7cPEs8)cprq66hr;QQiq>9pcpAX^`oD\=[nG_nUmf)MNl2KoGjSn09i;VR3g]#e' -eGdqrd/M>ic2Piaa8X'W_>_7L^Ab_E\H07OrjVm5rj)F)riH+"ri#gorhf[irhBCcrh07_rgs+[rg`tW -rgN_Prg;i7qj@ANqjRMRrg`tYrgs+]rh07arhBCerhf[mri#gsriQ($riuI/rjVm;rk&0DrkJHKrl+lW -rlP/arm1SjrmUksrmq)'rn[J0ro="=roj@Grp'LNrpTjUrpp'[!VH!ao_\@]p\t!cqYU3frVQSFs8)bH -s8)cjrVl`lqtp3gq#:!dp&=U_o)A1Yn,DbSm/H>MkPjWCjo46<i;VU4gA]b(f)F.tdJhJkbl5caaSs*V -_Z%@M^AbbD\c/u:ZN7D=qlp(%ri?$srhf[krhKIeqk*kYrg`tVrgEbQrg*GHrfmDGqi^W7plPB8plbW? -rfmDIqj.5KrgEbSrg`tYqk*k]rhKIhrhoaori?%#qlp(+rjDa9rk&0DrkSNMrkn`VrlY5arm1SkrmUkt -rn.5(rndY3ro*k<roX4Crp0RMrpKdSrp^$[nc87[o`"O_pA=Xaq>U9gr:p5As8)bJs7lTgrVQKkqYp<i -q#:$ep&=U_oD\7Yn,DbSli-2Kkl0]Cj87d6h>Z1.fDa>"dJhMlc2Poca8X'W_Z%@M^AbeE\,Nf7ZMq'. -XoY].riQ1!rhoalrhBCbrh'1]rg`tWrg<\Nrg!AErf[8BqiC`:oo8j-pl"g(qi1K5rf?r<qi^rBrg!JL -rg<\Srgj%[rh'1`rhBCgrhoapriQ1&rilC-rjDa7rk/6DrkSNMrl+lWrlb;crm:Ylrm^r!rnIG.qr%J6 -roO.CrosFJrpKdS!V#RYnG`%Yo`"O_p\sseq>:$fqtU-bre(6*s82fmrVl`lqu6Hkq>U0gp\smco`"F\ -nc&"VnG_hSli-)Hk5OH@i;VU4h>Z+,fDa>"d/M>ic2Piaa8X$V_#D(I]`,A=[/RB1Yl:d(X8]$tV#dEh -rhKIcrgs+[rgNhRrg3VJrf[8CrfI,?rf6l6reg]2qhOs"qh+$_re(!!reLB,qhkB2rf6u=rfI,Arf[8E -rg3VPrgNhWrh'1_rhKIiri#gsriQ1(rj)O2rjMg=rkABIrl"fUrlP/arm1Sjrmh#"rn7;,rnm_5roF(? -roa:Hrp9aUn,VtWn,DkVo)A:\p&=^bq#:*gqYpBhr;QZfre^Z0s8N#mrV69hq>U0gp\smco`"I]nG_nU -mf)POlMg&Ijo4<>i;VU4g]#n*f)F1udJhDib5TK]_u@LO^](kE\c0);Z2V!,Y5YF"VuEOlU&^heTV2:U -rgWnTrg3VLrfd5@rf6u:reg]3reUH*re19'rdt#tomcsimsY(^pj`0krdt-%qh4s&reUQ1reg]6rf-f: -rfd>Hrg3VPrgWnYrh07brh]Ulri,n"ric=+rjVm;rk&0Erk\TOrlG)]rltGirm^qurn7;*rndY4ro="> -rosFI!UK%Oli->On,DhUoD\F^pAXgcq#:*aqtU-ere^Z6s7lTjrVl`lqu6Hkq#:$epAX^`o)%qUmf)SP -l2KoGk5O?=i;VX5gA]b(f)F(rd/M>iao9?[_u@IN^&GYC[JmN3Yl:g)X8]'sU]."eTDkD^RfT"JrgEbN -rfmDErfI,>rf-o7reUQ.re19'rdt-"qg\ToqgJ6dpj2CSpj2^^rdFZmrdXfqrdt-%re19*reUQ2rf-o; -rfI,Arfd>HrgEbTrgs+]rh9=dri#grriZ7)rj2U3rk&0CrkSNNrl4rZrm(MhrmC_rrn.5(rnm_5ro*k= -roX=HklBuIm/HDLnG`%Yo`"R`p\ssbqYpBhr;QZirf$l<s82fmrVl`lqu6Hkq>U0gpAXaao`"C[nG_nU -li-2Kkl0]Cj8S!9hYu:/g&BM#df.Slc2Pia`r<gR^](qG\,Nf7Z2Us+X8]*tV#I+fTDkG]S,SfSP5paH -P*5g*rf6u:reg]1re:?(rdk'!rdXoqrd=]lrd"Kfrce6^rcJ$Yqf:h=olC%QqfMg[rce?drd"Kird=]n -rdXotrdk'$re:?,reg]5rf6u=rfR2Drg<\Rrgs+]rhBCfri,muric=+rj;[6rk8<Grk\TRrlP/arm1Sl -rm^r#rnIG/ro!e9!TiDCjo4KCl2L#Jn,DhUnc&1[p&=[aq#:*gqYpBhr;QZfrf[;Bs8N#mrV69hq"sgb -p&=U_o)A.Xmf)SPlMg#Hk5OB>i;VU4g&BY'f)F%qcMl&ea8X'W_>_1J])K2<Zi73.Xo>=!VZ*=hT`1M] -S,ScRQ2ZsGO8t7@NK*pqreLK-re:?&rdautrdFcmrd"Kfrce?brcJ$Yqf2LPrbpD+rbqRNrc.pYqfMg\ -rce?drd"KirdFcqrdb!!re:?+reLK2rf-o=rf[8Grg3VRrgj%]rhBChri,n!rilC.rjVm<rkABJrl"fV -rlkAerm:Yqrn%/&rndY4!TN)=ir8*>kl0lHm/HGPnG`"XoD\F^p\Xa\qtU-erf[;Hs7lTjrVl`lqu6Hh -p\smco`"FYn,D\Qli-,Ijo49=i;VR3g]#e'e,I_ncMl#daSs'U_#D(I\c0&:Z2Us+X8]*tU]-tdTDk>Z -R/WBMOoCIANrFn9L]N<freCE(rdautrdFcnrd4Whrc\9_rcA'Zqf)FNphg"HqeP#&rbMCIphfnHqf)OT -rcA'\rc\9crd4WlrdFcqrdk'#reCE.reg]8rf@&@rg!JMrgWnZrh9=dri,muric=+rjDa9rkABIrkeZU -rlY5crm:Yormq)'rnRV5huM^7ir8*>kl0oImJHAOo)A:YpAXg`qYpBhr;QZirg!MNs82fmrVl`lqu6Hk -q#:$epAXaao`"C[nG_nUli-/JkPjK?iVqa6g]#h(ec*qpcMl&e`r<mT^](qG\c0&:Yl:d(X8\spU]-nb -Sc5&VQN!$GOT(:>MZ/D1L&QW'J,t1NrdXoprd+QhrcS3^rc8!WqeuINrbVRLrbDFGqe,n?rakb5ojdc+ -qd]2-ral(@qe,nBrbDFJrbVRNrbq[Qrc8!ZrcS3crd4WlrdXotrdk'&reUQ2rf6u=rfR2GrgEbVrh'1a -rh]UpriZ7)rjMg:rk8<Grkn`TrlkAerm:Yprn%8+gAp"-hu;U6ir8-?l2L#Jn,DhUnc&1[p&=[ap\t!f -qYpBhr;QZfrgWqTs8N#mrV69hq"sgbo`"I]o)A.Xmf)SPl2KlFjSn*:hYu=0f)F1udJhDib5TK]_Z%=L -]`,D>[/R</XT#0tV>d1fT)P5YQi<6KOT(:>MuJS4L&Q`(JGsutHNAJ?rd"Kerc\9_rc.pVrbh^OrbMLJ -rb21Arau.@qdf\9raPY2ojIQ%nmM6$raPk:qdf\;rau.Bqe5tDrbMLLrbh^Rrc.pZrcS3ard"KirdOis -re(3(re^W4rf6u>rfmDKrgWnYrh9=fri#gtrilC/rjVm>rkJHLrlG)]rltGirmUu"ec=;#h#?./i;Vg: -kPj`Fm/HGPnG`"XoD\C]p\Xa\qtU-ergWqTs8N#prVl`lqu6Hhp\smcoD\=Xn,D\QlMfrFj8S!9hYu:/ -g&BG!d/M>iao9<Z_Z%=L]DfA?ZMq',Xo>3sU]-nbSc5&VQN!$GO8b.<M>i8/K)U<"If=`oGQ;mfG'<k, -rc.pVrbqdQrbVRLrb;@Frb)4@qd]M3ra5Y4qd9,)pg*>npg*Z$qd9>1ra5Y4raGe9qdf\=rb2:FrbMLL -rb_XQrc%jVrcJ-_rcnEirdFcrrdt-(re^W6rf@&@rg*POrgj%\rhKIiriQ1(rj)O6rk/6FrkeZSrlP/b -rm1\odK%_pg&Bb*hYuI4jSn<@lMg/In,DkVoDA7\p\Xgdqtp<jrVQS`s.98irqlZnr;6BjqYp9hp\smc -o`"I]nc&%Wmf)MNkPjTBir7m8hYu1,ec+"rd/M8gaSs'U^](qG[f3W4YPtX&W;`UlT`1M]Rf8NMOoCF@ -MZ/D1K`6N$If=`oH2`$eFT-7[DujosrbqdPrbDFHrau.@rac";raGe5ra>_4ra,J-r`oG,r`];(oiU?X -nlYlor`];*qcs,+qd080ra5Y5raPk;ral(@rb;@IrbVRPrc%jVrcJ-_rd"KjrdOisre19+reg]9rfR2D -rgNhWrh07drhoasric=-rjMg>rkSNMrlG)^!RT0nd/MJmf)F>$hYuI4ir8'=kl0lHmf)\Snc&.Zp&=[a -p\t!fqYpBhr;QZlrgs.]s7lQfqu6Ejq#:$eo`"I]nc&%Wmf)SPkPjTBir7m8h>Z.-ec+%sci2,ea8X!U -^](kE\Gif5Y5YL$V>d7hTDkA[R/W?LOT(7=MZ/>/KDpB"IK"QlGlDgaEr0bTC]S?grbDFGrau.?raYq: -qdBD0ra#;'qcWo#pfGX=pfI>pr`T##ra#M0qdBD4raYq<rau.CrbDFKqeuISrcJ-ard+QlrdXp!re:?/ -rf$i<rfmDLrg`t[rhBCgri?%%rj)O5rk&0Erkn`U!R&XdbPoiedf.ergA]n,i;Va8jo4HBm/HDOnG_tW -oD\C]p\sseq=sj^rLX%_s8N#mrVQKkqYp9hp\smcoD\=[n,DbSm/H;Ljo4<>hu;I2g&BV&dJhJkbl5W] -_u@FM]Df8<ZMq',WrAmpT`1P^SGnfQP5^OAMuJP3L&QW%If=`oGlDjbErL%WDZ4MPC&hoJBP@BXraYq: -ra5Y4ra5Y2r`oG,r`]2%r`K/#pf7;mr_reoe5?*@r_reqqc3MoqcNi#r`];*r`o>,ra>_4raGe9rb)4E -rbDFLrbh^Src8!]rcnEirdOisre:?-repc:rf[8Grg`tZrh07fri5t$rj)O4rk&0ErkecV`W4$Xbl5oe -dJhbsgA]q-hu;X7jo4QEli->On,DkVoD\I_p\ssbqYpBerVQSis/5nrrqQHkr;QTmqYp<iq#:!dp&=U_ -nc&%Wn,DVOkPjTBiVqa6h>Z%*eGdhoc2Pf``W![P^&GVBZi73.Xo>3sU]-nbS,S`QP5^OAMuJP3K)U<" -J,X`mGQ)^`E;jeTDZ4DMB`;WC@fTs=@Uf=Dra>_3r`oG,r`];'r`8nrr`&kqqbm;gnkf<]r_W8`peLT[ -r_WSinkf<_peq)ir`&ksqc<\ur`T5)r`oG.ra>_4raGe9rau.CrbDFMrbqdTrcJ-_rd"Kmrdk'#reUQ3 -rf@&Arg3VRrh'1brhf[srilC.rjr*B!PlJN_#D=Pao9Qad/MPofDaV*hu;U6jo4KClMg8OnG_tWo`"O_ -pAXjdq>U6iqu6NjrVQSls/5nirVl`oqu6Ejq#:$ep&=U_o)A.Xmf)SPkPjTBir7m8h#?"+eGdkpcMkoa -`W!^Q^&GP@[/R</XT#0tUAgb`S,S]PP5^OAM>i;0KDpB"HiA<iFT-=[DuOYRD#S2KB)Z??A,]j9?3+A= -ra#M-r`];(r`B)"r`/qsqc!Ahr_NMiqbQu^peBR<peCNYqbR2fr_NMir_`Ynqc*Ppr`9#"r`T5(r`fA- -ra5Y4raYq=rau.ErbMLNrbqdVrcJ-brd=]pre(3)re^W8rf[8GrgWnZrhBCjri?%&rj;[8!PQ/H^&GkI -`W!sXcMl5jeGe/#h#?72ir8'=kPjiImf)_To)A7[p&=^bq#:*gqu6NdrMT[qs8N#mrVl`oqu6Hkq"sgb -o`"FYn,D\QlMfoEj8Rs8h>Z+,f)F%qc2Poc`;[UP^](bB[/R9.X8]!qUAgeaRf8WPOT(7=MuJD/Jc:/u -HiA9hFT-7YDZ4MPCAqoGB)Z9=@/aO4>l\+1>[784r`K/$r`9"ur`&kpr_`YkpeUlaqb?`Wpe0F8pe10O -r_<8bqbR2fr_`Ymr_rerr`9#"r`K/(r`oG.ra5Y5raPk=rb2:Grb_XQrc%jYrce?grdXp!re19/rf6u> -rg*PPrh'1arhoarric=.!P#W>\Gj8B_Z%LQbPofdd/MVqg&Bh,hu;X7jo4QEm/-8No)A:\p\XabqYpBk -r:p6friQ4#s8N#prVl`oqYU*fp\smco`"C[nG_nUli-/Jk5OB>hu;I2fDa;!d/M;haSs-W_#CtF\,NW2 -Xo>C#U]-qcSc4rSPQ$XBMuJJ1K)U<"I/\EjF8g4ZDuOSPC&VcEA,]s7?iF=0>Q._)<WQ6%r`/hor_iVi -r_NMir_EGer_32^r^uiTqaf4,ognsOqb$i\qb6u`r_EGhr_NDfqbmDlr`/r!r`K/(ra#D.raGe9rb)4E -rbVRPrc.pYrd"Kjrdb!"reLK2rf@&Brg*PSrh07cri?%$!O/d.Yl;-2]DfVF`;[mXc2Q)heGe)!h>Z@3 -ir8*>kl0oIn,DhUnc&1[p&=^bq>:$cr;QZlriQ4&s8N#prVl`oqtp3gq#:!do`"I]nG_kTm/H8KkPjN@ -i;VO2g&BM#dJhGjaSs0X_>_(G\,N`5Xo>=!V>d.eSGnoTOoCC?MuJG0K)U9!HN&-fFT-7YDZ4JOBDuNB -AH$!9?N+70>Q.e)=8l2";uortr_r\kqbR)`r_3;aoh+mJogdM$qa^3Joh,3Vr_3;cr_E>dr_WSkr_req -r`/r!r`T5)ra#M1ra>_9ral(ArbVROrc%jYrce?frdXp!re:?0rf6u?rg<\Srh07eri#q#XT5L&Zi7H5 -]DfYG`W!sXcMl5jeGe/#h#?72j8S3?l2L&Kmf)_ToD\F^pA=Xaq>U9jr;6HlriQ4)s8N#prVl`lqu6Ej -q#:$eo`"F\nG_nUm/H>MkPjQAi;VU4gA]_'d/M;hbPoHZ_>_1J\,N`5YPtO#V>d.eSGnlSP5^L@MZ/D1 -JGsurHiA0eF8g+WDZ4GNB`;N@@fBa6?N+4/>5hY'<rQ+u;?0Pp;,R<gr_WSir_EGdqb-o\oh#-Rqa^3H -e4&^nr^ZiVqapZWr_*,^qbI,er_NMjr_i_qr`B)$r`];*ra,S2raGe9rb2:Grbh^Rrc8!\rd4Wnrdb!' -reg]8rf[8Irg`t\rhTXpW;rpsYPtm-\,O,@_>_CPbPofdd/MYrgA]t.i;Vg:kPjfHmJcSRnG`%Yo`"Ua -q#:*gqtp<jrVQSus0Mb)rqQHhqu6Hkp\smcp&=O]nc&"Vm/H;Lkl0T@i;VX5f`'G#dJhDiaSs-W_#CtF -\,NW2XT#3uU&LY_S,SWNOoCC?LAli)J,XipGlDgaE;j_RC]7rFAH$$:@/aL3>lIk)<rQ+u;Ys>j:]O8l -:J^sbr_3;ar_!&Zr^coVog\gIqaA:gogJdJnj`UKqag]Xr_!/_r_3;dr_NMir_`Pjr`/r!r`K/)ra#M2 -raGe:rau.Frbh^SrcJ-`rd=]pre(3)rf6u>rfd>Nrgj.aT`CecWW'%!Yl;-2]DfVF`;[mXc2Q,iec+5# -hu;U6ir80@l2L&Kn,DkVo)A=]pAXg`qYpBerVQT&s0Mb)rqQHkqu6Hkq>U-fpAX^`nc&%Wmf)MNkl0`D -i;VR3g]#b&df.SlaSs0X_>_(G\,N`5Xo>9uU]-nbRf8WPOT(4<M>i,+J,XipG5cR^DuOVQC&VcEA,]p9 -?iF:/>5h\(<W5ts;uTVj:]=)h9`[s_r_3;`qapcXqa^WTogSaGYXA(OqaLBOr^ZiVr^luZr_3;cr_EGg -qb[8jr`&ksr`T5(r`fA/raGe9rb)4Frb_XQrcA'^rd=]prdt-+rf-o=rg*PP!M>taTDkVbW;`puZi7H5 -]DfYG`W!sXci2Alec+>&hYuI4k5OTDlMg5Nn,DkVo`"O_p\t!fqYpBerVQT&s0Mb)rqlZnr;QQlq>U0g -pAX^`o)A.Xmf)SPkl0]Cir7m8h#?"+df.Slbl5Q[_>_4K\,N`5YPtL"V#I"cS,S`QOoC@>M#N&+J,Xfo -GlD^^DuOVQC&V`D@fBd7?N+4/=oMP&<rQ"r;>sAj;#X5h:&[fd9*%[Yr_!&Zr^cfRpdP0Mj$V<_ksP>9 -pdOsIqag]Xr_!/_r_3;cr_EGhr_NMjr_i_rr`B)%r`oG.ra>_7rau.Drb_XQrc.p^rd4Wore(3+rf-o> -rg!SSRfJrWTDkYcW;a""Zi7H5^])+L`;\![ci2Alg&Be+i;Va8k5OTDm/HDOnG`"Xp&=[aq#:*gqYU3i -rVQT&s1/1/rqQHkr;QTmq>U0gp\sgao)%qUm/H8Kjo4<>hu;C0fDa7ud/M5fa8WmR]`,G?Yl:d(WrA^k -T)P5YPQ$[CN;eM0Jc:/uGlDjbEW0nUCAqlFA,]p9?iF=0>5hY'<W5ts;Z9Ml:]=,g9`@]a9)_B^8-)7P -r^Z`QqaLKPksM[AlpLY<r^HTOr^ZrYr^m)]r_*5ar_EGgr_WSlr_rerr`K/'r`oG0raGe9rb)4GrbqdU -rcS3brdXp!re190rf7)DP5pgGS,T#YU&M(kXo>R(\Gj/?_#DCRbPolfe,Itug]$+0ir8'=l2L&HnG`%Y -o`"Uaq#:*gqu6NjrVQT)s1/1/rqlZnr;6Bjq#:$epAX[_o)A+WmJcDMkl0WAi;VR3fDa;!d/M8gaSs*V -^&GP@Zi7-,WrAjoTDk;YQ2ZmEN;eY4Jc:,tHN&$cEW0nUCAqlFAH$$:?iF=0=oMM%<W5qr;Ys8h:&[ic -9)_EZ8,u0X8,,OP7,pY=6Kpl77/04M8,,XS8cD?]9`@c`:]=5j;uTer=8lA%>lJ(/@K'g:BDuZFDuOeV -FT-UcIK"fsM#N;5OH9I(rg!JOrh'1dri,n"rj2U6rk8<Krl>#^rm:Yorn%/*ro!e9roj@HrpB^Rrpg!Z -rq??crqQKiqu$Hlqu4/+\c;[.qu-EhrqcWgrq??arpp'XrpKdOrosFEro!e3rnIG&rmLelrlG)WrkJHD -rjDa/ri?$prh07[rg*PGrf$i3rdt-!rd+Qfrc%jSrbVRHrabn5r`oG+r`9"tr_`Ykr_NMgr_3;ar_!/] -r^d#YrC6]SqaLKPmmE@,mmHt?r^HTOr^ZrYr^m)]r_*5aqbI,er_`Yor`9#%r`o>-raYq?rbVROrc%j\ -rd4Wordt-)!K;s;N;et=QN!BQT`1hfX8]=%[/RZ9^])1NaSsNbdf.erg]$(/i;Vm<kl0oImf)_To)A=] -pAXg`qYpBkrVQT)s1JC2rqlZnr;QQlq>U0gpAX^`oD\7YmJcGNkPjTBiVq^5gA]\&d/M8gao90V^AbbD -Zi70-X8\mnT`1J\PQ$[CNW+V1Jc:/uGQ)^`E;j_RC&V`D@K'X5?2dt*<rQ+u;Z9Pj:]=&e9D_<[8GG[Q -70,hGr^?3BK0o#oqaCEPpdY-Or^m)^r_<8cr_`Ymr`/r!r`K/*ra5Y5rau.Drb_XRrcJ-`rdXp!!JH++ -K`6u1OT(ICSGo/[U].=nYPtm-]DfSE_Z%[Vc2Q)hf)FA%hYuL5jSn?Ali->OnG`%Yp&=[aq#:*gqYU3i -rVQT/s1eU5rqlZnr;QTmq>U0gp\sjbo`"C[n,D\QlMfrFj8Rs8g]#h(e,IYlb5TE[_#CtF\,NW2X8]$r -T`1J\R/W3HN;eY4Jc:,tHN&$cEW0kTB`;TB@fBd7?2e%,<rQ+u<;o_n:]=,g9`@]a9)_BY8,,OP6i]U> -6c_Uh6,c1W6i0:H7K,gS8H)6\9E%Wa:B"&g;#XGn<W6%u>5he+@/aX7B)ZKCDZ4YTFT-UcI0"nM!.k-* -rf$i<rg<\Trh07griH+'rjVm=rkSNQrlY5crmUkurnIG0ro="?rp'LLrpTjVrq$-^rqHEerqZQjrquZl -rr0\4^]4<4qu-Nlrql]jrqQKerq-3\rpTjSrp0RIroF(;rnm_.rmh"prlkA^rkeZJrjVm4riQ0trhBC_ -rg3VIrf6u7re(3"rd+Qfrc%jRrbMLEraYq7ra#M,r`K/"r_r\jr_EGdr_!&Zqa^WTqaLKPrBp0D^I%oc -q`t-H^I%BVqaCEPqaUQTr^luZr_3;cqb[8jr`/r"r`];,ra5Y6ral(Erbh^Srce?g!IoS!J,Y*"M#NG6 -P5^jJSc5A_W;`puZMqB5^&GnJa8X<^d/MSpg&Bn.ir8$<kl0lHmf)\So)A:\p\sseq>U9jr;6HlrkJKM -s8N#prVl`oqu6Hkq#:!dp&=O]nG_nUli-,Ijo43;h>Z.-eGdkpci1r`_Z%=L[f3T3YPtEuUAgeaQN!'H -NrFe4K)U9!GlDgaE;j_RB`;TB@K'X5>lIk)<rQ(t;>sDk:]=&e9E%Q_8GbpV7f,XR7/'(B6c_UM5fH(\ -6i0:N7JfRR8,GjV9)_K_9`@ie;#X>k<;oqt=T2S)?N+C4Ac?ECD>nMRFTH`3!-nKmre(3)rf6u@rg*PU -rhKIiric=-rjMg@rkn`Trm1Slrm^r$rn[S3roO.Crp0RPrpg!Yrq69brqQKhrql]mrr)`n_Z.LQq#13h -rqcWirqHEcrq69\rpTjRrp'LGro="8rnIG)rmLekrlb;YrkJHErj2U-ri5slrgs+Xrf[8@reg]-rdXoo -rcS3\rbqdMrau.=ra5Y0r`];%r`&kpr_WShr_<AaqapQQqaLKPoL&=>d6dUoh*Ca$c9gkbqaCEPpdb<T -qb$i^r_NMir_i_pr`9#%r`oG0raPk=rb;@Mrc/$^FT?R`HiANoKDpc-NrG4@Rf8oXUAh1lY5Yd,]DfSE -_u@jYci2Alf`'Y)hu;[8kPjcGmJcSRnc&4\pAXgcq>U6iqtU-,s2+g2rVl]nqYp<ip\smcoD\7Ymf)SP -kl0ZBi;VR3g&BP$d/M8ga8WmR]`,G?Yl:^&VZ*7fS,S`QOT(1;LAl`&I/\BiEW0nUD#S&GA,]j7>lIq+ -=T2;!;>sAj:B!ue9`%E\8GG[R7.*DC6USp]b<X$5njE:BpdY-Or^m)_r_<Aer_NMkr`&l!r`T5*ra5Y7 -rau.Grb_aVE<("XGlE'hJGt<&MuJh;QN!BQT`1hfX8]@&\Gj/?_#DCRbPolfec+8$h>Z@3jo4KCm/HDO -nG`%Yp&=^bq>U6iqtU-,s2G$;rqlZnr;QQlq#:$ep&=R[nG_eRl2KfDj8Rs8gA]\&dJhDia8WsT^&GM? -ZMps)VZ*7fRf8TOOT(.:L&QW%I/\?hEW0nUCAqlF@K'X5?2dt*<rQ(t;#=&f9E%Q_8cD9[8,c!T7K,^G -6i'-q6FfA#6M3_C7/fXS7fGpW8H)3[9)_K_:]!uf<;oqt=T2V*?iFL5BDuZIDf5Vorc.p\rd=]qre:?/ -rfI,ErgNhZrhf[rrj)O5rk8<JrlG)`rmC_qrn@A/ro3q=rosFKqsaUVrq69brqZQiqu$Hlqu4\:aT)8= -qu-Nlrql]jrqQKerq-3\rpTjRrp'LHroF(:rn[S*rm^qnrlY5ZrkSNErjDa/ri#gkrh'1Urf[8@reCE( -rdOijrcA'WrbDFFraYq8ra#M,r`9"tr_`Ykr_EGdr_!/]r^d#Yr^QcRr^?3BqEih$pd)GUpd*1lnjECE -qaLKRr^ZrYr^m)]r_3;cr_WSkr`&ktr`];+ra>_8rau7HC&i#JDuOhWGQ*'jK)UN(NrG4@QN!NUU].4k -YPtp.])KME`W"$Zci2DmfDaV*iVqp;kl0lHmJcSRo)A:\p\sseq>U9jr;6HlrlG,\s8N#prVl`oqu6Ej -q#:!doD\:Zn,DYPl2KlFiVq^5g]#_%dJhGj`r<jS^AbS?Z2Um)U]-qcSGn]NNrFt9K)U5uHiA*cE;j_R -BDuH@?iFC2>Q.b(<;oem:]=&e9E%N^8H)-Y7f,XR7.N_;6J+W&5g)Le6i0:N7JfRR8,c'Y8cDB^:&@`c -;Z9Yp=T2M'?N+=2@f^4T!,):Jrc%jXrd4Wordt--rf@&Arg`t[rhKIprj)O3rkABKrl4r_rmC_prnIG/ -ro*k>rosFJrpTjVrq$-_rqHEfrql]mqu-NnaT'H`rr2fnrqucmrqcWgrq??`rpg!WrpKdLroX4?ro!e1 -rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJraYq9ra5Y,r`9"ur_`Ykr_NMd -r_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5dr_WSkr`/r!r`K/,ra>h;@fU$< -C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYrg]$.1j8S3?kl1#Ln,DkVo`"O_ -p\t$gqu6NmrVQT;s3(HArqlZnqu6Hkq>U-fp&=R^nG_kTm/H2Ijo46<h>Z(+eGdenb5TE[_#CtF[Jm?. -WW&[lSc4uTP5^F>L]2o)I/\?hErKtUCAqlF@K'X5>lIe'<W5ts;#X5h:&[ca8cD9[8,c!T7K,^D6h*M+ -6N0935lO(!6LmMC7/KFP7fGpW8H)3[9)_Qa:]=2i<;ons<rQA'?3+JC!+Gk>rbDFMrc8!^rd=]sreLK3 -rf[8Jrgj%`ri#h!rjDa:rkSNQrlb;erm^r#rn[S4roF(Arp9XPrp]pYrq69brqZQirql]nqu4e=bQ%S@ -qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXol -rcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Acr^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQT -r^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtL -ao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[aq>U6iqu6Qkrlb>es8N#prVl`oqYp9hp\sjboD\7Yn,DYP -kl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1YDZ48IA,]j7>lIn*<rQ"r -;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^:&[rf;>sJm<rQ2%>[.86 -ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUkurndY4ro="Arp0RPrp]pY -rq69brqZQiqu$Hlqu5"CcN!nCrr)iorql]jrqQKerq69^rpTjRrosFFro3q7rnRM'rmLekrl4rRrk8<= -rilC&rhKIargEbJrf-o6rdk&srcnE^rbh^Nrac":ra,S-r`B(ur_WSir_EGcr_!/]r^ZrWqaLKPmmH;* -o0S!nnNb\mnjECEqaLKRr^ZrZr_!/_r_EGgr_WSnr`9,(=o_b*?N+C4AH$BDDZ4YTGlE*iJc:N*NW,(> -RJrfWU].=nYl;'0^&GnJ`r=9_dJh\qh#?41ir8-?lMg2Mn,DnWp&=^bq#:*gqu6NmrVQTAs3CZDrr2lq -r;QTmq>U0gp\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pb -E;j\QB`;H>?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N` -:&[ug;Z9\t=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A, -ro!e;roj@IrpTjWrq-3arqQKgrql]mrr)`ndJqVorr2fnrquclrqQKdrq69\rp]pTrosFEro3q7rn@A' -rm:YgrlG)Srk&0;ric=#rhKI`rg3VHreg]/rdauorcS3ZrbMLGraYq8r`oG*r`/qrr_NMgr_3;`r^m)[ -r^QcRr^?<Ei'IE0!C9#&5hSF%6/=m#6i0:N7K,dU8,c*Z9)_K_:B"&g;?9ct!*0#$r`oG1raYq?rbMLP -rcS3drdb!%reg];rg3VTrhKIlric=/rk&0FrlG)_rm:YrrnIG0ro3q>rosFMrpTjVrq69brqQKhrqlTk -rr1=FdJs4Fqu-NlrqcWgrq??arpg!Vrp9XJroO.<rn[S+rm^qnrlY5ZrkABBrj2U*rhf[frgNhNrf@&6 -re(3"rce?_rbqdLral(;ra#M,r`K/!r_`Yjr_3;`r^m)[r^ZrWr^HfSmmH,%rBUHM6%M;P5lO(-6LmMC -7/fXS7fGpW8H)3[9E%Wa:]=5m<)`isr`K/'ra#M3ral(BrbqdWrce?kre(3*rf@&CrgNhZrhf[rrj2U6 -rkABNrlY5drm^r#rn[S4roO.Crp9XPrpg!\rq??crqcWkqu-NndJq_rrr2fnrqucmrqcWgrq??_rp]pS -rp0RHroF(9rnIG'rmLejrlG)Vrk/6=rilC%rhTOcrg*PGrf-o1rdauqrcS3[rb_XIrac"8r`oG*r`9"q -r_WShr_*5_r^luWr^QlTnjD5"rBPp!d6QMSogAUEqaUQTr^m)]r_*5cr_EPl;#jJm<rQ5#>lJ+0A,^-? -D>nPSFoHdfJGt6$NW,+?QN!NUV#ICnYl;*1]`,hJaSsH`df.ktg]$+0j8S6@li-;NnG`%Yp&=^bqYpBk -r;QZlrm^tts8N#prVl]nqYp<ipAX^`nc&%Wm/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQL -NW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO -7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8rbDFLrc%j]rd=]qre^W6rfR2Lrh07driZ7+rjVmArl"fX -rm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQirql]nqu5+FeGoOIqu-NkrqcWhrq69^rp]pTrp0RJro="9 -rn[S)rmLekrl4rSrkAB=ric=%rhBC_rg<\Hrepc1rdXonrcS3YrbMLHraPk6r`oG'r`&kor_NMer_*5^ -r^d#YpdOa@j$NW/qETTsb<Z%mi'R*(pdP0Pr^d#[r_*5b!DcJk:]=5j<;oqt>lJ+0@fC'?C]88OFoH^d -J,Y3%MuJh;R/W]VUAh4mYl;$/^Ac"K`r=9_df.hsh>Z@3j8S<Bli->OnG`%Yp&=acq>U9jrVQTDs4%)J -rr2lqr;QQlq#:$eo`"F\n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"Kj -F8g(VCAqfD@/aI2>5hP$;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha -:/1dar_NMkr`/r$r`oG1ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5 -roj@HrpB^Rrpp'\rqHEfrqcWlrr)iqeGn%uqu-NlrqcWhrqHEarpp'Wrp9XJroO.;rnRM+rmC_jrlY5W -rk8<?rilC%rhTObrg<\Ireg]/rdXomrcJ-XrbMLFraPk6r`fA(r_reor_NMfr_!/]qa^WTr^?EHi'RE/ -nN_Xj`BaDgh*V!+qaC<Nr^ZrZr_!8d9`Roe:]=5j;uTnu>Q/"/@fC$>C]88OFT-RbJ,Y-#MZ/b;Qi<TU -V#ICnYl;-2^&GnJb5TZbdJhhuh>Z@3jo4KCm/HJQo)A:\p\t!fqYU3irRCkss8Murr;QTmq>U0gpAX[_ -nc&"VlMfuGj8Rs8g]#k)d/M8gaSs!S]Df5;Xo>6tUAgV\Q2ZjDM#N&+If=NiErKtUB`;TB@K'R3=oMJ$ -;Z9Ml:B!oc9)_E]8,c!W7Iih+6Mj(=5_22;5lO(-6M3_F7K,dU8,c*Z8c_RX!)*;dr_WSlr`9#$ra#M3 -ral(Brbh^Urc\9irdt-*rf@&CrgNh\ri#gurjDa;rkSNSrlkAgrn.5)rnm_8roa:GrpTjVrq$-_rqHEf -rql]mrr(@HfDkjLrr)iorql]jrqHEbrpp'XrpKdMroX4>rndY.rmh"orlY5[rkJHCrj2U)rh]Udrg<\K -rf6u3rdk&rrcJ-Yrb_XHraPk6r`];&r`/qor_EGer_!/]r^d#Xr^HfSnjDG(lTg"d^Hg^DogA^Hr^HfU -r^d#[!D5ra9)_Qa:]=2i<W6,">5hn.A,^*>D>nPSFT-[eJGt9%NrG4@R/W`WV>dOpZi7N7^])7PbPoie -ec+8$hYuO6k5OWEmf)_To)A=]p\t!fqu6NmrVQTJs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2 -fDa4tbl5Z^_Z%1H[JmB/W;`RkT)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U -7K,^M6fUN460LRb5eKA]6/t<,6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcs -reg]8rfd>QrhBCjric=/rk&0Hrl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfn,rr2fn -rquclrqHEcrq-3ZrpB^NroX4?rnm_0rmq(rrlb;\rk\TErj2U,rh]UergWnMrf-o5rdauprce?\rbVRI -raPk6r`oG'r`&kor_NMer_*5^r^d#Xr^HfSog@k.qa'F2JO$b2r^#[5ogA^Hr^HfUr^Qu\8H;?]9E%Zb -:]=5j<;oqt>lJ+0@fC'?D#SDQGQ*!hJGtB(NW,+?S,T)[V>dXsZi7N7_>_IRbPoogf)FG'hu;[8k5O]G -mf)_To`"O_p\t$gqtp?krn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49=hu;=.ec*nob5T?Y^](_A -ZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\8,c!W7.iq-6K17]5dir9 -6Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1rfI,Hrgs+`riQ1*rjVmA -rl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOgAh0Orr)inrqcWirq??`rpg!Vrp0RJ -ro="9rn[S)rmLelrl4rSrkAB<ric=$rh07[rg!JDreUQ*rd=]hrc.pRrb2:@ra>_1r`K/!r_i_kr_<Aa -r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_*5br_NMkr`&l!r`fA0raYq?rbVRRrc\9grdt-+rf@&D -rgWn[ri5t#rj2U<rkeZSrm1Smrmq))ro!e9rosFKrpTjVrq-3`rqZQirql]nrr1XOgAh0Orr)inrqcWi -rq69^rp]pTrp0RIro="9rnRM&rm:Yhrl"fOrk/69riQ0trh'1Xrfd>?reLK(rd4Werc%jPrau.=ra,S- -r`B(tr_`Yjr_*5_r^m)YqaL'Cj$M`jJO$Y/i'R*(r^H`S!(QrZr_!/_r_NMjr_retr`];-raPk>rbMLP -rc\9frdk''rf$i?rgEbXrhoatrj)O9rkSNOrltGirm^r&rnm_8roj@HrpKdTrq$-^rqZQirql]nrr1XO -h>dKRqu-NkrqcWhrq69^rp]pTrp'LGro*k5rnIG$rm:Ygrkn`Mrji$4ri?$prgj%Trf[8<re19#rcnE` -rbqdLral(;ra#M+r`B(sr_WShr_*5_r^d#Xr^HfSpd<k(i]r&[[QrY8pd>$Kr^?iW7K>pW8H)3[9E%]c -;#XAl=8lD&?2e:3Ac?BBDuOkXGlE3lK`6l.P5^jJSc5JbWrB7%\c0>B_u@mZci2Dmg]$(/iVr$>lMg5N -nG`%Yp&=acq>U9jrVQTMs5!_SrqlZnqYp9hp\sgao)A+Wm/H5Jjo43;h#?"+df.Pkb5T6V]`,A=YPtL" -UAgV\Q2ZjDL]2o)If=KhErKtUB)Z<>?iF:/=8l5!;#X5h9`@W_8H)-Y7K,^J6fp_g5_22&5itE+6iKIS -77@2Fr^ZrYr^m)_r_EGhr`/r"r`fA/raYq>rbh^TrcS3hrdt-)rf@&CrgNh\ri,n#rjMg=rk\TVrm(Mk -rn7;,ro!e;roj@JrpTjWrq-3arqZQirr)`nh>c=2rr2fnrqcWhrqHE`rpg!Vrp0RIroF(:rnRM*rmC_i -rlP/Trk&0;riQ0trh9=Zrfd>Are:?&rd=]erc%jQral(<ra5Y-r`B(tr_WShr_3;_r^d#Yr^HfSog@k. -fg(*RX[)#8ogA^H!C]EW7K,gV8H)3[9`@cc;#XDm<rQ8$?iFO6Ac?NFE;jtYI/\ZqL&R,3PQ%!LU&Lth -Xo>a-]DfVFao9QadJhetg]$.1jSnBBli-APnc&.Zp\t!fqYpHjrn[V1s8N#srVl`oqYp9hp\sd`nc%tU -lMfuGj8Rs8gA]\&d/M8ga8WmR])K)9X8\poTDk/UOoC@>K`6K#HiA'bDZ4GNAH$$:?N+(+<W5nq;#X5h -9`@W_8H)*X7.iq-6J4VT5cm<06Mj.J6i]XS7fGpW8cDE_:&[ug;Z9_r=T2Y+@K'g:C]88OErLFbJGt6$ -NW,+?QN!NUV>dOp[/RZ9_#DCRbPolff)FG'hu;[8kPjcGmf)_ToD\L`q>U6ir;QZorn[V1s82cor;QNk -q#:!do)A.Xmf)GLjo46<h>Z(+eGdhob5T?Y^&GM?Z2Ua%U]-nbPQ$XBMZ/2+IK"KjE;j\QC&VT@?iF=0 -=8l5!;>sAj9`@Z`8H)-Y7fGgK6fUMd5_22&5i>!+6i9=P7/f[T8,c'Y9)_N`:]=5j<;otu>lJ+0@fC*@ -D>nMRGlE*iJc:Q+NrG7ATDkYcWW'1%\,O)?`;[pYd/MPog&Bh,iVqs<kl1#LnG`"XpAXgcq>:*hrS@M0 -s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3f`'A!cMkrb_u@=J[f3N1VuEChSGn]NNW+b5JGsopG5cI[ -D#S,I@K'U4>Q.\&;uTVm:B!oc8cD6Z7fGjI6gR/76.nMS5cm<H60U`06NBLQ7K,dU8,c*Z9E%]c;#XGn -<rQ>&?N+C4B`;fHE;k%[I/\ZqM#ND5P5_!NU&LthYl;*1]`,hJaSsKae,Ituh#?:3jo4KCmJcSRnc&4\ -p\t!fqu6NmrS@M0s8Murr;QTmq>U-fp&=L\n,D_Rkl0]CiVqX3fDa4tc2Pc__Z%1H[/R9.V>d.eS,SNK -MuJJ1J,XcnFoH=YCAqlF@/aI2>Q.Y%;uTSl:&[ca8cD6Z7fGjO6fp_^5_21r5itE/6NBLQ7K,dU8,c*Z -9E%Zb:]=8k<W65%?N+@3BDu]GDuOnYHN&EnLAm/2OT(aKT`1eeYPts/]Df\HaSsH`df.kth#?:3jo4KC -mJcSRnc&4\p\t!fqu6NmrS@M0s8Murr;QTmq#:!do`"C[mf)POk5OE?hu;@/f)F(rbPoK[_#CnDZi7-, -U]-kaRJr<IMZ/;.IK"KjF8g%UB`;QA@/aF1=oMD";Z9Jk:&[ca8cD3Y7K,^M6fp_^5_21r5itE/6NBLQ -7/fXS7fH!Y9E%Zb:]=8k<;p&">lJ.1AH$<BD>nVUGlE-jK`6o/OT([IT)PMaY5Yd,\c0DD`r=0\dJh\q -gA^"/j8S3?li->Onc&1[pAXjdqu6NmrS@M0s8Murr;QTmp\smco`"C[mf)POjo49=hu;=.ec*qpb5TBZ -^](bBZMps)UAg__Qi<'FM>i/,I/\?hErKnSB`;QA?iF:/=oMA!;>sAj9E%Q_8cD3Y7K,^M6fp_^5_21r -5itE/6NBLQ7/fXS7fH!Y9)_K_:]=5j;uTr!>lJ+0AH$9AD#SJSGQ*!hKDp`,O8bLFSc5A_XT#L(\Gj8B -`;[pYd/MSpg&Bn.ir8'=li->Onc&1[p&=^bqu6NmrS@M3s8N#srVl`oqYp6gpAX[_nG_hSli-#Fir7j7 -f`'A!ci2#b_u@FM[f3N1X8\dkS,S]PNrFk6K)U,rG5cL\C]7uGA,]j7>Q.b(;uTYn:]=#d9)_B\7fGjU -7/K@36I7uK5bp['630G@!(6`Rr^HfUr^d#[r_*5dr_`Ynr`K/(ra5Y7rb)4Grc.p\rd4WrreUQ6rg!JP -rh07kriuI2rkJHNrlG)brm^r"rnm_7roO.FrpB^Srq$-^rqHEgrql]nqu5XUi;`fUrr)iorqcWgrq69^ -rp]pSrp'LDro*k5rmq(trm1Sbrkn`Lrj;[.ri5sjrgNhNrepc0rdaunrcJ-XrbDFEraGe3r`T5%r_i_l -r_EGbr^d#Yr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,gV8cD?]:B")h;Z9bs>5hh,@K'j;CAr/N -FT-RbJGt<&MuJt?S,T)[WrB4$[/Rf=_Z%XUci2Dmf)FP*iVqp;lMg2MnG`%Yp&=^bqYpBkrVQTSs5<qV -rr2lqr;QQlp\sjbo)A.Xm/H8Kj8S!9h>Z")df.Sl`r<gR^&GA;Y5YC!TDk8XPQ$I=L&QW%GlDd`DuOJM -Ac?*:>lIn*<rPtq:]=)f8cD9[8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^d#[r_<Afr_`Yq -r`K/)ra>_:rb;@MrcA'`rdb!%reg]=rgEbXri#h!rj2U;rkeZSrm1Smrmq))ro!e9rosFKrp]pXrq69b -rqcWkrr)`nj8\';rr2oprql]krqHEbrpp'Wrp0RJro="9rnRM(rmLekrl+lQrk/6:riZ6urgs+Vrf[8< -re19#rce?_rbqdLrac"9r`oG)r`/qpr_NMfr^m)[r^QlUr^?NKksGA8bs6hFTg8TCk!B)96iBCO7/fXS -7fGpW8cDH`:]=5j<W6,">lJ.1Ac?BBDuOhWGQ**kK`6l.P5^jJT)PYeXo>[+]`,_G`W"0^df.hsh#?41 -j8S<Bm/HJQo)A=]p\t$gqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1eGdhoc2PZ\^](kE -Z2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X7/K@66H;?B5at%%63'@O -6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5JbX8]C']DfVF`;\$\dJhYp -h#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I_nbl5NZ -^](kEZ2Ug'V#Hn`QN!!FM#N#*IK"BgEW0hSBDuE??iF4-=8l1u;#X5h9`@W_8H)*X7/K@66H;?B5at%% -63'@O6i0:N7fGpW8cDE_:&[ug<;otu=oMe-A,^-?D>nPSFoHggK)UT*OT(RFSGo>`X8]C']DfSE_u@mZ -ci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5 -gA]S#ci2,e_Z%7J\c/i4WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ -6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-N -U].:mYl;34^Ac"KbPoiee,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl]nqYp<ip&=R^ -nG_hSl2KlFiVq[4g&BJ"ci2,e_Z%7J\Gi`3WW&XkRf8QNNrFb3JGsopF8g+WC]7oE@fB^5=T2>";Z9Ml -:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?KEDuOhWHiAQp -L&R,3PQ%$MUAh.kYl;03^Ac"KbPoiee,J&"h>ZC4kPjcGmJcVSoD\F^q>U6iqu6Qnro=%=s8N#srVl]n -qYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtUC]7lD@K'U4 -=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5#?N+C4AH$BD -DuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6iqu6Qnro=%= -s8N#srVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtU -CAqcC@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3 -AH$?CDZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qn -ro=%=s8N#srVl]nqYp9hp&=R^nG_eRkl0ZBi;VO2g&BCuc2Pia_>_+H[f3H/VuE@gR/W9JNW+S0J,Xfo -ErKtUCAq`B@/aI2=8l5!;>sAj9`@]a8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9E%Zb:]=5j<;otu -?2e72A,^6BDZ4\UHiANoKDpl0P5^jJT`1kgY5Ym/]`,bHao9QadJhhuh#?72jSnBBm/HMRoD\F^q#:*g -qu6Qnro=%=s8N#srVl]nqYp9ho`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/ -J,XcnErKtUCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j -<;otu?2e72A,^6BDZ4\UHN&BmKDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C] -q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-H -N;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N` -:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQ -o)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&BCuc2Pf`_#CtF[Jm<-VZ*7f -Qi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6Mj'_5_21`5lO(@63'@I6iKOR -7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEaSsH`dJhhuh#?72 -jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@tbl5Z^_#CtF -[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_5_21]5lO(C -63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a-])KMEa8X<^ -d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZBi;VO2g&B@t -bl5Z^_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W7JK7C6N09_ -5_21]5lO(C63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^HT`1kgXo>a- -])KMEa8X<^d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\n,D\Qkl0ZB -i;VO2g&B@tbl5]__#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj9`@Z`8,c!W -7JK7C6Mj'_5_21`5lO(@63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`.OoC^H -T`1kgXo>a-]DfVFaSsE_d/M_th#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9ho`"F\ -n,D\Qkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm<-VZ*7fQi<-HN;eG.IK"NkEW0kTCAq`B@/aI2=8l5!;>sAj -9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BD>nPSH2`9lK)U`. -OoC^HT`1kgXo>a-]DfVFao9QadJhhuh#?72jSnBBm/HJQo)A:\q#:*gqu6Qnro=%=s8N#srVl]nqYp9h -o`"F\nG_eRkl0ZBi;VO2g&BCuc2Pia_#CtF[Jm?.VuE@gQi<-HN;eJ/J,XcnErKtUCAq`B@/aI2=8l5! -;>sAj9`@Z`8,c!W7JK7=6G>^95a"D%63'@I6iKOR7fGpW9)_N`:]=5j<;otu?2e72A,^6BDZ4\UHN&Bm -KDpi/OoC^HT`1kgY5Yj.]DfVFao9QadJhhuh#?72jSnBBm/HMRoD\C]q#:*gqu6Qnro=%=s8N#srVl]n -qYp9ho`"F\nG_eRl2KiEi;VO2g&BCucMkuc_#CtF[Jm?.W;`LiQi<-HN;eM0J,XcnErKtUCAqcC@/aI2 -=T2>";>sAj9`@Z`8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9)_N`:]=5j<W6,"?2e:3AH$?CDZ4\U -HN&EnK`6r0OoC^HU&LthY5Yj.]DfVFb5TZbdJhhuh>Z@3k5OTDm/HMRoD\C]q#:*gqu6Qnro=%=s8N#s -rVl]nqYp9hp&=R^nG_eRl2KiEi;VO2g&BCucMkuc_>_+H[f3H/W;`LiR/W9JNW+V1J,XfoErKtUCAqcC -@/aI2=T2>";>sAj9`@]a8H)*X7JK7=6G>^95a"D%63'@I6iKOR8,c'Y9E%Zb:]=5j<W6,"?2e:3AH$?C -DZ4\UHiAQpK`6u1P5^jJU&LthY5Ym/]`,bHb5TZbdJhhuh>Z@3k5OTDm/HMRoD\F^q#:*gqu6Qnro=%= -s8N#srVl]nqYp<ip&=R^nG_hSl2KiEi;VO2g&BG!cMkuc_Z%7J\,NT1W;`OjRJrBKNW+V1J,XfoErKtU -C]7lD@K'U4=T2>";Z9Ml:&[fb8H)-Y7ef@;6N09h5_21f5lO(:63'@I6iKRS8,c'Y9E%Zb;#XAl<rQ5# -?N+C4AH$BDDuOeVHiAQpK`6u1PQ%!LUAh.kYPu$1^&GnJb5T]cdf.r!h>Z@3k5OWEmJcVSoD\F^q>U6i -qu6Qnro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KiEi;VR3gA]P"cMkuc_Z%7J\,NT1WW&[lRJrELNrF_2 -JGsrqErL"VD#RuE@K'U4=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u=6N0@L7/f[T8,c'Y -9E%Zb;#XAl<rQ5#?N+C4AH$EEDuOeVI/\ZqK`7#2PQ%!LU].7lYPu$1^&GnJb5T]cdf.u"h>Z@3k5OWE -mJcVSoD\F^q>U9jr;QZoro=%=s8N#srVl`oqYp<ip&=R^nG_hSl2KlFiVq^5gA]S#ci2,e_Z%7J\c/i4 -WrAdmRf8TOO8an5Jc:&rF8g.XD#S#F@fB^5=T2>";Z9Ml:&[fb8H)-Y7fGgQ6gR/=6,Z$>5aXh961$u= -6N0@L7/f[T8,c'Y9E%Zb;#XAl<rQ5#?N+C4Ac?NFDuOhWI/\ZqLAm85Pl@-NU].:mYl;34^Ac"KbPoie -e,J)#h>ZC4kPjcGmJcVSoD\F^q>U9jr;QZoro=%:s8N#sr;QQlq>U*eoD\7Ymf)POkl0T@hYu:/e,I\m -bPoEY^](eCYl:[%V#Hk_Pl?aCLAlc'IK"BgEW0hSB)Z9=?iF4-=8l.t;#X5h9`@W_8H)*X7/K@66H;?B -5at%%63'@O6i0:N7fGpW8cDE_:&[ug;uThs=oMe-A,^*>D>nPSFoHggK)UN(O8bFDS,T5_WrB7%\c0>B -_u@jYci2Dmg]$+0ir80@lMg5NnG`(ZpAXmequ6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@hu;F1 -eGdhobl5Q[^](hDYl:^&V>d"aQMusEL]2o)If=KhErKtUB)Z<>?iF:/=8l1u;#X5h9`@W_8H)*X7/K@6 -6H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<;otu>Q/"/A,^*>DZ4YTFoHjhK)UQ)O8bFDSGoAaX8]@& -])KJD`;\![d/MPoh#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp3fo`"C[n,DYPkl0T@ -hu;F1eGdhoc2PZ\^](kEZ2Uj(V>d%bQN!!FM#N&+J,XTiErKtUBDuH@?iF:/=8l5!;#X5h9`@W_8H)*X -7/K@66H;?B5at%%63'@O6i0:N7fGpW8cDE_:B")h<W6,">Q/"/A,^-?DZ4YTFoHmiKDp]+OT(UGSc5Jb -X8]C']DfVF`;\$\dJhYph#?41ir80@li-APnc&1[pAXpfqu6Njro=%:s8N#sr;QTmqYp6gp&=O]n,DYP -l2K`Bi;VO2f)F+scMkf^_>_+HZi7-,VuE:eR/W9JMZ/;.J,XZkF8g+WB`;QA@/aF1=T2>";>sAj:&[`` -8H)*X7K,^M6g6r:6-VZG5bUIB60:K76UUf>r^?`Sr^QlWr^m)`r_NMjr`/r"r`oG1ral(BrbqdWrce?k -re19.rf[8Jrgs+eriQ1+rk/6Grl+l^rmLesrnRM1ro="Brp9XQrpp']rqHEgrql]mqu5XUi;`fUrqucm -rqcWgrq69]rpTjQrp'LDro!e3rmq(srm(M_rk\TIrj;[-ri#ggrgEbLrepc0rdXomrcJ-Xrb;@CraGe3 -r`T5$r_i_lr_EGbr^d#Xr^HfSpd=:4r^"doJO#nor^#[5!CK6Q6iKLQ7K,dU8H)6\:B")h;Z9_r=oM_+ -@K'j;C&W&MFT-RbJ,Y0$MuJq>RJriXW;a""[/Rc<_Z%RScMl8kf)FM)iVqp;lMg/Ln,DnWp&=^bqYpBk -r;6KRs5<qVrr2lqr;QQlp\sjboD\7YmJcDMjSn-;hYu+*e,I\maSs*V^AbM=YPtR$T`1DZPl?U?L&QW% -H2_pbDuOMNB)Z6<?2e"+=8l+s;#X5h9)_B\8,bsV7/0.66N09q5_21o5lO(3630G@rBpQPr^HfVr^m)] -r_EGhr_i_sr`];,raGe;rbDFNrcJ-brdb!&repc?rgWn[ri5t$rj;[=rkeZUrm1Smrmq)*ro*k;rp'LM -rp]pYrq69brqcWkrr)`nj8\';rr2oqrquclrqHEcrq$-YrpB^NroO.=rnm_-rmUkmrlG)VrkJH@rilC& -rh07[rg!JCreUQ*rd4Wfrc.pQrb)4?ra5Y/r`K.ur_`Yjr_*5_r^d#Xr^HfSqa9C1cp3.IUd3j)!CK3S -6iKLQ7K,dU8H)3[9E%`d;>sMn=T2P(?iFR7BDu]GEW1.\HiAWrM#NG6Q2[9PT`2"kZ2V32^])1NaSsNb -eGe,"hu;X7jo4TFmJcVSoD\F^p\t$gqu6Qkro=%:s8N#srVl`oqYp9hpAX^`nG_hSli-&Gj8Rs8g&BM# -d/M2e`W!XO\Gif5XT"snSGniRO8b"8KDp8tGQ)X^D#S,IA,]j7>Q.b(<;obo:]=&e9)_B\7fGjU7/K@3 -6I7uK5bp['630G@!(6`Rr^HfUr^d#\r_3;er_i_pr`K/(ra5Y7rb)4Hrc8!^rd=]tre^W8rg*PSrhBCn -riuI4rkJHNrlY5ermh#$rnm_8roX4GrpKdTrq-3`rqQKhrql]nqu5XUh>dKQrqucmrqQKdrq-3[rpKdO -roX4?rnm_/rmq(rrlb;[rkSNDrj2U,rhKIargEbIreg].rdFcjrcA'Urb2:Ara>_1r`T5"r_i_kr_<Aa -r^m)Yr^HfSpd=11cp3.IUd4'/q*P-Lr^?`Sr^QlYr_*5br_NMkr`&l"r`oG1rac"Brb_XUrcnEjre19/ -rfI,Irgs+ariZ7,rji$Drl4r\rmC_qrn@A/ro="?rp0ROrpg![rq??drql]mrr([Qh>dKQrqucmrqZQf -rq69\rpTjRroj@Cro*k3rn%.trltG_rkeZHrj;[.rh]UergWnKrepc1rdXonrcS3YrbDFFra>_2r`fA% -r_relr_<Aar^m)Zr^QlUpd=11cp3.IUd4'/q*P-Lr^HfUr^ZrZr_*5br_NMkr`/r%ra,S3rb)4GrbqdY -rd+QnreCE2rfI,Krh07eric=/rk&0HrlG)`rmLetrnRM3roO.CrpB^Rrpg!\rqHEfrql]mrr([Qh>dBN -rquckrqQKdrpp'XrpKdLroO.<rn[S+rmUklrlP/Wrk/6=rilC#rhBC_rf[8?reUQ(rd4Wfrc%jQrb2:? -ra5Y0r`9"tr_`Yir_3;`r^d#Yr^QlTqa9L4pd*RuJO$>&pd+%/r^6TO!(?fUr^ZrYr_!/_r_EGir`&kt -r`oG0raPk?rbMLPrc\9frdb!(rf6u@rgj%_ri#h#rjMg=rkn`Vrm(Mlrn.5+ro*k<roj@Lrp]pXrq??c -rqZHhrr([Qh>dBNrquckrqQKdrpp'XrpKdLroO.<rn[S+rm^qorlY5Yrk8<?riuI%rhKIbrfd>Breg]+ -rdFcjrc%jQrb;@@ra5Y0r`B)!r_`Yjr_3;`r^d#Yr^QlTog@b+fg(*RX[(f2qa:9L!(?fUr^ZrYr_!/` -r_NMjr`&kur`oG0raPk@rb_XRrcnEirdk'+rf6uArh'1cri,n%rjVm?rl"fYrm:Yorn7;,ro*k<roj@L -rp]pXrq??crqZHhrr([Qh>dKRrr)iorqcWhrqHE`rpg!Urp'LGro="8rn@A&rm:Ygrl>#Rrjr*9ri?$o -rh'1UrfR2>re19#rd4Wbrbh^Nrac":ra,S+r`/qqr_WShr_3;_r^d#Xr^?EHj$MEaJO$>&i'R<.r'UNQ -r^QlWr^m)_r_<Agr_i_rr`K/+raGe:rbMLOrc8!brdb!$rf-o?rg*PUrh]Uprj;[9rkSNRrlb;frmq)' -rnm_8roa:GrpKdTrq$-`rqZQirqucorr1aRh>dKRrr)iorqcWhrqHEarpg!Vrp'LGro="8rnIG)rmC_i -rlP/Trk&0;riH*rrh07Xrfd>Bre:?&rd=]drc%jQral(<ra5Y-r`B(ur_WShr_3;_r^d#Xr^?EHj$MEa -JO$>&i'R<.r'UNQr^QlWr^m)_r_EGhr`&ktr`T5-raPk<rbVRPrcA'drdb!%rf@&Brg<\Xrhf[rrjDa; -rkSNTrltGirn.5)rnm_8roa:GrpTjWrq-3arqZQirqucorr1aRh>dKRqu-NjrqQKerq-3\rpTjQroj@C -ro!e2rn7;!rm(Mcrk\THrjMg0ri#gjrgNhOrf@&6rdt,urcS3\rbh^IraYq7r`fA'r`/qor_EGdr^m)[ -r^ZrVr^?EHk!I`dJO$>&k!J`.r^6cU70#dU8,c'Y8cDE_:B")h<W6,">Q/"/A,^*>DZ4YTFoHjhK)UQ) -O8bCCRf9&\WW'+#[f3r=_>_UVcMl8kg&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6irVQTMs5!_SrqlZnqu6Hk -q#9scoD\7Ymf)MNkPjH>hYu:/e,I_nbl5NZ^](eCYl:^&V>d%bQi<0IMZ/;.J,X]lF8g+WB`;TB@K'R3 -=oMM%;Z9Ml:B!oc9)_B\7fGjU7/0.*6K17]5dir66MNqI7/fUU7RdAIr^d#[r_*5cr_WSlr`B)&ra#M3 -ral(BrbqdXrcnElre19.rf[8Jrgj%bri5t%rji$Brkn`Zrm1SmrnIG/ro*k>rp'LNrp]pYrq69crqZQj -rr)`nh>c=2rr2fnrql]krqQKdrq-3[rpTjProj@@rnm_1rmh"qrltG]rkSNFriuI)rhoaergEbMrf$i2 -rdauorcS3ZrbDFEraPk5r`fA(r_renr_EGdr_!/\r^QlUr^?NKh*U*dJO$Y/h*Um(r^?`S!CfNY7fGsX -9)_N`:B")h;uTnu>5hk-@fC!=CAr2OFoH^dJGt<&N;f(@RJrfWVuEdsZ2VB7_#D=Pc2Q,iec+A'hu;X7 -kl0oIn,DkVo`"R`q#:*gqu6Qkrn[V.s8N#srVl]nqYp<ipAX^`nc&"Vli-/Jj8S!9h>Z")df.Sl`r<jS -^AbJ<YPtR$T`1G[Q2ZjDM#N#*I/\?hEW0eRB`;N@@/aF1=T2;!;Z9Jk:&[ca8cD3V7Iih+6K17]5dir9 -6M3_F7JoUT7fH!Y9E%Zb:]=8k<;p#!>Q/%0A,^-?D#SGRG5cmgK)UW+O8bFDS,T)[WrB1#Zi7]<_Z%RS -ci2Dmf)FM)i;Vd9l2L&Kn,DkVo`"R`q>U6iqu6Qnrn@D+s8N#srVl`oqu6Hkp\smcoD\7YmJcGNjo49= -hu;=.ec*nob5T?Y^](_AZMq!*UAg__R/W3HMuJJ1J,X`mFT-4XCAqlF@/aI2>Q.Y%;uTSl:B!rd9)_B\ -8,c!W7.iq-6K17]5dir96Mj.I7/f[T7fc.O!(d)]r_*5cr_NMkr`/r%ra,S3rb)4GrbqdXrd+QnreCE1 -rfI,Hrgs+`riQ1*rjVmArl"fYrm1Snrn7;.ro3q=rp0RNrp]pYrq69brqcWkrqucorr1XOfDkjLrqucm -rqcWgrq??`rp]pTrp9XHro="8rnIG'rmC_grl+lPrjr*9ric<trh07[rfR2>reUQ(rd4Wfrc%jQrb;@@ -ra5Y0r`B)!r_`Yjr_3;ar^d#Yr^QZNqa9C1qa'F2JO$b2r^#I/r^6HKr^QlW!D#`]8H)9]:&[rf;>sPo -=8lJ(?iFO6C&VrJE;k%[HiAQpM#ND5OoCjLT`1eeYPtp.])KME`r=0\dJh_rg]$+0j8S3?m/HGPnG`(Z -p&=^bqYpBkr;6KIs4@;Mrr2lqr;QQlp\smco`"C[n,D\QkPjQAi;VO2fDa4tbl5Z^_Z%1H[JmB/W;`Rk -T)OrQO8b%9Jc:)sH2_g_DZ4DMA,]p9?N+(+<W5qr;#X5h9`@W_8H)*U7K,^M6fUN460LRb5eKA]6/t<, -6i0:N7K,dU7fc1Q!(m/`r_EGhr_resr`K/+ra>_8rbDFLrc.p_rdFcsreg]8rfd>QrhBCjric=/rk&0H -rl>#^rmLetrnRM2roF(Arp9XPrpg![rq69brqcWkrr)`ngAfe)rr2oqrqucmrqZQfrq69]rp]pTrosFE -ro3q6rn@A%rm1Sdrl4rPrji$7ri?$prh'1Wrfd>Are:?&rd=]erc%jRrau.=ra5Y.r`B)!r_WShr_<Aa -r^m)[r^QlUr^?<Ej$N&sJO$t8i'R*(r^?`Sr^QlXr^d,_8cVK_:&[rf;#XJo=T2M'?iFR7B)ZZHEW1(Z -I/\ZqL&R,3P5^jJTDk\dX8]I)\c0AC`r=0\ci2Jog&Bk-ir8*>l2L,MnG`"Xp&=^bq>U9jr;QZlrn@D( -s8N#prVl`oqYp9hpAX[_nc%tUlMfuGj8Rs8gA]\&d/M8gao9*T]Df5;Xo>6tUAgY]Q2ZjDM#N&+If=Ni -ErL"VB`;QA@/aF1=oMM%;Z9Ml:B!oc9)_B\7f,XR7.iq-6Mj(=5_22;5lO(-6Mj.I7/fXP7fGsX8HDIW -!)*;dr_WSlr`B)%r`oG1ral(BrbqdWrc\9irdt-*rf@&DrgWn]ri#gurjDa;rkSNTrlkAgrmq)'rnm_8 -roa:GrpKdTrq$-_rqQKhqu$Hlqu5=LeGoFErquclrqQKerq-3\rpTjQroj@Cro!e2rn7:urm(McrkeZJ -rjVm2ri5snrgs+VrfR2;re:?$rd"KbrbqdOrau.=ra5Y/r`K.ur_i_kr_<Aar^luWr^QlTog@Y(r^$'> -JO%1>r^#@,qa:6KqaUQTr^m)^!DQ8g:&[rf;>sMn=T2P(?iFO6BDu]GDuOkXH2`<mK`6l.OoC^HT)PPb -WrB7%\,O)?_Z%^Wc2Q,ig&Bh,i;Vj;kl0rJn,DnWo`"Uaq>U6fr;QZEs4%)Jrr2lqr;QQlq#:$eo`"F\ -n,D_RlMg#HiVqa6h#>h&d/M;h`W!^Q]`,59Xo>9uT`1G[Q2ZgCM>i/,IK"KjF8g(VCAqfD@/aI2>5hP$ -;uTSl:B!rd9)_B\8,c!T7K,^M6et*$5_22A5i"d%6i0:N7K,dU8,c'Y9)_Ha:/1dar_NMkr`/r$r`oG1 -ral(Crbh^VrcnEjre(3+rf6uCrgNhZri#h!rj)O9rkSNPrltGirm^r&rndY5roj@HrpB^Rrpp'\rqHEf -rqcWlrr)iqeGn%urr2oqrquclrqZQgrq69_rpg!Urp0RIro="9rn[S(rmLelrl>#UrkAB>rilC&rhBC_ -rg3VGrepc0rdXonrcS3ZrbVRIraGe4r`fA'r`/qpr_NMer_*5]r^ZiTr^HfSpd<k(qa('DJO%CDr^#@, -pd>$Kr^H]Rr^ZrYr_*5b!DcJk:]=5j<;otu>Q.t.@K's>C]8;PFoH^dJ,Y0$MuJh;R/WZUUAh4mYl;'0 -^Ac"Ka8XEadf.erh>Z@3j8S9AlMg5Nnc&.Zp&=acq>U6ir;QZorm^tts8N#prVl]nqYp<ipAX^`nc&%W -m/H8KjSn-;hu;7,eGdenao96X^](_AZMq$+V#I"cS,SQLNW+e6JGsrqGlD[]D>n;LA,]p9?N+(+<W5qr -;#X5h9`@W_8H)-Y7f,XF6f:<162Eit5gDXo6/=m#6iKOO7fGpW8H)3[9`@cf:f%-gr_resr`K/+ra>_8 -rbDFLrc%j]rd=]qre^W7rf[8Mrh07driZ7+rjVmArl"fXrm1Smrn%/,ro3q<rosFKrp]pWrq-3`rqZQi -rql]nqu5+FeGoOIqu-Nlrql]krqHEcrq$-YrpB^Nroa:Arnm_0rmq(srltG`rkn`JrjMg1ri5snrh'1U -rfR2>re19$rd=]frc.pSrb)4@ra5Y0r`T5$r_`Ykr_EGcr_!/]qa^WTr^?<Eh*V'*JO%UJh*Ud%qaC<N -r^ZrZr_!/_r_EGg!Du\o;>sVq=T2S)?iFR7BDucIEW1+[I/\ZqK`6u1P5^dHTDkYcWrB7%[f3r=_u@aV -c2Q/jfDaP(hu;[8kPjfHmJcVSoD\F^p\t$gqu6NmrVQTDs4%)JrqlZnr;QTmqYp9hpAX^`nG_kTmJc>K -jo46<h#>t*eGdenb5TBZ^Ab\BZi7'*VuEChRJrHMO8aq6K)U5uGQ)[_DuOJMB)Z9=?N+.-=8l.t;>sAj -9`@]a9)_B\8,c!Q7/0.*6N'1N5s^&eej04#h*Um(pdG*Nr^ZrYr_!/_r_3;er_W\p;ZKbq=8lD&?N+F5 -B)ZNDDuOhWGQ*'jK)UQ)O8bCCRJroZVZ*[rZi7K6^Ac+Nb5T`deGe,"h#?:3jo4KCmJcSRnG`(ZpAXjd -qYpBkr;QZlrm^tqs8N#prVl`oqYp9hpAXaanc&%Wmf)JMk5OB>hu;@/fDa.rbl5]__#CtF[JmB/WW&[l -Sc4uTOoC7;L&QW%HN&'dE;jYPBDuE?@/aF1=oMG#;uTSl:B!rd9)_E]8H)*U7K,^G6f:925lj8;JO%mR -r^#@,ogAUEr^HfUr^ZrZr_!/_r_EGgr_`bs<<-%u=oM\*@/a[8BDu]GE;k"ZHN&HoL&Qu/OoC^HSc5D` -WW'+#[Jmf;_#DFSbl5ugfDaP(hu;X7k5OWEmf)\Snc&4\p\sseqYpBhrVlfDs3CZDrr2lqr;QTmq>U0g -p\sganc&"Vli-/Jjo43;h>Z.-e,I_nbl5NZ^](kEZ2Um)W;`IhS,S`QO8b%9L&QT$H2_pbE;j\QB`;H> -?iF=0=T2>";Z9Ml:B!rd9)_E]8H)*U7K,^G6fLH(6@hDl5h&-n6i0:N7JfRR8H)3[9)_N`:&[ug;Z9\t -=BGQ*r`oG/raGe>rbMLPrcJ-crdXp$reg]9rg*PQrh07hriQ1)rk&0Erkn`Zrm1Smrn@A,ro!e;roj@I -rpTjWrq-3arqQKgrql]mrr)`ndJqMlrr2fnrquclrqQKerq-3\rpTjSrp'LGro*k5rnIG&rmLekrl4rS -rkAB=rilC'rhBC`rgNhJrf$i4rdauqrcnE^rbh^Mrac":ra,S,r`B)!r_`Yjr_<Abr_!/\qa^WTpdFmE -i^36'JO&`je3`ptpdG!Kr^ZrYr^m)^r_<Afr_`Ypr`9,'=TDV(?N+C4AH$?CD>nPSGlE*iJGtB(N;eq< -Rf8oXUAh7nYl;$/^Ac"K`r=9_dJh\qg]$(/iVr$>lMg5Nn,DnWo`"Uaq>U6fr;QZlrmCbks8N#prVl`o -qYp9hp\sjboD\7Yn,DYPkl0WAiVq^5fDa;!ci2&c`;[ON\Gii6YPtBtU&LV^PQ$[CN;eJ/JGsrqF8g1Y -DZ48IA,]j7>lIn*<rQ"r;>sAj:&[ca8cD9[8,c!T7K,^G6g-l.6@hDl5hA?q6i0:N7K,dU8,c'Y8cDB^ -:&[rf;>sJm<rQ2%>[.86ra5Y7rau.Irc%jXrd=]pre(3/rf@&Brgj%^rh]Utrj2U6rkJHNrlP/crmUku -rndY4ro="Arp0RPrp]pYrq69brqZQiqu$Hlqu5"CbQ%S@qu-NkrqcWirq??`rpp'XrpB^NroX4?rnm_0 -rmq(srltG`rl"fLrjVm3ri?$prh'1YrfmDCreUQ+rdXolrcJ-XrbMLGraYq7r`oG+r`/qrr_WSir_<Ac -r^m)[r^ZrWqaLKPnjD_0k<f/6O$N\1d6dLnqaCEPqaUQTr^d#[r_3;cr_NMir_rerr`];+!FK16?iFR7 -BDu]GDuOkXGlE3lK`6f,O8bCCRf8rYV>dOpZ2V63^&GtLao9Qadf.ktg]$+0j8S3?li-;NnG`"Xp&=[a -q>U6iqu6Qkrlb>bs8N#prVl`oqu6HkpAXaao`"@Zmf)VQkPjTBir7d5f`'D"ci2)d`r<aP])K,:Y5YF" -U]-h`Qi<0IMuJJ1Jc:&rGlDd`D>n8KB)Z3;?N+4/=8l5!;Z9Ml:B!ue9)_E]8GG[L7/0.86K^]76'";1 -6.&$o6hj(E7fGsX8cD?]:&[oe;#XAl<W6)!>lJ%1?sitBrau.Drb_XUrce?hrdk''repc=rg<\UrhKIk -riZ7.rjr*Drl4r\rm1Snrn7;,ro3q=roa:JrpTjUrq-3_rq??frql]mrr)`nbQ#ccrr2fnrqucmrqcWg -rq??`rpg!WrpKdLroX4?ro!e1rn%.rrlkA`rk\TIrji$4ri?$rrh07[rg!JDre^W-rdauprc\9[rbVRJ -raYq9ra5Y,r`9"ur_`Ykr_NMdr_!/]qa^WTqaLKPnjDq6k<f/6O$N\1e3`gqqaCEPqaUQTr^m)]r_*5d -r_WSkr`/r!r`K/,ra>h;@fU$<C&VuKE;k%[HN&HoK`6l.O8bFDS,T)[VuEdsYl;34^&GkIao9Qad/MYr -g]$.1j8S3?kl1#Ln,DkVo`"O_p\t$gqu6NmrVQT;s2b6>rqlZnr;QTmq>U0gpAX[_nc&"Vli-/JkPjH> -hYu:/eGdkpcMki__Z%:K[f3Q2Xo>*pT`1J\P5^L@MuJ>-If=]nF8g.XD>n2IAH#s8?N+1.=T2;!;Ys8h -9`@]a8cD9[8,c!T7K,^G6hE^t6Dm)l6M3_C7/fXP7fGpW8H)3[9E%Z_:]=8k<;p#!>5hk-?iFO9B4h3W -rb_XRrcA'crdXp!repc:rf[8Nrh'1briQ1*rjMg?rkeZSrm(Mjrm^r%rndY5roa:Frp0RPrpg!Zrq??c -rqZQjrquZlrr1"=`W,r:qu-NlrqcWhrq??`rpp'WrpKdOroj@Aro!e3rmq(trm1Scrl"fNrji$8ric=" -rhKIarg*PHrf6u4rdt,urce?`rbqdOrb)4?ra>_2r`];%r`&kpr_WShr_<Aar^m)[qa^WTpdFmEoKq1s -pd)GUpd*(ipd=gEqaUQTr^d#[r_!/ar_EGhr_i_qr`9#%r`oG1raYq?!GcHNC]88OF8gC_If=ruLAm54 -P5^dHT)PJ`W;a""[/RW8^])1Nao9Wce,Iqth>Z@3j8S9AlMg5Nn,DnWo`"R`q#:-er;QZlrlG,Ys8N#p -rVl`oqYp9hp\sjboDA%Vm/H8Kjo4<>hu;@/f)F(rc2Pc__Z%7J\,N]4XT#*rT`1DZQ2ZmEMZ/>/JGsrq -GQ)U]DuOMNBDu?=?iF@1=T2A#<;o_k:]=#d9)_E]8H)-Y7f,XR7.N_A6I/!/5fH(_6i0:N7K,dU8,c'Y -8cD?]9E%`a;#XGn<rQ5#?2e41@K'p=CB8?l!,qjVrc\9grdb!%reg]:rg!JOrh07friH+)rj_s@rkeZU -rltGirmh#%rnm_7roO.Drp9OOrq$-^rqHEfrqcNirr)`naT'-Wq#13hrqcWirqHEcrq$-YrpKdProj@B -ro!e3rn7;$rm:Ygrl>#Rrk/6?rilC&rhf[frgWnQrfI,;reCE&rd=]irc.pUrbVRGraYq7r`oG+r`K/! -r_`Yjr_EGer_32\r^cfRr^?0A!CK5q6H_X56LmM@7/07K8H)3[9`@cc:B"&g;Z9Yp=T2J&>lJ+0A,^*> -D#S;QEH(turcnEhrdb!&repc;rg*PQrh07fri?%&rj_s@rkSNSrlb;frmh#$rn[S3roO.Crp9XOrp]pY -rq69brqZQirqlKh_Z.LQrr2fnrqucmrqcWhrq??`rpg!VrpB^LroX4>rnm_0rn.4urm(Mdrkn`Nrk/6: -ric=%rhKIbrgWnNrf@&9re(3"rd4Werc8!Urb2:BraPk6r`fA)r`9"tr_`Ykr_EGer_*5_r^luWr^QcR -qaC0G!CK5q6MNk&5kmXa6Mj.C7/fXP7fGpW8cD?]9E%Zb:B")h;>sPo<rQ8$>lJ+0@fC!=B`;oKE<13) -!-S9frdXp"reg]8rfd>Nrh'1bri?%%rj2U:rkSNOrlb;ermLeurnIG0ro3q>rosFLrpTjVrq-3`rqQKh -rql]mrr)`n_Z.LQrr2fnrqucmrqcWhrq??arpp'XrpTjProj@Cro!e3rn@A$rmC_krl4rSrkJH@rj)O, -rhf[hrh'1Urf[8@reCE(rdXolrcJ-Yrb_XJral(;ra5Y0r`K/#r`&kor_WSir_3;ar_!/\qa^WTqaLKP -pI"XAa?n]J`Bs,_qaCEPqaUQTqag]Yr_*5ar_NMir_`Yor`9##r`oG/raGe;rb;@Krc%jZ!I/hhGlE3l -KDpW)NrG4@QN!NUU]..iYPtm-[f4&@_u@[Tci2AleGe2$h>Z@3jo4KCli-APnc&+Yp&=^bq#:-hqu6Nm -rVQT2s1eU5rqlZnr;QTmq>U0gp\sgao)A+Wmf)POkl0ZBiVqa6g&BP$d/M8ga8WsT^&GM?ZMq!*VuEFi -Sc4uTP5^L@M>i/,J,XcnGQ)R\D>n>MAc?3=?iF@1>5hY'<W5qo;#X5h9`@Z]8c)$W7f,XR7/]LE6bbte -62NqH6,,bT6i0:N7JfRR8,c*W9)_N`:&@cd;uTer=T2M'?2e41@fBs<C]85NE;k(\HNAVG!.Y!#reUQ6 -rf[8Jrgj%_ri#gurj)O5rk8<Jrl>#^rm:Yprn7;.ro3q<roj@HrpKdSrpp'\rqHEerqZQjrquZlrr0\4 -]`8!1qu-NlrqcWirqQKcrq-3[rp]pRrosFDro="9rnRM*rmUkmrlY5ZrkSNFrjMg1ri?$qrh07[rg3VG -rf$i5rdk&trd4Wdrc.pTrb2:CraYq7r`oG+r`B)!r_renr_NMfqb-o\r^coVr^QcRrC$QOpd;e_pd)PZ -pd=gEr^H]Rr^ZiVqb$i\r_<Afr_`Ynr`/r!r`];+ra5Y7rau.Crbh^TrcJ-drdFm!JH19#M>iM6OT(UG -S,T)[VZ*XqYl;*1]DfVF`W"$Zci2DmfDaS)i;Vd9jo4NDm/HMRnc&.Zp&=acq>U6fr;QZlrkJKGs8N#p -rVl`oqYp<iq#:!do`"I]nG_hSli-)Hjo46<hYu7.f)F%qbl5``_Z%:K]Df/9YPtU%U]-qcSGn`OOT(7= -K`6Q%J,XZkFT-7YD>n8KB)Z6<?iF@1=T2A#<W5nq;>X/g9`@]^8cD9U7f>aV77I2DmmD^ommHt?r^HTO -qag]Xr_*5bqbR2gr_i_qr`B)$ra#M1raGe<rb;@Krc%jYrce?krdk0(KE-])NW,%=PQ%*OTDkVbX8]=% -Zi7T9^])+Lao9Qad/MVqg&Bk-iVqp;kPjfHmf)_ToD\F^pAXjdq>U6fr;QZlrkJKDs8N#prVQKkqYp6g -pAXaao)A.Xmf)POl2KiEi;VR3g]#b&df.SlaSs-W^](hD[JmB/X8\spT`1G[QN!$GN;eV3K)U9!HN&-f -E;jbSD#S)HAG]a5>lIq+<rQ(t;>sDk:]=,g9`@]a9)_E]8H)-X7f5aQ7K,^D6^:",6i0:N7JK@O8,c'Y -8cD?]9E%W^:B")h;>sPo<rQ;%>l.n-A,^-?D#S>OE;k(\HiANoK)UN+N/RaqrfR2GrgWn[rhf[qric=. -rjr*Drl"fWrm1Slrmh#&rndY4roX4Drp0ROrp]pXrq69arqH<drql]nqu4/+\c;[.qu-Nlrql]krqQKe -rq??_rpg!VrpB^Mroa:@ro!e3rn.5#rmC_hrlG)Vrk8<@rj;[-ri,mmrgs+Xrg*PFrepc2rdk&trd4We -rc8!VrbDFFrac"9ra,S/r`K/$r`9"rr_`Yjr_EGdqb-o\r^m&Y!CoZW7f,XL7/0-76MNqC7/fXJ7fGpW -8cD?Z9E%Wa:B"&g;>sJm<rQ2"=T2S)?N+@3AH$6@CAr/NErL4\HiAKnJc:H(MZJp$!0I2GrgNhXrhTOm -riZ7-rji$Arkn`UrlkAhrmh##rn[S3ro="@rp'LMrpTjVrq$-_rqHEerqcWkrqucoqu4/+\c;[.q#13i -rql]jrqQKerq-3\qsaUOrosFDro="8rnIG(rmUknrlb;]rkSNGrj_s3riQ1"rh9=_rgWnNrfI,<re19% -rdXolrcS3[rbqdNrb)4?raGe5r`oG+r`K/"r`&kpr_WSir_EGdr_*5_r^d)\!D#c\8,,RN7K,^>6a/oD -6i0:N7JK@O8,c'Y8cD?]9E%Wa:B"&g;#XAl;uTer=T2M'>lJ+0@K'd9BDu]GDuObUFoHXbJ,Y'!K`6r0 -NrbH.!0dDOrgs+_ri5t"rilC3rk/6Grl>#]rm:Ynrn%/(rnm_7roO.Drp9OOrq$-]rqHEerqZQjrquZl -qu4/+ZiC%(qu-NlrqcWirqQKdrq-3\rp]pTrp9XJroO.=ro!e2rn7;!rm1Sfrl"fPrkJHArj2U-ri#gl -rh'1Zrg*PGrf-o5re(3"rd4Whrc.pUrb_XKrau.=ra>_3r`oG*r`K/#r_i_mr_NMir_EGer_*;b!D?)b -9)D3Z8GG[L7K,^86e"He6i0:H7JK@L8H)3[9)_K_9`@cc:B")h:]=5j;Z9_r=8lA%>lJ%.@/aX7B)ZND -D>nJQEW14^HiANoKDp]+NW,(>Q3!JE!1Wt[rhTOlric=-rjVmArkeZQrlkAfrmLf!rnRM2ro3q>roj@J -rpB^Srpp']rq??drqZQiqu$Hlqu4&(ZiC%(qu-NlrqcNfrq??arq-3[rpTjRrosFGroX4=rnm_1rmq(s -rm1Sbrl+lQrk/6>rj)O*ri#glrgs+Xrg*PFrf$i5rdt-!rd=]grcA'Xrb_XKrb)4?raGe5r`oG+r`K/# -r`&kqr_`Ykr_NMf!)*De9`%K^9)_EW8,,RK7J0(A6e"I"6h3Y?7JK@I8,c*Z9)D9\9`@cc:]=2i;>sMn -<W6%u=T2M'>lJ+0@K'd9BDuZFD>nMRFT-I_I/\WpK)UW+N;eq<QN!<RSt5qRrhTOmriQ1*rjVm>rk\TQ -rlG)brmUktrnRM0ro*k=roa:FrpB^Rrpg![rq69arqZHfqu$Hlqu4&(ZiC%(q#1*erqcWgrq??arpp'Y -rpTjQrp'LHro3q8rnm_-rmh"qrltG`rl"fOrk&0=rilC'ri,mjrgs+Yrfd>Drf6u4re(3"rd=]ircJ-Y -rb_XMrau.?raGe6ra,S/r`K/#r`/qqqbd>h!)EVk:]=,g9`@]a9)D3Z8GbpM7f,XO7)D=a7/fXG7fGpT -8H)3[9)_K_9`@fd:]=2i;>X8j<W6)!=T2S)?2e72@K'g:B)ZTFDZ4VSFT-L`I/\WpKDpW)NrG.>PQ%'N -ScPOY!29CkriQ1(rjVm=rkSNOrlP/armC_qrn.5-ro*k9roj@Grp9XQrpg!Yrq69arqH<drqlKhqu4&( -YlF_%qu-NlqtpBgrqQKerq-3\rp]pUrp9XMroa:Aro!e4rn@A'rm:Yhrlb;Zrk\TJrjVm5ric=#rh]Ue -rg`tSrf[8@reg]1rdaurrd4WercA'Wrbh^Nrb2:@raPk6ra,S/r`];'r`9"ur_`_n!Du_n:]=2i:]=,g -9`%K^9(bdT8GbpJ7asln7fGpT8Gc!U9)_K\9`%Ta;#X8i;>sJm<W6)!=T2M'>Q.t.?iFL5A,^0@CAr,M -DuOeVFoHaeIf=lsL]321NrG4@Qi<NST`1bgWMolsric=-rjVm@rk\TPrlb;drm:Yrrn@A.ro!e:roa:H -rpB^Rrp]pYrq-3arqQKgrqlTjrr)`nYlCs-q#:'drqcWirqQKcrq-3\rp]pTrpB^Lroa:Aro!e3rn@A$ -rmC_jrlG)WrkSNGrjVm4riZ7#rh]Uerg`tTrf[8@repc0rdt-!rd+QfrcS3Zrb_XMrb)4Brac"9ra,S0 -r`];(r`K/#!)rtu<;ohn;>X/d:&[i]9E%Q\8cD9L8(:$!8,c'V8cD?Z9D_E^:&[ob:]=2i;>sMn<W6%u -=T2J&>5hh,?iFI4AH$0>BDu]GDZ4VSFoHXbHN&EnK)UK'MuJe:P5^jJS,T)[V>dFpY-%c-rj)O4rk/6G -rl+lXrm(Mjrm^r$rn[S3roF(@rosFLrpKdTrpp'\rq69crqZQiq#'pdYlCa'rr2fnrquclqt^6crq??` -rpg!WrpTjProsFEro3q7rn[S*rm^qorltG`rl"fOrk&0=rilC(ri?$nrh07]rg*PIrf@&:reCE(rdauq -rd"Karc8!VrbVRJrb)4?raPb3r`oG,r`B/$!EN8#<Vo_o;Ys;i:]=2i:B!ue9`%K^9(bdQ8CU0&8Gc!U -9)_K\9`@cc:B")h:]!uc;Z9Vo<W6)!=T2P(?2J".@K'd9BDuWED#SAPEW1%YH2`3jJGt0"L]352O8b@B -QN!HST`1_cX8]7&Ycn,3rjVm=rkSNOrlP/arm:Yorn%/*ro!e8roX4Drp0RPrp]pWrq-3_rqHEfqtg3f -rr)`nXoGF$rr2]krqucmrqcWhqtL*^rposTrp9XLroO.>rnm_2rn7;%rm:Yhrlb;Zrk\TKrj_s7ric=% -rhf[hrh'1Yrg*PFrf-o8re19%rdXoorcnEarc%jSrb_XLrb2:CraPk7ra5Y1!*fP0>lIt,=T2D$<rQ+u -<;oep;>sDe:]=,d:%_3T9AN589CbdU:&@]_:]=2i;>sJm;uTer<rQ2"=T2P(>lJ%.?iFL5@fC!=B`;cG -D>nJQE;jtYGQ)sgJ,Y'!K`6o/NrG.>QN!?PTDkSaVuEarYPtm0\@;OKrkJHLrl"fZrm(Mirmq)%rn[S2 -ro3q=rp'LLqsXOTrq-3aqtU0erql]mq#1*hXoGF$qu6KkrqucmrqcNfrqQKcrq-3\rp]pTrp9XJroO.= -rnm_0rn7;#rmC_jrlG)Xrk\THrj_s7ric=%ri#gjrgs+Yrg!JGrf@&8reCE(rdaurrd+QdrcA'Xrbh^N -rb;@Drac"<ra5_5!FK45?N+1.>5MG$=8l8"<;ohn;Z9Pj;#X8f:@_-P9__9O9_D-T:B"&d;#X>h;Z9Vo -<;oqt=8Q,!=oMY)?N+=2@/a[8Ac?<@C&VoIDZ4VSF8g=]HN&<kJGt0"LAm&/O8b=AQ2[9PTDkSaW;`js -YPtp.\,j7T!5/<Irl+lXrm(Mjrm^r#rnRM1ro3q>roj@JrpB^Srpp'\rq60`rqZQirql]mrr)NhXoG=! -rr2]krqucmrqcWirqQKdrq69_rpg!WrpTjOroa:Bro*k6rn[S*rm^qorltG`rl+lPrk8<Brj2U.riQ0s -rhKIbrgWnQrf[8Arepc3rdt-"rdXomrce?`rc%jTrbh^Mrb2:CraPq;!FfO;?iFI4?N+4/>Q.h*=T2@u -<W5ts;u9Ji;=[Q_:]=2`:\[][:]=2i:\%?];>=&g;uTbq<Vohr=T2J&>Q.n,?2e72?iFL5A,^*>B`;cG -DZ4SRE;jtYG5cddJ,Y#uK)UT*MuJe:P5^gIS,T&ZU]..iXo>R(Zi7Q8]`Gpa!5STQrlP/arm:Yorn%/* -rnm_6roO.Crp'LOrp]pWrq-3_rq??drqZQirql]mqu-EkVuNIjrr2]kqtpBhrqQKerq??_rpp'WrpKdP -rp'LEro="8rn[S,rn%.srm1Sfrl4rTrkJHErjMg3ric=$rhf[frgs+Zrg!JGrf@&:reUQ-rdausrd=]i -rcS3\rc%jSrb_XL!,)CHB`;ZDA,]s:?iFI4?iFC2>lIt,>5MJ%=T2@r<W5ts;uT\E;>X8j;uTbn<Voho -=T2J&>5hb*>l.k,@/aO4@K'd9BDuWECAr)LDZ4VSErL7]GlE*iIf=lsL&Qo-MuJe:P5^aGSGo,ZT`1hf -WrB4$ZMq?4]DfSE_Z@cs!65#^rm(Mjrn%/'rn[S2ro3q=rp'LKrpKdSrpp'\rq??crqQBerqlKhqu3Dk -U&Y#hqu-Nlrql]krqZQgrq??arq-3[rp]pSrp0RIroO.=ro!e3rn@A%rmLelrlb;^rl"fNrk&0>rj)O, -riH*rrhKIbrgWnRrfd>Crf-o7re:?(rdXoqrd"KercJ-[rc%jS!,M[PD#S5LBDuNBAc?3=@f'R4?N+70 ->lIt,>5MJ"=T2D!<qTJT<;T\j<rQ1q=T2J&>5hb*>lJ%.?Me.0@fBm:Ac?<@BDu]GD#S>OE;jqXFT-L` -HN&?lJ,Y'!L&Qu/N;eq<PQ$pJS,T&ZU]..iXT#F&ZMqB5]DfSE`;[gYbKBn/rm1Slrmh#%rnRM2ro3q> -roj@IrpB^Srpg!Zrq69arqHEfrqcWkrqucop&:ceT)\fhqu-NlqtpBhrqQKerq??`rq$-Zrp]pTrp'LG -roO.=ro!e4rn.5#rmLemrlkA_rkeZLrk8<>rj2U-riH*trhTOdrgj%Wrfd>Drf@&9reLK+rdausrd=]j -rce?`rc%pW!H<#WDuOSPCAqrHB)ZB@AH$';@K'X5@/aO4?Me%->lIt,>5h[t=QW]U=T2J&>5hb'>lJ%+ -?N+@3?iFL5@fBp;Ac?<@C&VoID#SAPE;jkVFT-I_H2`3jIf=lsK`6c+MZ/\9OoCRDRf8lWT`1bdVuEds -YPtm-[f3u>_#D4MaSs?`d*Md>rmLesrn.5,ro!e8roO.Crp'LNrpTjVrq$-^rq??crqZQirqlTjrr)`n -T)Y2Xrr2fnrquZjrqcNdrq??_rposTrp9XLroX4?ro!e4rnIG*rmLemrm(Mbrl4rSrkJHErji$6ric=' -rhf[irh'1\rgEbOrfR2@rf-o6reCE(rdausrd=]i!-SBdG5cU_EW0qVDuOVQD#S5LC&VfFBDuH=A,B^6 -?iFI1?hdt&?12%n?2.b'?iFI4?iFI4@K'd6AH$6@B`;`FC]8/LD>nJQE;jkVFT-I_GlE*iIK"crK)UN( -M>iM6O8b:@QN!<OSc58\U]..iXo>R(ZMqE6]`,\F_Z%RSao9TbciMSC!7Ll"rnIG/ro!e:roX4Frp9ON -rpg!ZqtC$`qtg<hqu$Hlqu3)bR/d'_rr)`lrql]krqZQgrq??arq-3\rp]pTrp9XJroX4@ro!e4rnRM) -rm^qorm(Mcrl>#TrkJHGrjVm7riuI)ri,morh07^rg`tRrfmDErf6u9reUQ,rdt-!rd=cn!IK1mHN&*e -FoHL^EW0qVDuOVQD#S5LC&VfFBDZ9>AG]m9@e*t,?iFI+?iFI4?iFI+@JaO5A,Bg9Ac??AB`;`FC]8/L -D>nJQE;jkVFT-F^G5cgeHiAHmJ,Y'!K`6f,MZ/Y8OoCUEQN!ERT)PD^VZ*RoXo>U)[/RQ6^&GhH_Z%UT -b5T]cd/MMqf@L#SrnRM0ro!e:roX4Drp9XOrp]pXrq-3_rq??crqZQirqlTjrr)WkS,\lUqu6KkrquZj -rqcWhrqHEcrq69_rpg!WrpTjProsFFro3q9rnm_0rn%/"rm:YirlkA]rkn`Mrk8<ArjMg1riQ1#rh]Uh -rh'1\rgEbOrfR2Arf6u8reLK+rdb'"!J#_"J,XipHN&3hFoHL^ErL%TDuOVQD#S5LCAqoDBDuNBAbBU, -A,'O1A+F10Ac?<=BDuWECAr#JD#S;NDu4MQErL.ZFoH[cHiAElJ,XutJc:?%L]321NrG+=OoC[GRJrcV -TDkSaV>dOpY5Y[)[f3i:^&GeG_u@[Tbl5oed/MSpfE'a]!8IM1ro*k9roa:Frp0RPrp]pWrq-3_rq??c -rqZQirqlTjrr)NhS,\cRq#:0hrquZjrqcNdrq??`rposTrp9XMroj@Cro3q8rn[S.rmq(trm:Yirlb;^ -rkeZMrkABBrjMg2ric=%ri,mlrh9=`rgWnSrg!JFrfI,>re^]3!JlR2LAlf(JGt&tIK"WnHiA9hG5cU_ -F8g4WE;OSKD>nAKCY`b)C\qrCD>S8KE;jnWF8g:\G5cacHiAElIK"`qJc:9#LAm#.MZ/Y8O8b:@Q2[0M -S,T&ZU&LhdWW'!uYPtg+[Jm`9^AbqI_Z%XUb5T]cd/MPof)FG'h#ZHl!9!k9roX4Drp0RNqsXOTrq-*] -rqH<drqlTjrr)WkQ2d-Lp&=shqu$HjrqcWirqQKerq69_rpp'XrpKdQrosFGroX4>ro!e4rn7;&rmh"q -rm1Sfrl>#Wrk\TJrk&0>rj)O-riZ7!rhf[jrh07]rgNhQrg!JFrf7&=!KE*<N;eY4LAll*K)U<"J,Xip -HiA?jGlDpdG5cU\F8KtSE;OSQDWYg5DYnALE;OYSF8L(YG5c^bGlE$gHiAElJ,Y#uK)UH&LAm#.N;eh9 -O8b:@Pl@$KRf8lWT`1bdVZ*OnY5Y[)ZMqB5])KGC_>_CPa8X<^cMl5jec+2"g&Bk-huVis!94"?roa:F -rpB^Qrp]pXrq-3_rqHEerqZQirqlTjrr)NhQ2cpFqu6KkrquZjrqcWirqQKdrq69_rpg!WrpTjPrp'LH -roO.>ro!e4rnIG*rm^qqrm1SgrlP/Zrk\TKrk8<?rjDa1ric=%ri,mmrhBCargs+Yrg<\K!0RAGP5^OA -NrG":MZ/D1L&Q`(Jc:3!J,XlqI/\KlH2`'fGPcO^FSg.VEoqB7ErL.WFT-F^GQ)jdH2`0iI/\QnJ,Xut -Jc:<$L&Ql,MZ/P5NrG+=OoCRDR/WQRT)PA]UAgtfWW'!uYPtg+[/RQ6^&GeG_>_IRao9Qaci2AleGe/# -g]$(/i;Va;jlHL(roj@Grp0RPrp]pWrq-3_rq??drqZQirqlTjrr)NhP5gL@q#:0hrquZjrqcWhrqHEc -rq-3\qsaUQrp9XKroj@Dro*k7rnm_/rn.5$rmC_lrm(Mbrl>#UrkSNHrk&0;rj2U.riZ7$ri#gkrhBCa -rgj+Z!LoSXRJrKNPl?gEOT(:>NW+h7M#N/.K`6W'K)U;tJ,XooIJA0aHLH.SHMDjdIJ\KmJ,=cqK)UE% -K`6`*M#N;2NW+t;OT(CAPQ$jHRJr]TT)PA]U&LhdW;`grY5Y[)Zi7B3]DfMC_#D7N`r=*ZcMl/hdJh_r -f`'V(hu;R5iVr!=k5ji3!9sLLrpBUPrq$-]rq??crqQBerqlTjrr)WkN;nk:p&=shqu$HjrqcWirqQKe -rq69_rq$-Zrp]pTrp9XLroj@Bro=":rndY/rn7;$rmUknrm(MdrlP/XrkeZLrk&0>rjMg3rilC)ri,mq -rhf[h!2'@cT`1P^Rf8`SR/W?LPQ$^DO8b.<N;e_6M>i>1LAlo+K_U/rJGXiVIf"WlJG=`qK`6])LAm#. -M>iD3N;eh9O8b:@PQ$gGR/WNQRf8oXT`1\bVZ*LmWW'("Yl:s-[f3f9]DfSE_Z%LQao9K_cMl2ie,Ins -g&Bb*hYuL5j8S-=kl0iJm-F`=rpKdSrpg!Zrq-3_rqHEerqZQirqlTjrr)NhN;nY4qu6KkrquZjrqcWi -rqQKerq??`rpp'YrpTjUrpB^Nroa:CroF(:rndY1rn7;&rmh"prm(MfrlP/[rl"fOrkABErjMg5rj)O- -riQ1#rhogn!MuXlU]-qcT)P;[Rf8]RQi<3JP5^UCOT(=?Nr+b6MZ/G/L\QQ"KB@dbKD:-!L\lo)MZ/P5 -NrG+=OT(CAP5^[EQi<EPRf8lWTDkM_U]..iW;`jsXo>R(ZMq92[f3r=^AbqI`;[dUao9Qaci2;jec+2" -g&Bh,hu;R5jSn9?kPjfHm/c_G!:^!Vrpg!Yrq-3_rqHEerqZQirqlTjrr)NhM>r5.q#:'eqtpBhrqZQg -rqHEbrq-3]rp]pUrpKdOrp'LHroO.>qr%J0rnIG(rmh"qrm:Yhrlb;]rl+lRrkSNIrk/6>rjDa2ricC* -!NrU)Xo>=!VuEOlUAghbTDkG]SGo#WR/WENQ2?dEP5^R?O8b14NVe\0MtN&+NVeb8O8G%9P5^[EQ2[-L -R/WTSSc55[TDkP`UAh"gVuE[pXo>L&Yl:s-[JmZ7]`,VD_#D4M`W!pWbPoccd/MGleGe)!g]$%+i;Vd9 -jo4KCl2L#Jmf)YUnF-GIrq$-]rq69brqQKgqtg<hq#1!eKE$T(p&=jerquZjrqcWirqQKdqt9s[rpp'W -rpKdPrp'LHroX4Aro3q8rndY/rn7;&rmUkorm1SfrlY5]rl"fQrkJHGrjr*=rj;a5!OT65Z2Us+XT#:" -W;`[nV>d4gU&1J]SGo#TRJrTQQi<<MQ2$RBP3.o(P5(7?Q2[*KQi!0LRJr]TSbo&YU&LecV>dClW;`js -Xo>O'Z2V*/[Jm]8])KDB^])+L`;[jWb5TWaci2>ke,Itug&Bb*hYuI4ir8'=kPj]ElMg,Kmf)\SnH&7Q -!;$3_qtC$arqZQirqlTjrr)EeKE$N&qZ$Qop&4mfrqcNfqtL*`rq-3]rpp'XrpTjSrp'LIroj@Bro3h5 -rn[S.rmq(urmUknrm(MfrlP/[rl+lQrkSNIrjr0@!P,c?\,N`5ZMUj)XT#:"W;`^oVZ*@iUAgkcT`1S_ -T)P;[SGo#WRerNPR-'b4R/WNNRf8fUSGo)YT)PA]T`1YaUAgqeVZ*LmW;`jsXo#=$Z2V*/\,Nr;]DfPD -^])(K`W!pWao9Qaci2;je,Insf)FG'h>?.0j8S-=kl0iGlMg5Nn,DhUo)A4]o^i.UqtC$`rqZHfqu$?i -qu20HqYu-Ho`+piq#13iqtpBhrqZQgrqHEcrq69]rpfmSrpB^OrosFGroX4>ro!e5rn[S/rn@A&rm^qp -rm:YirltGbrl>#Wrk\ZN!PlMM^](qG]`,MA[f3]6[/R?0Yl:j*Xo>F$X8]*tW;`[nV>d:fU]."eU"uC@ -U&Le`U].(gV>d@kVuE[pX8]4"Xo>O'Yl:p,[/RK4[f3l;]DfMC^])(K_Z%ORaSs?]c2Q#fd/MGleGe%u -gA]k+h>Z=2iVqj9k5OQCl2L&KmJHAOnc&+Yp&=Xcp\+[^rqQKgrqcWkqu$6fqu20Hp]#gEo`+gfqu-<f -rqcNfrqQKerq??arq-3]rp]pUrpKdPrp'LHroX4@ro="9rndY1rn7;'rn%.urmLemrm(MerlY5\!6,&Z -`r<pU_Z%@M^AbeE]DfD@\,Ni8[/RE2ZMUm*Y5YR#X8]-uWW&jJVuEXoWV`^pX8]7#Y5>I&ZMq30[/RK4 -\,Nu<]DfJB^AbqI_Z%LQ`W!pWb5TT`cMl2idf._pfDaG%g&Bh,hu;R5j8S0>k5OTDlMg/Lmf)\SnG`%Y -o`"O_pAXdeq"OjarqZHfq#(-ip&9OBp]#gEnc/Ufp&4mfqtpBhrqZQgrqHEcrq69_rpp'YrpTjUrpB^N -roj@EroX4?ro3h4rnRM-rn%/#rm^qprm:YjrlbAb!QrRaao9<Z`;[[R_>_7L^](qG]`,MA\c0,<[f3Z2 -Zhq$,YPtd*YPYKbXnAjrYl:j*Yl:p,Zhq-/[f3c8\c02>]DfMC^])%J_>_@O`W!mVao9K_bl5rfd/MGl -eGe"tfDaP(h>?+/iVqm:k5OQCkl0oImJcVSn,DkVo)A:\p&=[ap\spgq=t$dqtg<hqu$?iqu20Hnc+1? -li6k]p&4mfq"k!bqtL!\rq-3ZqsXOOrp9XMroj@EroX4>ro*b3rn[S/rn7;&rmh"r!71bnd/MAjcMl)f -bl5``aSs3Y`;[[R_Z%@J^](tH^&G\D]DfD@\c0,9\,Nhu[JRE3\,3]7\c02>]DfJB^&GbF^\bhG_Z%IP -`;[dUa8X3[bl5ldcMl/hdJhSnec+2"g&Be+h>?+/iVqj9k5OQCkl0oIm/HDOn,)VOo`"O_p\Xa]q>gBh -r;6Hcrdk+;s+149s7QBgrVl`lqu6Hhq>U0gpA=O^oD\=XnG_kTmJcDMl2KoGk5OKAjSn-;i;VX5h#?%, -g&BS'ecF@Qrm^qqrm:YjrltGdrlb;`rlG)Zrl4rVrl"fQrk\KIrkJ?Erk83Aqn)=.rk%s<rk83CrkJ?G -rk\TNrl"fTrl4rXrlP/^rlb;brltGgrmC_nrm^qtrn%/&rnIG-rnm_5ro*k;roO.Aroj@Grp'LMrpK[Q -rpp'[rq60^qtU0dqt^?jqZ-Njr;QZcrdk+;s+140s8N#mrVl`lqu6Hhq=s^`o_\7Wnb_eSm/H>Mkl0cE -k5OH@j8S';i;VU4h>Z./g&]p]rn.5$rm^qrqpGDhrm:YirlkAbrlY5^rl>#Xrl+lTqnrEMqn_+(rk\KK -rknWOrl+lVrl>#[rlY5`rlkAdrm:Yjrm:YlrmUksrmq)$rn7;*rn[S2ro!e8ro="=roX4Croj@IrpBUO -rp]pWrq$$Zq"Od`qtg<hr;6Qmq#1*hJcFj3JcFX-q#:'erquZjrqcNfqtL*`rq-3]rpp'XqsXOPrp9XM -rosFGroa:Aro=";rnme6r87M/qqM,'rn%/"rm^qrrmLenrm:Gdrm(Mfrlk/\rlY#Xn&P4Fqo\fZrlkAd -qp,)brm:YlrmLeprm^qtrn%/&rnI>*rnmV2ro3q;roF(Aroj@Grp0RNrpKdSqsaUUrq$-]qtC$`rqZHf -rqlTjq>C<lq#5jEhuA9-huEBKqu-<fqtpBhrqZQgrqH3\rq$-[qsaURrpKdPrp0RKroj@EroX4@!94+? -j8S$:i;VX5hYu=0g]#q+g&BY'fDF+teGdqrdehGkd.krdcM5ZQbkTH[cMPred/25idf._meGe"tfDaG% -g&B_)g]$"*hYuI4iVqm:jSn<@kPj]ElMg,Km/-5JnG`"XoD&"Xp\sseq>:$fqtU*grVZZhrdk+,s+14$ -s8N#grVl`oqtp6eq>9pcpAX^]oDA(Wn,DhUmf)VQli-2Kkl0`FjoOW,roO.>ro3q9ro!\2rn[S/rnI>' -rn.5$qpk\qp!`ogpsJQWpsJueqpYGlrmgnsqq1o$rnIG-rn[S2qr%J4ro3q;roO.Aroa:ErosFJrpB^Q -rp]pUrp]pWrq$$ZqtC$`rqZ?crql]mp&4gf!<.QLf)L=$c2[eBo)8RcrqlThqt^-`rq?6^rq-*XrpTjU -rpTjSrp0XN!UK(NlMg#EkPjQ>j87g7hu;R2htu7,h##k*g@Eqcf_*qpgA]k"h#?.,hu;R5hu;R5iVqm7 -jSn?>kl0lHli-8Jmf)_Tn,DhUnb_tXp&"I^p\t!`qYpBkr:U$crqZSFs4..#s3:T:rqlZnr:TsdqYp<i -q"sgbpAXaao_\7Znc&%Wn,D_Tm/cVArp9OJrp'LHqrdk<roEt:ro3q9ro!S/rndG+ptY>mptYZ#qqh5- -ro!e7qr7V8qrIb<roa1Bqs+1Hrp9XOrpKdSrp]pWrq$$Zrq69aqtL*brqZHfqtp9grr)Eeq>Z$Gec14# -a8c&9o)8RcqtpBhqt^6dqtL*`rq69_rq$-[qXFUVnc&"VnG_kTmJcJOli-2KkkjQBk549>jSS!:iq;9[ -i;;L1ir8!8jSn9<k5OQ@kl0lHli-8MmJcPQnG_nUnGDbTo)A7[o`"O_pAXg`q#:*dqYpBhr:U$]rq?AC -s4..#s1\O1rpp$er;6BdqYp9bp\smcp&=R`o)\ISrposVrpTjUrpTaPrpB^Oq!7hAqrm_9roX+>k2cO' -qr[e=p#uD>q!7qGrpBLKrp]pUrp]pWrpp'[rq-3_rq?6`qtTs_rqlTjp&4R_mJhb;ec14#^Amd'qu-<f -qtpBhq"apaqtL'^r:U']qt'gXrpfmTrpTaPqsFCLqs3q?ror%uros+@rp0IJrpBLKrpTaRrpg!Yrq$$Z -q"=X\qtTs^qtg<hq#(-im/HDPJcF:#JcE%Urr2KerquZjq"jm`rqQHdr:g3arq60\qt'gXqsjRQrpTjU -qsX=JqsDo"rpBLKqsXORrpTaRrpfmVrq#pWrq69aq"O[\rqZ?crqlTjp&4dehZ&0,ec14#WW2bmo)8Rc -qtp6dr;-<drqQ9_rq?6^rq-*ZrpoaPq!e:Orp\t:rp]pUp$hkKqssaXqt0m\qtBgZqtU0do(r@_qu$-c -q#8hDJcF:#JcD_Lm/I"_qu$3cr;6Kio(i(To(DnPo(1].p%.kKp%A+Sp%eL]p&"O^rr)3_ec14#ec14# -RfE9ao)8Obr;?Hhp%nR]rqQ'YqtB^UeF`Y2p%J(QqtU0do(r@_q#'g`p&<)5JcF:#JcCc1q#:6joDSI^ -q"sOVq"aCRn+Z;Gq"aCTq"sjan,<%\])R?]ec14#NrSbNoD\Xcp&+(Orqah6qtf[Vo)/Lck5MslJcF:# -JcC<$r;ZHhl2C;Qm/,rAo)&"Um/?MSW;hGKec14#JcFg2o)>llm/E4KJcF:#JcC<$jSt2<PQ-46ec14# -JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$ -JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec14#JcC<$JcC<$ec1. -~> %APLeod -EI -0.60000002 i -1 1 1 sc -CM -57.091858 232.09186 m -67.636063 221.54771 67.636063 204.45229 57.091858 193.90814 c -46.547714 183.36394 29.452286 183.36394 18.908142 193.90814 c -8.3639374 204.45229 8.3639374 221.54771 18.908142 232.09186 c -29.452286 242.63606 46.547714 242.63606 57.091858 232.09186 c -f -1 J -1 j -0 0 0 sc -1 0 0 -1 -187 357 cm -244.09186 124.90814 m -254.63606 135.45229 254.63606 152.54771 244.09186 163.09186 c -233.54771 173.63606 216.45229 173.63606 205.90814 163.09186 c -195.36394 152.54771 195.36394 135.45229 205.90814 124.90814 c -216.45229 114.36394 233.54771 114.36394 244.09186 124.90814 c -S -/Cs2 SC -0 sc -0 i -1 0 0 -1 38 213 cm -/F1.1[ 12 0 0 -12 0 0]sf --6.3369141 4 m -(!")[ 6.673828 6.000000 ] xS -0.60000002 i -/Cs1 SC -1 1 1 sc -CM -183.09186 232.09186 m -193.63608 221.54771 193.63608 204.45229 183.09186 193.90814 c -172.54773 183.36394 155.45227 183.36394 144.90814 193.90814 c -134.36392 204.45229 134.36392 221.54771 144.90814 232.09186 c -155.45227 242.63606 172.54773 242.63606 183.09186 232.09186 c -f -0 0 0 sc -1 0 0 -1 -187 357 cm -370.09186 124.90814 m -380.63608 135.45229 380.63608 152.54771 370.09186 163.09186 c -359.54773 173.63606 342.45227 173.63606 331.90814 163.09186 c -321.36392 152.54771 321.36392 135.45229 331.90814 124.90814 c -342.45227 114.36394 359.54773 114.36394 370.09186 124.90814 c -S -/Cs2 SC -0 sc -0 i -1 0 0 -1 164 213 cm --22.106842 4 m -(#$%&'\(\)*)[ 3.333984 6.673828 9.996094 6.673828 7.330078 6.673828 2.666016 2.666016 ] xS -0.60000002 i -/Cs1 SC -1 1 1 sc -CM -120.09186 151.09186 m -130.63608 140.54771 130.63608 123.45229 120.09186 112.90814 c -109.54773 102.36394 92.452271 102.36394 81.908142 112.90814 c -71.363922 123.45229 71.363922 140.54771 81.908142 151.09186 c -92.452271 161.63606 109.54773 161.63606 120.09186 151.09186 c -f -0 0 0 sc -1 0 0 -1 -187 357 cm -307.09186 205.90814 m -317.63608 216.45229 317.63608 233.54771 307.09186 244.09186 c -296.54773 254.63606 279.45227 254.63606 268.90814 244.09186 c -258.36392 233.54771 258.36392 216.45229 268.90814 205.90814 c -279.45227 195.36394 296.54773 195.36394 307.09186 205.90814 c -S -/Cs2 SC -0 sc -0 i -1 0 0 -1 101 132 cm --21.107819 4 m -(*!+\(*'\(\)*)[ 2.666016 6.673828 6.000000 6.673828 2.666016 7.330078 6.673828 2.666016 2.666016 ] xS -0.60000002 i -/Cs1 SC -1 1 1 sc -CM -120.09186 61.091858 m -130.63608 50.547729 130.63608 33.452271 120.09186 22.908142 c -109.54773 12.363922 92.452271 12.363922 81.908142 22.908142 c -71.363922 33.452271 71.363922 50.547729 81.908142 61.091858 c -92.452271 71.636078 109.54773 71.636078 120.09186 61.091858 c -f -0 0 0 sc -1 0 0 -1 -187 357 cm -307.09186 295.90814 m -317.63608 306.45227 317.63608 323.54773 307.09186 334.09186 c -296.54773 344.63608 279.45227 344.63608 268.90814 334.09186 c -258.36392 323.54773 258.36392 306.45227 268.90814 295.90814 c -279.45227 285.36392 296.54773 285.36392 307.09186 295.90814 c -S -/Cs2 SC -0 sc -0 i -1 0 0 -1 101 42 cm --22.437897 4 m -(&$,%'\(\)*)[ 6.673828 6.673828 3.996094 9.996094 7.330078 6.673828 2.666016 2.666016 ] xS -0.60000002 i -/Cs1 SC -0 0 0 sc -1 0 0 -1 -187 357 cm -241.8851 165.7094 m -265.0369 195.47601 l -S -CM -82.948425 155.20917 m -80.404968 163.36581 l -75.668854 159.68217 l -h -82.948425 155.20917 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -269.94843 201.79083 m -267.40497 193.63419 l -262.66885 197.31783 l -h -269.94843 201.79083 m -S -1 J -1 j -334.1149 165.7094 m -310.9631 195.47601 l -S -CM -119.05157 155.20917 m -126.33115 159.68217 l -121.59503 163.36581 l -h -119.05157 155.20917 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -306.05157 201.79083 m -313.33115 197.31783 l -308.59503 193.63419 l -h -306.05157 201.79083 m -S -1 J -1 j -288 252.50002 m -288 277.59998 l -S -CM -101 71.400024 m -104 79.400024 l -98 79.400024 l -h -101 71.400024 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -288 285.59998 m -291 277.59998 l -285 277.59998 l -h -288 285.59998 m -S -1 J -1 j -348.51022 171.38774 m -346.34036 195.2561 349.33395 222.73376 342 243 c -335.82343 260.06796 322.3186 272.02963 310.74426 285.3342 c -S -CM -118.702 65.47583 m -126.08051 69.783691 l -121.42856 73.57309 l -h -118.702 65.47583 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -305.702 291.52417 m -313.08051 287.21631 l -308.42856 283.42691 l -h -305.702 291.52417 m -S -1 J -1 j -227.48981 171.38774 m -229.65965 195.2561 226.66603 222.73376 234 243 c -240.17657 260.06796 253.68141 272.02963 265.25574 285.3342 c -S -CM -83.298004 65.47583 m -80.571442 73.57309 l -75.919495 69.783691 l -h -83.298004 65.47583 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -270.298 291.52417 m -267.57144 283.42691 l -262.91949 287.21631 l -h -270.298 291.52417 m -S -1 J -1 j -251.44662 136.44382 m -263.62985 132.96289 275.81677 126 288 126 c -297.06128 126 306.12457 129.85162 315.18689 133.25769 c -S -CM -135.75458 221.16806 m -129.14691 226.58456 l -127.21466 220.90422 l -h -135.75458 221.16806 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -322.75458 135.83194 m -316.14691 130.41544 l -314.21466 136.09578 l -h -322.75458 135.83194 m -S -1 J -1 j -324.55334 151.55618 m -312.37012 155.03711 300.18323 162 288 162 c -278.93872 162 269.8754 158.14838 260.81308 154.74231 c -S -CM -66.245407 204.83194 m -72.853088 199.41544 l -74.785339 205.09578 l -h -66.245407 204.83194 m -f -0 J -0 j -1 0 0 -1 -187 357 cm -253.24541 152.16806 m -259.85309 157.58456 l -261.78534 151.90422 l -h -253.24541 152.16806 m -S -ep -end +save 9 dict begin +{/T currentfile/ASCII85Decode filter def +T 759 string readstring pop 0 756 getinterval +/F T/LZWDecode filter def +/m 0 def +{255 div m 1 add dup 3 eq{pop setrgbcolor +286 347 false[1 0 0 -1 0 347]F imagemask +0}if/m exch def}forall + F closefile T closefile} +%%BeginData:; +exec +!!!!$!s8i9#n.4N%Lrs[&.fEc&Jl6"*??.C+<VjP+seN].Olo#/hSh30JP::1G^gE2)RBS3BTDd5!D +.r6:""-6qKsA:JXba;c?[r<EE7'>$>*8?=%,O@qK=bBk_9tCi"$.DfTl=FEDVIF`hhMG'A.SG^4O\H +[C-fI!g?jIXZ`qIt*!"JV&K*K7ef/KS+u4KnY88L51P?LkpnEM2I1JMi<RQN/WdWNfT6^O-#EbOcbf +iP*2#mPE_;rPa%DtPa.Q"QC!r*R$a;0R@9S5S",t<SXc7ASXl@DSt;OFT:_dLTV/!OTq\6TU8"EXUS +O]]VP^5fVl$AjW2ZerWiE)"X/i>'XKAY-Y-+q2YHP.6YHP17Z*CR>ZEgdBZEppE[C*EM[^ETR\$rlV +\@B&Z\[f8^\\#Jc]Y(nj]tM+n^:q=q^V@P!_8*n'_8=(+_o'C0`5BL2`5KU4`5T[5`Poj:`lH-?aN2 +HEaiVZIaiV]Jb0%lLbKA#Pbfn;Tbg"DWcHXY[cHjh_cd:"bd*U.ed*^7gdF-FjdaHRmdaQ^peC<!ue +^`4$e^i=&f%8L(f@SX+f@S[,f\"j/g">!2g"P06g=tB:gY:K<gY:N=gt^]?h;$iBh;-oDh;6uEhVR, +HhV[2Ihr!>Ki8<GMi8EPOi8NVQiSibTiSrkVioB%Yj5]1\j5f:^jQ5IajlPUdk2tggk3(mikND$lkN +M-nkiq<ql07Htl0@R!lg*m&m-F!(m-O**m-X0+mHs<.mHs?/mI'E1mdBN3mdBQ4n*f`6nF,l9nF5u; +nF?&=naZ/?naZ2@o()ABoCDJDoCMSFoCMVGo^h\Ho^qeJo_%kKp%A"Mp%A"Np@e4Rp\+=Tp\4FVp\= +LWq"XXZp\=OYq"a^\q"aa]q>'m_q>0saqYL'cqYL*dqtp9fr;6Bhr;?Kjr;HQkrVc]nrVc`orVlfqr +r2osrr2rt!!!"L5N#?t,SggoKL0*D\7@K<%u<V_;)k@P/Jj5X!Pg[h"b@&&^Yd*,PNE"?KYN<3-@AE +hs-#br0DF6o8KsY?T("]27Jd4P6/1ltr'GT0GJY^\qFj)B!h-s'YY%#=MZ]TfX"ZSn3gU,P^oMFsSI +uB-M-/\83%_Ej!jk4mn@.I"_ZIHe/^Pm'4i(L8bosP1HjW4D]tu>.80d,>9=_oV<<skb%1C/5Ti*ir +NkYXlf5n/TS/PHQL>H=F(aGX<$-;,0OE]aSs-&)n@%(1Yq`b2$d\$BW.tA_9K^`AqpcICE$++`Flhi +rn#HEQ_o^I'T#I.^i^ug'\#6"S[KOq_,DNkfW#4l6])D=%`)t\f3\.IA!kOc0TTEEL7^W9itZmP8dO +TRlT&Ght@Jc#k/S)u`FH^Emirf]Y3',Gf+.M:NaQ`"Qc5FpiI3n,:7$4LjDa8APZJ1(7p#U!ci^5/? +Cge*!jOh<fZ7-K39FoZOWrclL]@g"a,E2&O6a>$j,43AsN%iHCcq#53RXW/]?6tPW901OBs,!F+%8a +]BmV"jq7QLF/2""OXMlT?^sdb_7>$domdcmfb7L:eoHYQ-au4W;<_F@lI\;2@g7n"HTN.eL=\C(Oa6 +%l64-Tr%u7Xtr^4gnbtlHdaPtL\]s"Z02"'J$3]eHFgHT.a3UEl0Hib88((06E>7*7mA/6'cPpc#bo +1U_DV/qbd/]Y<.S)1$RX3&2PU&&:bN3.5QUOU-V5[VUg6qBX:"E4Z:HdgjAtR:[#6[uV::8RFh8jkW +_5^`Zk(6'qU&DhKl&Y1ls3B>Y7@!DX1=$IJe+SMj/Ra'23\+:-!&_7;_Amg"F+3#@]rP"\U(AlAnZd +7Qrj%,Y8l]6nd;M^'T*->dM[4B6tf+pX.[H(4t@[MO#l0tiolQ]?U_Q5o$*nEG's!-O8J[FThQ<AOf +h5Q_m@r'656eDQmU^UDOF*9>bOiOidtq_L@(quk]ZZVn9-8k[;`R3%chUhZL)o)\q][iEZCWO6ZW)/ +Un'D+C%mW1[Y3C;>5\L.E8U/Z$@[*<)8XhpL`,I.TLT/-`jj)EJ_G+SAgi/j*7%U(h*#CWJ"/%k."= +8D3`&*8#_<J8[-]NEb+`LZ[[rc`MB7'87Jk!2<Tk<mE*o%eKUZn>cDe"AF:O.*I9TIakjDZG4mX@s5 ++)9eU\o+-[JR;<pAWccQt`J>dCEp'AI(;'IkCX*3MY1(>"`@VmVWCt!goXMF:<81Bs\G\aT<VB."-& +/bW?)5!oW;YJ*XLX&6NQSR>G<bl9qP0_Dj0k]'P1U&>tN?.gB0U0o3(Tq[gX842q!@*UstZY#66G;2 +G@1_<bHtLkJ+B0`)reE!)02]+.B+-<AM41I^:Q4%HOT)6k#I`cpE.UO`@TZ*7Mr=M5P]f`$iM^kYA< +Orr`;!fs,lq8d)%2^0rHL_;D!.3e3Xf<dR_D!DE?ime1hKFNTq$;e.@7[ms<(6p=0$:5@NAl!aS+m* +@58]K8XjUqE@O9Eq#-6-2b]E+:N8Ue0oL<WpG"Z[.N@7&BU1EfW3/hijo&Rsa+9oL`FEY;FlQk^%,j +@jR3<63;jPX1@/%?go<n<%c=p<&M9HDFtq4Qm8DhD8(hlt0OoR@>*=]36Z4rUn#U*(/mH"Is!c^<RK +/6E#PA+gTg//kIQ]BL*>dP>W"0![U0H`6FinjHPd0919V+AUQC%D,M8O94g2g,1JKb8\)T-Q2qgj1s +r'rb$@g,LqmT,25uT@>=dm4Y&r*oXq3>Gl)?rW-R6Ese&IKlcJ9Uo#25*I63]U[bqP>Krif2hJo_e) +(p)d,En#[PlPqVJC4kN>O>2;jNobC+:BZV<j,340W;8O7r'1k1rZH!m;E<g*c92B1oZS``)"pQ%N&& +OO_0c8)B8f'[1+^K3'>p*3^0\Sg1K7oT"f[[iTJkB#7gP(%J1$)R;!GqQX[T@`oLdpO-%06>C"S@)@ +aMgS>Xg;rDn.R=!>/OoDcS`*,4\m9RhPueXfP&f"8_B69=Fmk\MZ_\cIJ#\qf`5/+</50Wuo85H9_c +8]p%]6LO7Gkn!38`JbVK;A3`,XSGGABhYacJ8;RoY^5F;Mm9YH25O_em(ZCm0i.1ee_facrB)`;Jr& +Jn=rQqu,HKSa/KlZU!-_o0(kK2EoLok6s`Y@Q[j#PpK#W;IV\@RZ)BF@WkD!.MrWq+V\q_5-'!AA\j +KN\\OB-qJ^TU&'hcheT!#[N/(fl&KSgqB'G#%>_YO"t<PbsWrAB?aS_2J1b#S+DASc<8ISB3ahpm:c +I.H/d^obl+1+#(b-)%mjr8%AED`M/%;P7;1KtU\"IGdMbnRBjE<eoZ!<J>&R/Mh*%\.D7Rk/91k320 +OSo2T[d5L<bgGrX7_4PelpC'CL(eZou=Po>45d5h0lL##/Sqr%q9?\NNr1HLsL@-;JTij6ulmmeN"] +$B0DT<G#$`F>AnCrh7^;l#3"?AO)f,Dc+3R<l.oRIG&H-l]D%'MhHS<PDdDbDpW!$d>OR#Zg3oG?78 +[304Gmt2rPA8!$/o,BL2F%0c+%[(i`o9:EF(69pr=94>]5XBhD:HWpEAU&O-4Ni:!*3$.HOg<Q?(hf +bP?oJk$62PCi-Asq$/b>>jn8*hL3`H#=7QZ&#+&c?&#cm8C$<M;&9.qfJDK3g3LGgg2-$'mZr`XSQD +QYhS%P<#-Zt@LU))0c.VtaC$f30/p,nuf]:?WmDN):p<N']qo=!N?13F.T)%:A#D)AN&&NQp6aV")3 +Q,3DhJN9)=*O+/gcXK3H!`/br5Y5o*Fi2rcSan\O,rg7CX5AZ6g#R$4RqssKm-lilgju\30N1OHXCX +Wp",GQ?B0tj]Y3Sda)K&ToA"_#NUcSs`5Z..m<m6NoDXNmqHm%`I9WE5[!0CWg;E<+DnYoF#N=FO9> +URf`VKO(l2=tm2Z?D7q4XZXW!h)Bjlm^Qk4cd<T"<MNXtX\\i3fcjPtE8!_VY9oaT%=S!GV];O<"Ak ++OMS9p^eYOXj7"XI/hNEc]Aj:NV*9i=OOE8!mN;"&4m#o;$AXR"`RTJY[%G%>69[*"&6f1M9=S79_& +N)pWYnoU*Boe70\WT#;:Ddcj^0jOU3_,$#l:=Yaj8/5S*(m-uPJ'E-V@4FLc20SS]YW9[)F1DP@\m, +41gr0SI'WoH@[])epSC9PE/ld#b5#+@5Xp&A7P9ZHIoEU6)NmO>**,mYT,\#k!;m6Ac`G^*i0h+)+% +hnG<VCKa<GTO2sM:iZP4R7gJ1$_C[h[lsUN#<7A&U6m:jD_>HDM8nsIo,7AQ)kt\;'[e4:ql::t107 +=B_OJD)/U*Cd/d+Y6+\0==aK5a0.WiWPL/Ju>V)$tcDAqK_c,8G&"p!CKem=IPl)Lnl"o?R8Qc%%iI +dgcgm%.05uMhjQ5jN:>EfZR%I0^cB/[g[&!*6KE=&/QD41`Gk,Mi_Q[;#L>efH7tn.NmlL;-^R=_]D +Q_*t!P?09T?gC=TTIa,1AFbh4-/[/P'HTFA:Ccg:II0+M`%o>76l&a7E#Us&:IbHH%7/@NX!=!:9,F +@N:]cciE;DV[#R*$QOF/5i-YJL>5p+]<\3&pY5O,:88:,L2&_%LO?kQm*01ic5nR&KoJ8ROqF;Ti/> +Fms-5-OPTJ<Vsm1X1,.ejIhO>m[W/t4UGD-I%`i,Q)j$ZPo#eGI`n\kE/-lI`XRRf]A1$lF0!bj<ZO +JV[&MZ'Um4q`=BhL.$%kr%pUD#!(.?G`oq(ZqJ1NPQ4ZTU,95r:/R/F;OSZUH_<+Yj^.202nXZX#H[ +@5]oQ2K*"[.>9WTX#A:t2cFELZ[Fe#=YB4h+q["!.<OIr9\)"`0_6eS%P'M4ml(`m/$JNh1T8KtgEc +=-`iePde%Ij1+#Jt4/G",8Z^3cf(t8)q#udYQ1YY&(=#pi_3N;l3o?PUekrodR5Al0<DV-DEjN`t3T +TF[uPPFM9hO1_TfJDt]oGl3,)aWj%67h(W<$am'0]hpXC6!3t.?`Spo$0'@,W%;FZqWsV8NQ0@MTk0 +HbnWZB1:]53720H*Y0BDbD+?F*7s'"8F>l^jG1b;-8/-nOZTUclKg[N[6#@]0/WE>dNCl%(8oMO<'W +@B5Y=gYWL?YC!X`[2E[71];bS7/p%Nu;G[_U"A+r##@U(mr.Rn^"l9FY,u:K's((t?\:Tn5]'6P?nN +jA5?<]8N>l'`uVP%a^;Y.Etu)8g@*R<$F%B[,U622!Cgbg1lm*es)]QlW0F;#>ljX>>/qd'Saub:>S +u3cK%1LeB6%cIbiOBc4qJS2+")r@dLL#iq55,ok#B_INl1+diut;@MK`"INoNL0-P5Q'lrroc?lb'd +^=\Re<JPW<nq_Qc4tNL;PLRqBXs!!b7)ia0PHR-%9tJ*)m$q\XM\6ncWda"gLpOhoX/#pT^W]"$$C" +7e2L].-XIOPckUlQp'TWq(8:j(!eGZpXc6bsm+sW1dWQu^N6bm+2_;B]f_,+-M;_lB#bj3N?PZ4D[S +:<+:tq99f>FFp(/idC3nRHg=Y/Z+!<4-2$"_[pB6JQ5[XDf^JDIVm!Z!]\Q7DhH+<:%kdacubG+3/' +TkZK^C3HRk[]L`3YA"IcAg/a=[^0cC_/(u7&8bWP2J6i*BkrLsD%2D7D$YggcX3!kDKb8^ZnlB=m;F +e=DbS>ie8&dlq/A7rE-DV-XClBFc#:HHEE<S3[bYr4+`]LepC!1&.RR`b@<)#h!3\+jmLO:R+`@k%D +@F:%(H6I1:sudp1faQu2dJ9W4SBRGFmtl>(MS'eEHa$:3Hmo9=+*WK/U-S$G'AXbZVNLm>9,;!2]"< +jf:.$:-$QNbH0n[Z<lA56JTYETEK1!E(VL-!@a>,MG`9C^0o@RWaa<d4I<T%H2q`WRiH4h<esEK>X9 +C8Z56j.11cMso2uS7$!G[t=J2djc\.*6g(Ndn`IFo']XXSb%21E%UJp8_r\1IKd+Uj_kK5T.fDCKn! +3J9@[m?ecEGYNkd;)@tOcknp"3*[Vek*.NPBUBL\oYk"@lne5h6ZT%G@IFD!FL3:?*j"Ep'NWJ'N9# +4ud'pC/BauR?i\jA8%-eI>McWgO5\ag.d=UD2/T-;T$%bmXN(j<nWgZEm7rs:=0d;+&ari>saD,/[I +Ws7oV4,lng.ol(M_f,5%0XWe>1]s3M/0pImO&+H]b68@rAas2/Bf]6)Vo#XCf&0/V^/2Y,Ce3KKl)W +.24Hm*kqI*?78V;Z;hn%__iZOqO-O\?f]"++QDa2"7h:#2nP7ss0esUiND*HK!C)gk0p9e%g3E!Z8e +mVS)U"O(a:-$YH&A6dL?s*5\`SME3J>iLpnqpRU,,K8P.K]Xo(1<\Pt](,Nusd-I@1Q&nla&t\Z^_W +N%6)C9<!VLGL;n>XNj`fSQXmqH/@_j[?^-mT:,SLU&b4E5i@`+1`d58KgOa[fQ9;#&W&p8O]\ts0c> +s?j,r!dIR,->8E>q:1nIPnPtL/$flXq^rKp:@P?G9LE<^nfB9V$@rddA/;!=-I2'./>UdaEC;uJ>B0 +V-Eu&%HGuXV@bbC,O`<I_fHt=R;>X24i30[9Ds`gNC6hEOf?BQWplSnS,)O.JK61p;_Np@.9Oc9>:p +m`F@cXN+P9_^W9sVOb`(#0q$9uo9nD-ImKdUB_7a!2P3jGeS=cBlkEY)Xb(A#)Yj$\A\$W7pRBo32^ ++3A;Rb+)gj^ukj`:0ehKM2XdHPcIRuXCQgVDjiqgF>L'>5mR=14D!s+]RiRq/I(?Uqg:lAPJsT#`"b +)rQ>;U-:enDX0OP"6bi1n.ZB95ql7S#!oJ8*l:+f<!`gl&.3=Q6Enru%OJ?l3tO)bPP#L*Y]Gth`=X +q.(.GKM?Pl6eP\1n(XX!W\1f4*k*_3L-IYC:*KI%a*Z7M%^8MX83-:tHmr1LqUr(*;L#X!($6BZH"/ +k`MAALU:<]X5"9;\RB69*j=j1X37Jh`+@ePik(T'4gDk:G^Mp5#8NWRj')@]`1;pZo&@^;)D8h7OKt +!)b<jY%0oI&['_P\;`*#`:.LL'#r3Z&;UJ"`[5C`Z<AdZo.Q199<n1.><Ed%5M\Tes5ffKcK2<t9cW +F:-'dHW$BcUP-fbPTpAm)Q`;dM:\V4VL+[^(N#3>T<;DHj=CCsZ:a'l\pi8KiRp5PHJ;G$VS"h^;\g +L$)"^(T$SJ/LS[jIg>_mrmorY"(_48FN(#-1q++DK#MtP'8T<4!_%t*342Y*f1?_\KjeZ?+,f2?(.X +NC(%t:bAN<d7Cno[$=.!S[P37oNR.b0_B/]0<SN#,gh0EY5L3]J+\i,UD?#R>6V'5V#CS/M5$1Eiua +1:qo+e"9#VS=j/Lp-.Q:/6CTkc*OBT_due_/)Xn8[fgH+tC\Ll'!EqU4[pW`n,NWY);Se0)1:5pHf> +!TCqecY41ZVhI!N,=rGGmH)g*PE(OA!TAdG_(!E>^^=9CBaBqG6?\iFo5OU"q0@.eBVbiCe-uDK+,@ +!hOg)urI#)<HGH73EtBd\)-F=SGu06mmX;;@n;Mo3Cb;m1#EqJi?VH0m^$8)^7N$:F?Z+"BMHTO,JQ +oV(*Mg4o=Y=pasHhjOfHUL2/"rM(J!(OtLKbn?A1dKkcb+tQa7O[lE?R]1F\Ue%W'JeV+?R(n61osk +V.$:0a[I;"ZYOWm1=_-Z^1.WCK.&%Et:L\)T1nA'W;dRt".b:b>;*ZI'B,)IGa)h-kF+I^Ab8<6UAH +`;sn6hfSLSoN&3V0+=VJi=DMe5deK@*94X3>RF`?6[dILRUiQlcC,X,&s947]0!I@poq.j?7=sZ4.d +EFESh4i.ab!,7r9AWIcDD-5,MI!K$`*20%!17.YOE;FHCa":@X1kZ[D0q">Ha9R"Q9j>P(!O<B>4(Q +\@h6;M-b+E3R+)'e??j?X??UiofMq)CWtfir[bIS$3S)(K)Oa"J(>6Q15b6RCDAQST+_9Y$QI=3SXO +`8Y3"'0@ql>BuI/c>--A2&&[LW%RYTBH]CH3G123SH^ig8OSt)k=k>C'97;_=gD9Ym.6h_k'^%9q*/ +Nas.C&1JKtQ7W[CpWR5>D-:pWYSLbpr]j;s'u(&p@o@[Eh0cAS7a7mtj2PofPPND2647ujD`9d]^mQ +V(<;93hime's`5.Q:(9YofhKRZUNpGu%AX3L81k6W.ZQ;/.sYW>-]ARi6I*Bl-JB#+hJdlDIV(*@.X +BAM2G([9%,9?`XeYTN(d)Wp5"C7Q#4lZ5O)UOlH6g:nG)H3pBpc[<F%,@_<Mo7nBXsHa!lqVq#6A:? +ubJYne\**3.CqluO>KQ9:nnlQp+YYpUOaWls)&oU@51-nNq_kguQ(BS\(M,R*ggg1`m9M/iO!`/<+b +<K9O`R`K\2bb*Xa^M"!lKI9gk+IIfF4eSbi\--e:b)$4"a7Q47`(gjSq[QH%V5-%eP':20>:iWnga& +m(BNYsH,HLY\MDp'O>N0pSM/A4r=-=oUU1\if/aafaSO6YF%sAZ;O]47(r"rX_9/#gI^/f4%?o,'7# +VH:;7B6\14:ai8q0a%Q.$<Id*J-i</Le2KKSK&GIjH6J^I?l`SBK>XYt:P)`.&N^!o8:&Sdm;2R#g8 +!+c\6W5K7:_*u4^*;6^]Z&+s-OU>0mPapl#*A:#Mfr.^N`)"!WVI'I(r$&hE__EX3.j^h];L@T>baf +%9LjI(NhEfOeX)9#A4ilR1BL2WUt'085`+-amMBd-^=6t]s3Ci\V!^p$<o:0daf[!%MY#ld'P*@Rbk +DO"cmMaQ`g3N$umT:U?^:hi-bWGHq,.sc,4C;!`;oU-B@qQu(D,r_Ks<iS#<doe,)aC7u@>BY`EbLm +HAY4acof`YYgUqLoPWiVLrHRENE4fPi4[b'7IRp0`o41!#QPhV[_EDo$@\Q$"j,C.%/&WH7ca=]C(Y +]-#r*R%8;U!n,<f#6shoVOQ:(*m+p5&`+N_,dC2i.ifin=C(V:i8DS]LA@Z'T^0lQP\[%A?d!=m].q +="6"q1Fn)9f^H!Xlj<SYFQt\k$q)Kb\SA1J53u?#0+`qSV>FK7I3^UCE7ce6AHZCqbbD=`g[R=&]PE +&O1\o0[q#pZ!`*i[[cLGnGCs/[.i@BUbS<pUi^Yo4[?fZH]gm+nJ*oG*_@e6bH-?,ob7k>k&ohbu'( +Z)*W_Sj[ql>TjaKJJ]hVCZu-M*T^)0:kD03qtXsrjG+/,^@YmIW=(U;Bj4,0YZ7fpGJ6/[P-#_(4le +$i30_54G(_i(4^iV9j1($>@M[o4!bD!mD/sm,&qrJo%rJ+l%X[aN])A=spuFLqZWHSJWZdQ#N#HIgp +jW);ME-c6.EVN&]'%a0eb=nBL3F+m9ebPG0Y/>:-EkKng#?Pchm]m0cKIXn^M?&T3*hc[aI$4)7R#b +1)RJF_E70d$^RZ=<5IcO[YmN^ri<b.BMMpf(R#Nljg-D<n[1`0_,RFpITKb]7Zbu:DU>A/Vm#?OM+d +:uHnp?/_X;M&5#OE6?M]&l]I46"d/utcuE/_R<TKmhk]WfG=(o"N+e;MNd%4`X<=Z\^,d5)no_?beu +pg:52q$9N@"nTY<//gj#"X\mR%/_CXit;V9d6a5s_Yc:/@:hl!R_^7-P$A[<OOD%>U-j0dZE*GN4>@ +-N%n!E``"Q';"@9s\G/LiZ_hri[.#JS3%M!#)6p+&ZUe7'!7DuQ,`6tbRq6i]H:T,6qXU(1[lqe!f8 +N88!OmH'SZp^ci]gM:K7>[0Q***CiN^\%g7FJ,$CgG$P?^?(D7Kd/>,\!2V;(%l'`\_7l1e\ST=gZ& +m7EK6LoP'9JDoT.r/&5euOG='trPbiFW8j\nd8e3.hFB):`Y*#V=LZ7;FN9&ZLqlfA(o<:(?Ah3pa- +;"mj(Uu)I`MYBa:S*@i.SoQ-T^UFN<F=D<//J6(WXILaHVOI]SOY)+iq6G`e8(:;?2M<A$gW38Bd4< ++PfTDP0$+VO?4F=fPuFhPt?Xracr48UmfE4S&rU=W8*+:ggj")\]Nm48?d`g327JA%[jgKTMUFKHFQ +Q2P0"E1]9K8:PcDm5X,628$tA'#b$Kbt&PC!Gb7Sd<*4!aEZcba`9*DWFA@@hXU!%PfXF.--S1Zj!L +;.uN8d^#>Uq'.j^WZhr[QJc$;NA(?_+[88bYY6-<5m('a0UH5b_4*8<67h0bE1Mh$adc/lSGCu+X+5 +91-h$rfp0Nd4\-:49Z5K+ACel&aN+519pF>UUtX)#gSSf>9uC\%OpXO^'L6')Vn(Z[$,"N=as%[8b# +jZ.I"I/>jMY:?\GC@SJo$btn/EO>RJB[[5^SmgBX^p[$!^_jHcN`cH6as%'#6`FaFg-7$3gU[:N2.( ++Fam,)$bE#ca44=&f;(:p9Z;FLlcM0pcY:SIt_ipciNl;.!p`Z@*h:oL_,$^=semSHO_>)ces8-n`c +)t$dd,pc_UiAOB59jLsYqV:o+h]Pm`Bg$D.1p_pnc6plQ(,btqfR8,LShN5g[i`^Zuh5u<^QEW1s&l +@eqFWIV$EE:V:ngPQs1Xl3J:F7W7jSf=%]L2hbKpjC0S'</gu$hEr83CQ5YMa>/k9KS:Y*5`'K*\tf +n#HR_0>:S+/]*Sp.LhKkGTc=;>K@Bc_e&<",Ea>6D6W>U,#c_\^OFa.3i<ZB_39'3FZ+;X#TZSC:&! +F(1oJ'&OZRI1k7j*oD'`JA@_'0m_<7/Fi#`b;5e5L3dZjemL"$A9t_,M88&0UZN]h6dO\H!X0_F%EO +ojLT$Jqid88%hHL0Q)g9?5nEPL@SOWOFDqtBZ+kkL%kc$Z=8R@I>WGff"FP/.Sg0!IFf(b]Lg'Ipcd +6o4uIlM%$5\bG_qT;A>Ps@#PED"1_p`\JeT2(;=L0K;oP-aj0>tIP@7TQU2O$+LY-qPLkCB5NHbrme +C;G[V'3)YZ:+rq-])@?,^"p7N7+705E%DY%TRrfUjq$r);#lIZKVXR-'JWe*!p#SK`'qg"RK9YO#9Q +gNTHOn'\*mWJ2cBT3$]7K#D>EP:q1$o*=mrni)(>e<\/`R2e(/+"9&*9Le$M;GanZh"-H.4mdp7'#9 +&jnQh&20%(eBaas>$j\cr*mSA<a_\]"W&6[-j'e/0baC>UYm+I)'dmU8Cgd3*/WQ"HitY?0YAq[JDf +(pdC_;->KRh/Bf.DHAfUqWVIRh="FWjn@MU^L1u'MNun<CRee,MtHn='d1;%nl\)P="Tc_Aoh+fk'& +t\ctIN)4XQLiVie^d)SKal?*DmsG$@,,f58"PDKf<uk4a:0hsbI5?!\0&`7f47OZl/kE@6HN@Q^e0= +0:*@G'dN/kBFVsn9B=e5:;fBkOa(B]!#2Eh=(,dIU>=;fBr<hBJA.8KsqEe5S+>-!PjdJ%0OEX9GI` +IODGpB_@VYP$,Ve*/ITH-bV\.jcNC-'\Zjd/riIj/72*WP9N;hHO_e;>`Y",A'1Pj#D&]i7P]7_aOm +@'/3[l%4K/"dUJ:b\;KSkH(k\Q!**!lZ@+32g2XXhR-bdB%GN3nd$bS(E(1!Gh4bqmTX96U"]&Yd6& +/M;]K[@VDdeN;(jbk4-FPO/64ckHola[pRp%7AMW9bg+:1NL5i/CTd,7k'4Hm7("gbr&5.<4t:fe.i +E];:LgF.8n\(m0b9e')LKaU!X5381q*g5\JV)c#m=DQ0j!,fG4pM@G$ktNFT/VP2BCu'_=+-V^HaSA +6P;$X_ZZ,c*_ECQL2A(g_UF=EM4.X05!'VJn&M"QYkQ&ZaWB^H/=mim'B]9^%Hfg(0"^`+Y(b7KiSI +rc%$s-IIdJ?Qf]<DiY[SjL#Q4;/W8X+c8A&MO^24qhFhGcNT?K[9p=ZV:0!S@R;><Hjk5Z*%--W=6A +c`X*bV&,NRi6DkSD`uL1V>6NMF/^^6$P%Es=\9BW,eUKBajsVUCP%C(bIM\mE(Rll-GRZ*O-oag:@R +:=RVG8e0S2Qhl0_\aGrimCVg+cLnm>S*[2d=1`cg_)FH9rPRVU^CeHTS8TFgndgc)\`Thro;s/slW_ +RV)NOlOE03pVaRl#V:"/bU:K>s<O]I^jFD-.fi:^iF2:hLBcZS(<SaV!ap`9gbg>1SB*TB#l664hU? +>lCte9uh?l/R1&:W]_FATPgED#Z!9qj/k$NMa..Ujr:0L6VCAlaN*cqVJ.3q8!"k,OA*rO6QWCTB\] +4TCWSBbt-2GK7<mB6fB8/(lAu_(dl4<g41kP$:.X8![+if=tj\$6.e;O+AsV?"<%i6=<<W]*%+>)8e +8ek>mna/-&)uTcbcMfD'>-#+]!Nn68PqX8Q7'^d0U2t_?gbse4GKiebqnGSJ0D85)Kq5)]Lc*?K'j/ +M^Y;M`AkOIirieL;3!CMpn\j<6%Y#khCXp.g5)M/BoZ'9(In2a*S0"8Nt&VQ`DeDh,DhYH##7Ig@R0 +IYgkh.k/k/Cb*@'9#G!g95fh"O[-&?Z+OqMY-8^u-#,k9lE&r':V<BhfH"K43+W5VBMG:BAAYu;:H= +\Dn7';IY8M6c2u8Z(T%jh/Es;\!81=cAq`*61nhJA'$XCGMc?d@+!/C/%j5*TQb^R>'p=&IGp(k60b +6;iYlVR0&'fd\<54_I!mVcT4f8^`dD[NMSYY4m0YLR5<uS:YGY^B)342Weu4fZKF,A2$"iaepl'#*C +K%E&Y`6"MA7TJ6)YbM5r:!B.;CA'kli6+<0!+sl.Th6KdEQpY*Mu>>taF5^8!"NKMre+:$KVWVc<)U +:RYm&BrsOs<=Si!W]5C+%7G&U,n3fFXY1=)RZOW_a:RU^!_FD+2c<MR`!-ec#]3filV*BWj:a*c4]& ++XXTm1!fj!coA#SX([lKWN>H=.qX[e,HOG`c./%KO8lJf>+>7G$-7>ZWHC;h;&cp@!a,VA]en(A<_? +g1,jZG[Npf\-:'M`$nl<]o,?8hcA5g0^fCb.<\(-r*]PGqYJk(<:0&@jUAdZYX+(7!#Npm@enGkI0< +6qa>hu_5+Uf0YgQ&_f"l='/\;]$oI^[ih[T+X@;uh&D>X&fEKc8dN[HjbDKn34m-##*me'TGBf\7># +H08[+]!M([idP[HV#m)9\\$Du+(ZYE7(<4"EdaiK:j5JA`B'nnB]?VSX^-"eqjDI?jdK/iZ!`?t6s, +O%&q.(kC#mV3-:HEJh]$N4%YS$&T5,0MiUi'U_X*Z12gQ`oW)kiEU/ZnchD$8(R\#1abB.A,d]2IV6 +I&"-X!b;^%PO_."sTQ1Dptb>e?jSkM+/n2<H]k*"``Cql<X7VU+MY;U"HD40u%F3;I[19A.ES`CQ2c +UQ(akI:2F(HSZMfq"=</H):77Z#Mr/Y6KOAU/?d?H5)_8nh:PV"D*`dn,TkYjES!1rc$7>)u9gh+9G +=!SgW*CqJtq+fgNknhF9G;sR_+XnB]EDL+:kgY?ulS>#d:H4sS#?&Z2!2TOKM4$ZPHH%`7*T%W0DBp +L?7T_;^F4^/Q.m9R-/bJ(_Sq2!ErG+DW0VR.Ll5_\%M_7S_[S_b=3H0Q(a]o;s87sj1p?<e;Z\#08b +>RuF*<ACs!k5%RenGI4j-c)KtRY?]UCSLeCS$s#YgkG3M.e;]@G_Re[)gR`eB.^\$$:6c.TS;\:3_2 +66+m*%SPOX*8KD5LqjH-j2[HqV'mHtnES:d='>\hTq103Rd-`1W2IU'GjDWlL+TQ.]F9"MI5lM5(9) +NMCF23Escjm.%1:;bZ[6Q5)MVm^d!]@KZjE&52/[<Eh!Jbu?_mp5CrGM`8c419Dr^#aV[?@$O;-\#) +:*?b-\*N&['*,bVWJaVRKafUtKiJS)f&AHKNr;gs.5(qg8^Id\="R"qq$cnSa2:30Dc1*umg-Yfum= +!$c3'N`pHDDAC8nY>;50Mc0>#jTH2p#.6\LmVee)_Di#(']"\.0d\=[#p?qd4:09M]nmI9FD$s+JW- +1o^5!8*TtZYP'Ek^D'LOj#c;AoD[Y7rVsfT9V2>QBP'*fWA;Rk0*"W2L*@Zgi[bQ-o)WeJ!O*PW05b +(^i'C%%^Z"&Jn/h`d2$7@7!\cU=&3O7&-:'=8/`GLf&3g=P<<[".p1-)^">kMpW&kL/0<_$1%n?ebF +U)l2#GN49KJ`sE#7(Fj#:T@/O80%-PmM"Z"jiYDkCX%."UL+-2/clG&>9Ic[0pr`+`LitYe^`%`=-_ +,0i4\TYgEn6eI?KMN)7h0Yi-'FE='a(#fKc!00W$)3da7Q#pV:WDI>W2S1]ki+Ya0P&8MbQ'bP$E$A +r6p.;mc,k]BRqn84mc&KFis*\APM%ac.-nN]e\+H8*3'INVgA5L:-:q[GnI\T6ab1.019bq__(9q[" +bJb$tD\mD=(U8AMO]N@hKc"fd(pT$(Z%En`Po4M($L+Z'-_ULX,nV=#)G9qS;4/@X[2X"Q'aI;EA*2 +(=YoAhHPAoAi&\T0he4['pEY6)N;8b&+cQ-nm)912JETfO3r'O>Ea+Xru&IucH5oo'D&@&;Zd@bie; +WV@H*msR&nf]2)%j(p.pVU2K`SS<;2'&b0^9T%0nj+NV6tJ,)23KY!dPS-:L?)6%g[Ro_YEL9maX0H +m+R2f(NRo:cN^qIiN7"jQOf5(]*253%>U:C=Z=,1;,p7o)/^*B-KB"%`1?$ZH.]/OWP-$5i5:QuM.F +0h@d\JZ3W@LCGM$s<21;5>\Yq7IO2j2`Kli&FhP:12h0Vo+]`B6_cG,PZQ)QXi/;NNQ[kk%\"1][A: +E"jh^=<N0D^;N&ld_\-/3cJ"A/Q+#>6@ur"\9VP90lNjN@L4\CJFKE</&K:R/cKep$?E3`P*/TK_SD +8m/Ma(&:($hN-Ya1_`^FihMU#0Z&d#>U0fA-O>LMB4"h?DRJMr7aA!-[km>3W0a#QPg+1$2G.5_/Mp +:N]p\7.QO6/EkcN\k;STHo%K".H\2gH*:O3eKd_dM*j=BODL@:kL&WLtp.l$SWdSWo<V&UImalLuj4 +u4C[bDKbZcRI6g4^3`Aj#F7;!n#&1'c5]\_<e0$?ll8+EkMPd,!$_ZpM<%&t)6Gk0;,:&rs;)WJ_0F +N.1K'u';,qrtJ1pfqFFCZL)p_42E"bT,"&==Dc'b,pciXeQUrSDsR5G=2VKDGk'NC7823;ee.-'Lp^ +&t"<c<@sP1jq+M&`b@<"7\93sI-,Q4IEuP%g'%tC7AEN<EnX5/R4=4ij##JT:(9OZe*<+Vr:4>jXN@ +LXq\0N'A$]>*(7S=,fkn3&mM?h-cKTJ`?1/JA($>=?^L-II*#9%kKu7?h(n=V[)3)['06m8?Q:Xr'f +-GKQ-&+pPT?2/:XONF_P1+.7qA@dR'r?uQWO[iaNYALR=.oBehP5A0hf&90*Z#?D`T(t6*1g4bREao +9qAgWD:T;n1FmhC%(>;EmUMH[[8fk%<jmte9*,alY]eo+Lr*Fl>cft-"IK(C]fC/P6s$,uU!s(Z+,R +X]>n3don5n@-gp8F$E8GK*d,SphAd#3_bXmgXEpSH6,0+gTl,YJe=nO-:j7<)jB(IdkI@i7aSe1ueH +nY=8I+jH6m+%Pl)K-<d+,`<m<njJZf8TJ@2-V<l]LCMBY_f7.uo#.jd960+*02(m>__Fi+,g.u;o0h +$tb&^L8.o!@'j#KkP<7s<-o>L5`:NPUnj$U+?6HQj?"T72taD?&&;+OZ4K@!/3&OTH<V(52:oYiU\; +fq+_'$f"tBh(inWc(F-/bMCF:$Hdn<)rUF@p)iTV/':9ou1uX=*#BP0\+:I:L5a*<***H[KVFt=a"A +GB3Fq^UM3nTV-9)8X9BGof>s+LA#35VY(p+M9dK_b#^qnI[]:FiKM_uC9R^5)Xm:=?pVl`P?[(W/Ip +_d>bi%7?:$@bp#p'5r7[J-iKe8Wq]7aQ/VCRR6o]?UA@sI,tO(7th3JY)r,#O=UWRaP"i\<&(P3#>3 +=HT48SjSuZq8RKHB6iWdT4e!%h34LTk(BFBqF6[FBmOB\VeQ!^U7UGWQE.'$qSokDCO5-TYA=">JZ< +NJ-Hi`3l5kkjD0Z=o0BT41fU?Vi2:3W9aDPOumYELc!uZqT?b(-'-O[h2r'qF>3a*U@PjMB2>f?1FE +R$6-grD4qF+!.4cZB$eQ,`GNjO)((*2HbZEr@@i&oHHKA(`_fT5-I\*?;uHWjh-gJSlFdq;3>7dU1t ++r[LFop>0GOkB[&^UZlU,K_sfmIENSYX8^g;i;.p._sr,(-d2+/qU_c3HMQ0u`d=_`i/%:18*[tihm +RV"Im<+kr$L$]5p#@6GNEE23sQK#8/q+On.:)`V8Pr0*"GS[62n]F0a:h"(5#G,%hNsKSKHN:JH]Wj +4P3,5+Xp-8l9q+.fKTdQPV\&Uef-u$E/<IE.>;>.'>2D0CJ1`_+].fa6qDA3@T6!WOZ"RToqq4&KN! +bj<\$U`YngftLku^]01GZP(h47iN00D^.epUnj&BfROg[22a:qJqOTU7k"Q.,,IiH_0FXo3;4\,;J> +bfMoOHLA5_@kT&j,)B=Or4;AZG.Y1FH_lN<_H#00d%`-Clq6m7`gke,`8ClPS09\'59X\j%QA9P-k* +OFU5k.%!,8kRE.nY%kJ)N\3U`ZE]]+`0P2$:R$/:q.ldfMc310j;JjjPBp)Sp+pa4I4q:83Yr64DgR +FCMD]eeL6tJr<R>o.Sbqf_e9$HKado;)sH+uISO_C8+c?g[:S6JL2q4@*jP>5$k3t9>d3j+I`9B%$G +Lhskq7tuK>qB5C(2%cR>,(WTi'0HbPmNGNYkKh!Y7gMfR+Ok)%dOHtDBiQ[[PdZoVo,1,[D(&9F$BP +gVBL/U@"f=^0SC7gqq'_Z.VY(.g.B3eRC.i,iMU@U:e>Yeb4]AAG<M.c%XP)kf2QL\<X=MH-P3M@:X +Hf(UenWT9BT6;8DLSgjWnrnS*GVaBeQZ*9luHmY?'g8N[NC?><9fU4U!h&8Vok<FCY@4AA0Q^Z]*^k +Tlbjn7UgMT^o4Dgd]r1RAcS?Ck9kXS8Zt/#'=kHu\X83Z((!b#7.m%E8."A#CIbS(REGfX@o<'KJfb +5;sJh@?e[,j4&VQ3a)DE7g+`;#eUo#Y`ch:&s%<pLoU&oqfZ)k`"am?Dr!H_<)@\S%XdOuosk0+HOH +QaFA,]A7jF%EUR'5ig`OI!/*3n0YTXiY5V\ENU>Q^mGo?@!iOc0F>G,a!1F)C`6'H/c6r^pmPVb(3) +#L$,`-S%q5)(.5+;WZ1^;d:k\Qa#_j$X#$L9&$r)O4P.AIibq<EED-h4^ELAdgVHSZ-K@0Y>a4TQ"A +:0L+EFqe6GjRJ#dg(sJ<^K=0'..:<Z'JlP)_cK=-/taaPn(61D_OW0=WFi<F&m)$L`[q5*4Z9['D9M +7Pe?*/gR_H3GcNjF4_OFtS*!smc>TI=S;d9:):HCIf`s-rOT+fmD2s-7^tB4r"Bo`L't&@#':h7)>- +mbD1CG4j$aOe#l)OtJHA$p'pQT=N:9N(-iXT]YnTW(RP:\%ki4H[JXUCN2XEEsflb`UuL`X\u'_Z:? +Juo#FH5"K?)dO:S7dgV>m83s/[h%C\V)Anhd&LS'&3PiIo8^mr`uf;fD9JZ5k3pB,4r2]]SoQWp1*3 +EI7)q\1X,#,@SYmQ7&7+Mud\7mK1t%o>?4pN+are%OT3)m.,//9s<8!b^ZuC2AE4FW0j91fV0CD?*R +^XS=`J,QHEUULL-KcZ8k2,NjMouK0))WD\QL>O"b#O3E0'"gDPHK.8/R>P"S6q=Oc9'MOP/HNI:<$U +chn)au[Z'7=X*+EXfQ&o;lpk6l:0r>IGL'jfS[Y`pmbm_!-ZM0FS=OhimFqH4p$06Wo5cP^MXa-:jM +[[\-<gS[m7EQcSd^b3"`\R$[Uc/BON239$03NEh&u])JpBZte9he%oU_AMpG1(YPsh/lQP?<A"Y8ZV +#s.S;noEL>V)`Ro3qV;&6YLstn7'_B/Dd@&qTHZIHRH&Q=#j3+6_!KBIH(*6hqi`-3RBt1gPUJo_0D +\_kDT>m8KNE0H")WmRHNKn5H58-Di+3QQh13?a7u*`qEhp/]1kM*g:oqU5KNDtliB>P"$esO5Y6mK\ +C85AK>6'F42D^tn@:_kIm@u=5U6Lug^ZU7.R,0\^MsXi]>l;j_SGdX#h'/F0^:o6'Z#*E^luRLYl(V +e4@*Kp6-9U#r#J)i*t.]Y47jF%`#B$L*'sH]6:<+d=bf&TGd3(D5@ENf&EH+WU;DR16Hh#Jg`JjD6G +_Tm^qq6*e0)Eb/jhZN#<W8Z6oI)R0-hes$cFb.9Hf@"19<;j_ot82fc!.-4rX>`%[95rr'Ee&6Ql:C +6ogi,8CPLf77;Do2DdrmR]45I8f7b)%"(ae]1=$:B8=]+71<#0OI!Wo)oNSg6Emr:=\c&7;*0Z-^@Y +LGRa4?gKqiHYM-.F.H"KM+>"/?s7LW]>oNMS8<Z`#\LjV:@,[V<dB#Y\-_i/7uR@GeGB?$VW`A#"m_ +p?4SZ9iNL7c[W8H<@L%P=E3$7ne%;,\4,I3lbAK7Q@D$nrH:/H*@'cM<oH,KRQGXIn0Ee$rhKqo@^k +ajf-tH0Pl0Y%#.;f-pjXp7auiV"B5YKL^X+O*K5!ZF4/$lN_&uBaBC,c)pl;sismo,*(5-F"I;VqQU +EZm,.s'T@$No\PT[o0aaBXNgDNJF3AX'p+O#ee%&-?FUHloa7r4rjgm#rdVb2?8.]f"qFJVTd`CasI +4Z&d'b$c!KXc5`.M\K%q</De\Y!oj`\`C#U/>9"9!'DLG4cH%,1pjSKP*Qd-7c^]rr3+<!^Df#/N)Z +='Ht%m.32bhKSl/>kAA3s!_3/"O9LuKFOu1C!^Wa@7&<tD9r4o8P_FuMuMGu:R=JO*HNYU'bPPYY>m +*3dkf-7$-`)MYiPH?.4\qkFL5&f?%nd,[$[`(qHc$\JF*9'^A_T_>TWoKmLd9shi]ZS$S9U+R4SE`k +NlQdb:9sj"PaIBK"kTo6PMra+t\o#QZdk';Gb)GtL</QNkY_r@d^T+!Nd(dn`g)!C<#^fVWr;'27rt +5b,chqtq,c](5L<YY\:KXmK6$J2*V9fq_1JI>cN!%E5#7H4f'Pr9G;MMQ4#7A-O;$k*2R7^<6r(Zs; +d6Qej:nc%5"OH?k;.,kjODu4YIKY'2;9^+*]-0rEa\h]*;)0KH!c\P1H++5'dRf?nAL/f`*mGuXWR> +W]+G_eGGg]#/d`j@@>]2#14?VFQdbQWV*AUPBY>T`4dks!]>rGVu2Uaul;ft*!SN8b'(D9^`;3B1#f +UtkcS'QJr:WUK!RaY!4Mc:7?"R)&%]fOY[7iGAW3*_'.]a<$7?)9[l$N3ZA7#?c!B@O%ReI>AIeOYj +_3$7Na:=Amd^ueVO@gX-aL36JG)1Y_-[B7\8Q5G'B'6M_HWR#7F<!-[\0WA"0WP=$UbF"+9o6456CK +<jabYXe38Oc`j>h4F[e+!@_[9?VuD\U/gRGDh<m/g,%K+#q,XFRrTYlD"lqc9HiR7Q?k[1Y>CDnhQW +Vj.\B\PCbuS6,30eZahU/T]LUT@[>3f50R"SCQ+@5M)9Q5N#?t,SggoK=BeN\7@K<%u<V_;)k@P,57 +!b@o9bsG!-q/87YUY,aM.PPY,Lb\R`-S0:5FF;`NgOBfDPV,86L+p3f/u:hWfgEW1ebR*Oq1\n*dj: +T.6-;q:hAX]MT)CK7t-G$=d%^T5pHHhK<dZ<Cp@W25s5Dn'%i;(8oum<?3LB=@-VpAKKV?uT41-5R, +H`+!^g]Oj)CO2tjP=ZiK\q3B/j/6SM(%`+^_BQRE@-C7H)e7s,0]=$4VB\#I,gE!0BKsTNOG?_cCpO +0g7E-PN'*X=XC]]])1^1TBq=s(*1bkIZ4PqKL9iDJFLO's9Vhu#BVj;Y98WkghRAcIg.g#pF<G^f)\ +^DZpc5&eiLJ%GQQ:[14,4pWsqMkNT9^jMqq3X#&J&:tGuTP*i?#pV)C0RpiOUUpaXY>P</]J/[rK1+ +&75nG4p91&_+0n\865cM\(K9']i>_kiTCc7<nk\P#7TWeJ_S]Jn:k9Qhl3^Ro0ai&X_a=K_p*i"mf# +qR:+dMXASZL]o?7qd"!JkYBEAqJ9@I)(?WOZF^8UQ^!?1;5J0q`@S$q-K92n_u&aUpM=;6V=]5+%%5 +A\fj*XoQ!Yt,da:;9-^Ua0Sr3DKf5%AkljD7bpZjiJQ1q$n>OZh]_[Ub219$Z,kT&bMH"9^EfS[`72 +V.gkm`6+=E!kEL!D)d^=PGf&e?G9W-QsXfeP$P0;D.>lKKS&E[[KUer"kGUULt9KKuC0r,3]T2/\1- +(J68cUirb@GGW@I>@XfJ"X&lI2`b5j?]*CPd9oKCn=\_21Q=7@d=o5a2].u4Kqk#/jHe]fp+W,tWD5 +:OA%4-cPN<*jLC.TDCe]7/q(>j3SmhI#IHG4G$(U1;?9Y"E)=''mkOZ;#OJ9ed^jE)aWg[n"M[#8uk +"8sWLGp(h-**`-hK5f5\eS>C:7<X[X_^[s\@ZP28i)p44'H3_,'^C@ZQd"JBs@!Zmesoi*"N4hn=2- +@_snW,nA/r\QP7E9*-QtU145YI54[(_*/eglV`iAu*=kTdoURX0e+F_W<4MP$`pM=M#ko.fZFf6ngE +N2<C#/NSmsX*g*Y3t`pms-uj7s'5GMRO-pLiWmIDu$H,$noUlh_aH-,"Y3n%J1m5.AAuUc`"`npLn< +br8-a^>&:Z]Zkf762u`-qtiR,n\]Lahu$:-HiJQ@p&REV#j,MO#qcc4WYIJW!f>+`<R=&>6!,]Bi5? +LV:hgJ+fK<,@,ThCF1(ciNI0g0q&gn5S',#Oh6f-lUL/?*O_T6F#iP[a378:lk\:"nGX>YkH%O+;CN +=k/<8Vp:qjhIa^'B4YXL+u.I79HZ,il"uX;/S!TdqobmoO3\Pc7-ambo,F2!K@\o2Fc/>%nW:1+d'j +"a$L@YLcfp8Xu+0b-s7I`.3">dh>'/^#$Re\%X1d#VFUsE]Z>2@+L3=.Od'8Mj)g]Q;Jo6$ff^_*7# +WG_LkA;d$RplWW'[alnJK?s7cG"9Q/pd<]GY<bV/13-o#-8U;AgsVW@!ql/egnaNA9Q`adH'[Ak^bO +<9=8i,kFK?9#FX_iMfbF"NFe1q6jA$b]T7k\<BW)_MX0q`L52XG#$`H459CjJrkYt8?u;D'q>f)jO- +OAi\Nd>[$3,*b'B:q^4olTp7;sNL/?SDiMGWHNKZg6;*r;d#rLpCZ3COK3]Kdr!F);F(6P$JBgsM9. +A^"HQ;ZFAk\/JiUp'W_Q+BgR>U:IA1dm^0U:t)NX8Ad$L3V/CN([mV'WC[WVG?so1+BjNOKjgn<7_F +@C:.3F7^AE3]"M20-!I6#iblaS]3#s<4KT@$[T:jM;(Hd/Y#&T4adVMnX"7SYp!&*>Wqg#g"bEmR!k +8o4pL)i8!jMq2`?mo-;FhgW+L?I*aDr4`Lj]V&Me,Xcq/k?522AG[Nm_*89khhB;1,gH);&.q=Y4VA +Z:#>J+CenuA=4gQ9\bn;1<!PdIDNEp%cU_tN7#d2^prh/f\Ed1F%J6q+El]U)U#'Em"#5IA.$^',"Z +_@FlBu7Nq-LWs)uMLRO&\Lo+J[b:N(M4ZNaJ(?JFjqn%ne6,kC<Z]DVse;'rsZHLB\]21X<'*]J<[" +(9n)KCFU-_H9Phi"A\7'<W#rQsc4g_FK)L<XclJNtPH_/W"I58?)B^(/lIJ?;(7e]!H!;((q`LLrfA +2(q1PrfWU(8p-CW>T-7`I[>9cI;7cL8PU*o$POaH*b#qLi079gck?^]i#AW'-J`E'%`aR(oNr3A!=- +gq9@(j%nJQZYjRI_SCWd2WGB3ahpk&f.pH/OKJ>aGY8-@@9;mm1Vm%AED`M5%=Mh<5h%T;&3Cd7"F0 +Bg"&EoYtFce/M)Om+motKDX.ZG>`0]9r[a0N7A@"5ND,WWqD+OelpC'CL'n2FagbRg:&-hQ]nV\f"p +!C%#nNoAX]@]UM*jT]@k'OSBJTJ17LW[k/hrrLirBd></HqNJY.=#3!LG!/g+KdCGhQbUIj;[9Y!p] +.t-"chjZ9fQ#fP2\u5H>OQOj#a)Y7]lDj<s*>B-i)r!YMr=C-GnPQ5;"qEnhjdK"EE6;L[2,:lf?/U +5^-0O4#9i/)[t22@9??l%,NW16Q?(hfbKVsnGeD4]nt':7q8YAU0cu?X5'qX]Z'_enlY.5#L@I6f9% +q4t'm"8:e,"hs^HBrAog0n=$kC96r$97(Vdn=&Inh7>0<',$c.Vt_0'^t?[?1Bl?omhSlin]E]"[>? +q[rDerMRARg9ZaMnHRtO"Q/UM"T(`5TAt\2N$6`thFdN4+T3t1H!`/bh)B90S[Zf^gUk;u:*4?/m)* +)c+m48DWV'T!Sp@I4k<37\oAlOjOtTRG4X#OOhT+K"g^VTO=2=ROgMU,S$qWVr.IpQ<T_NdT:8gRCj +%4a=&Ik`2RfC;&?Z5?o+(6i%l#uQ=1\'k!HeiWQ,2m((f25>p5PJgZr'/O(5]:H:@cuVlJ*["c$gde +l2Kt5/_XH!bm;=2QhYo2*!H8l<a?8r')CB8gq(LCrYTe0C+F%fQ<6q<@n3$m=NrDP%p!>sm6AYYto) +ttD"G]V,cj'_N@+K:""t`UTE'3&t:a",%#)-[pB0ujLGmGnS"A,-iK"D):;$/:ABe(t@_A<MMK&!T" +$&iX,Ls68.Y+SRnl&E?$&?r:>MC%Uiq/D#rYg!U:;[4NS]5ZEGYL<sM#as%e^&gG'cGkC=k,!!:,RM +^)&H*.0!%Uk5cEPePOP:6UOU][t&S[XD,''#(lon88][6@[&1\;H0bZ9!'4SKSAd5Th3$iOP.rQ.:0 +hiAP;&(S7p>S4JYuL6<&J/qh(3+%(Z#(9:IhdUH(C=dk0mOT*JJ^+pat\#UEK(h*OVom<c]MKNELe! +;Tc,Y^)JB'fZ)JZ3Ye4qhNUNa.n?EpBFU8?*$mX.-U&PePXSS]S%#U8ncsIT(D&]E^"/CPiM+[QA[Z +o1A)^j#K;>@!X*&E]aL/AFo;?hph.[prE&gLA`d>B/gr+!luB.g^p&cX'>b.Q.E,7(b$,;UJ+9d$<[ +,RAfA,!@)]`?E@10M7(4Ot.c?@4!C6*"5so_b*cOV]h1$'QRb4Z@++a]d(]n,_JB0d=irGJLN&d-rQ +<ZW1bYu7js!O.+*Yr&tK]!,4.-E.d48\o!g"t=!i\;*sa>V7W@XUXC%-e";9.W;P>W3i,j"s/grXj# +@T*;P:gn?(@ps_Z1fnm!/T(r0JKU@-[.5AO"bV\0'-!uEtg&8pG).1,n65PB#6),6q[_26.,<JEnZ$ +U(b\OI/&KAdW$O7Z?C5S!+/.P,L"M+^P[NP"-Y'SUb!.FD;`+dE,@n08Jh].CfIFtc.q6+F&g/jE^d +:?$8VSo].7f.^IlP:hX\W1`ZMmU.6;.L><APmI19r1)DQhN(3KZoVdElV^S4mZ-rX1b2"2[b%`$pUM +3oZnkK(PAs)JrD$,Do>MWHdAS(.pCH-kj<Y,<cY(@lHheT5rOIj03K#gH_T+M%h6C6<$H!;DViKQ0O +/\oEP1:7(+OD5&6iRVK/S5UbBV=3.g"^PU_6Z*1-jP5/h-iPRqK/rkGM\`'_,'C?n:)K0ZeW-jM;3V +uoJ@%#'m%,=P4C<*pi1BO`5'(?.:mA,%:"g:&>fGg-N@KBj[ZKI-7S+c?_!DE<X>2"*8m/<j$VF;-P +ghD>qj1.k.\F+>O10Ij418-5r_/:gO&\Jp/%:]fREmdj/[k-9#L&OK,\Mn^u]>>["o8JNA''dR%hjY +:\6JFV/Ge=n\Hi\Z`Q4Kq_u<@\jfpIo^*<G8F/PLWZb2YLj<>([n_U@?9(1KG65=*8diV@5"uD's&> +<bnI2VSuUEf2pLerf_>)@jtA/'iSg,>#h+s[B.[H?!?oOk7n8Z't[[M_-Ak9<V<\'@^B/f;d8IF>uf ++5$bK,Ug6hQ+L_ZlZ[HdpM3E)!27^:1)o?K+6s&UC#:*Mb-iQ`Yn).#39@;!>\#ObrY.bTq,Wp3qhK +(WTi,@V<Q,\ETUQ9AaNj'g!q@nnC\;!VSJ?"3s+AP!psCXHY#6"VjV?=l+R1IWjWmpKU=>*aGH#u>3 +U;eQJ=B1IA^L/QaU80RNj',H`]('5c?Y]@SX!;9s_Q<@t(2,A(diPMJ([_6I61Md<4A4'>E'ZCs?i$ +T;C=U&#E(>Wj$i$NWSEjin9(;FZDnPQa[He-7q2U!Jt<<'DT-MH"6!SM=uj)I!l-ro^RopTt\Q6hih +EH`jP[k,188IZEW?^ChGG;"%36$,%R2chdDpGQ.J3mY9*F_.X'eLu'%4_W8lEUSNY02i5pA5=r4U_D +02QZCcfM,W#7G^"s$QMVEk:M=]H]6B8kQX2Y(@g*5NE-I4d\#eIgRh[lF+BPkuf9lL+j*DoUH?ZQ?\ +'24f$%2)d-^Oj-pXO]diHk5kIOonq2a)VVnTB'=Ik&3_GPK,nm<)JpJ2dIWpNK(=h05V;GO3@m-\$] +)<IKLJGBYDK!k!3;PoVaU3LC>-Wq\3UWIr6qQS"VP@[DGMj+RcXJ:f3q<JiIeJVA_*H2'g_\87j`81 +#0IPW3T$MslBf,DF!-J\kWG-JaEDH\jJJEN8&U(]T+)Q&7PtMJ7p)N<P)^Xc#0HMe`9AfXS-[Z&ACr +N--jS_j?5io8!qAK;\*mNMD*B)3'A>*g=g[LN7Fr^2$$LN&\q?Z)NFD]oSN3/,5WUfKu*;9ouTZp<; +7l)&84c+NaF$%/Bo0mW4<509Tr]OQ.>>3AkEU[lo=66!5DER,+"4@uV,f,'bjkpmIBKEIo':Q?d21Y +2*;o:R/J-H!,?XYISV_I2\JIP,?9e,.X)/N9rWIpj$G=.q+!$OWKl8-!$Ki2f*FNVDjpK.XA(_ft>% +a:RN*7DD2JD\C=AH/"AsGSEThdfuKZZi6RhASg2(AU,ed&BS-'BiC:eY!`bGPke]=`>hN*.(5-fijK +4h]RA39([>8`]nt8#S9&e<bieLjNZ_,*B^9027G9Sb&5C8hHTK5V7!u$mg",D/f3VlRCcu<s7J0>U* +Z,70M@O5&R^bQ6S-+I8>11-igJA0_pR+bMeRTc8n?Df87*YCW6UB@Cq8Y?G#&!A;r@r&"=K<$<o"H, +.2K%laW<Hic.NePl^Je+P.7:.E$H3J#b>2-03,H,nE+:\)C%LE;k6/`BB<%]$tLI:&5(mIcE'oPN@& +D-P[Ii4;4hf3>bIRtiL8`^SQ<3B@UQV6HS)3iE\24I>'':IA<Gs.cqkS+pM%Z*WL;<\d`<A'\6Mo]V +Yp[!2r;2&"beXG#P=\tAbV)AWKMO.k;=erK_-*"F*5ML&l)jS_5Fh:rJ'M!T6q0eK3lSUct%gds-@I +Y2)<\G>Ma(+ZOg_NC/Q-3b1)4]8qmqeb0iq84iM`IVgB;7MD`i?R"ekidE?&V]p'ADKN)K"'oH+i*R +j]B/$%W/bTkW#*(="fudkB$J?*g\bge!9/A1#BBX\_Z^ur#Qpr4,('3q>DA,=0L<EpNul]+.(=<p%r +t.hga8Hq>L=Xn,i$)^b@#A"$l?D'*U[@A/bb>n:W"m6>rXj$:=7#1CZ]jinFLOYlmE+6uaJF'1D$\b +7mB\WRdTNZ!rIBTPhVn)PQTK@iZc?qnX/Bn[eMV,#GXj,=q?0Ef%b+<1&KL;>c$!8gndhM8uP_L5<p +V7(Y*Fo)urc9QMCf/53,j['n/A7,'0';c>J$:",p("\Qm)cBHO0g0#dJo:526:imuk6W!DD'1F]UdO +QV@BuKeJc'3mn+1QEV/O7akjZ;R##sB2idjZS6MpL[b4]PL)AQr59on?mY<ct6S>:J)X'1u<uja1?9 +p'$(W=EZ!K@p&FnP8$r=<L[W(p4]8U>'?aCCKgGNZY`oaQ'lMopBAHS>^%L;F'S36WH;EiA_VE7pO[ +fuhD_:sHX?Hac["D,jnjO7p]^hO@!F"+K4+IAh0n6AAfHM6pkC#M44m^E?,q(#*K&ipm2iI,:'NV-i +ot<mKB(NX8;,J&3\QaQe@I/0+k_a6P9AOFm@0cZb$CU4\XF%k+8L@GUM0KnPGLOTgteF`DgmS4k\^T +nT'B@bI_TXA7P^WPb\")tCf,LaY%enFe$X%>B%o7\o-U*=4F88^W]0g,F1U(/deg\]Rf\#RZ!5rh_P +XkQ:VZ=FB,em2r.cN=Ec9h>K^Sc91X0ugk<%"2r<G^;4F<DbdrbOY;q6#=B3Wu1rIXppp-#<hgNNP4 +'m3\AY7cJ3[D+:qBRDlViFl?!/`.`*$W!?<hJ*qiTq4?@h5C7a,O2ntO*$.qZ>/ptTdsc]KcFd2naZ +?<BA<0/p2;[!HjJi3g!ModGI`0f$:!dF'F=W'OdCK6<0fcB\k6?B$6F.0pd"Tt"CRH->nAT"^Vq2kQ +4s'Q:[FO`[T6+1.I_r-mLkj'7Xa4r&V7q?'q$7L4CN%?L60t*6Z[MA+iHHtNu3dAFeCsgW1SjM(*c4 +lOV16e(l;*J-Pm$U]0Z?jMNLpi7<l'Q8;'Zp;0FT+BVN*_S6q50mLD]b*stOiC*Wtk1Q_ocnI*7s0P +th_&QiBO#qS+rdI;k1iY<RNe&ii^#_Y`[/BAiB1Eb&WJ&cR7)^E9cD6_I3a!)HH#XihZJolp+GgRpN +'Ve&/34M(K.-;b"E0!HM<#Xc`,Ru**7g-,$4o&qI<:$`.njn^1aM@$$iK9CD4I8\2%Q!5=Um[E)B/8 +_C@jV3uPf^&,Wfo"gbI#>A1;r]UEZ6tDAE"bROG-G='06cug2iH1654+MdV!!KR%t@;8.nlXVf^=YP +OuVbWAI6qR<Fbup.eED+#M'7eL4B:XN>2g>pq.+RtU'0:U?BSL\l^b-RMD\)C%de'dGb<gkX;[2*FX +`'r6O9P88GP@]1;!.5\!";Y"`qO*):da.A#a8qBfR'gjcViTD7#Ch>,-6n!0pO4&dU9WDNZW?iad'2 +!@nC#e8;'`P)^qS6D%c!d]7\qunj'f9TDn=g'.J<r=C=_j:DY(e:*f37\/C8tF>FY*161/V'3Fa:3W +(;j6pI9l2.MfP*MjB!i/H7T(EYXNHM=N`Bkm(#Qb"<t$PRm9@lIA&*TXPMJ@Rq[l<(MX^bR+aC77n? +N"CBb+0L\On/m%'r]QM03:93lJY'p19fCnTQN0j*.0asYdE,L7!r:'LTe\5u_s*P7_">Hs6qpKm;&/ +"Ln+e]:Z`K^i?6O*V,giCA)WJ__iUGd!D(>BR=FgFMN;Dq4a"QhLGdq]:@XNW?k^(B\&m&V=t#NjiY +*!T:U6KQ*4j_M?:/@,*8eE7PuGR!#?8r&ojU(*gbbQP3hU;2T?o/&dmb(Lm;6CC'UhIMSt$'q<`ijJ +-e2%2*lk+t\To%$N"PIV9<ps,Dk8W&3">)AEUJ:/U)+a5tJh@skM61):&61a;L%P$`PAQ<ReeGa`16 +@q(9iBUgBZRiX]A>V7`]c84/@Adn4$F4F_Eq:6hQr:Wa(&l3WfR$m*R?_<0-Lq?'Y5S8t;A$f*9dNk +_ZBJP@<1_-#(RWhPAouE,9#,B\:QW%XI:pMl(WR[HH=).\BXEBXneU#Jjdu?1Ljoa#$6i0>.N%l>H: +6-hAFJL?/J$B?]LY0R_`4iilNZqVfD^oTh\=G<L+>,ukM&0cldT6)'i8.4t9Y=>eI[6.\I35Elk1!m +]=q*m=gsPJ?2^GN"OhF!9V`S?)FL^1N#liJQ2^KLhaTIb<#9]pF/g9q@_]FC/gEp94QJK<<cY!D[]M +tJB_EUns<@As1X,PY:#&;;i*\!VL`hNXDY%_?[hrINq:JsNNV]f1'#qW6Be&smd0.A?MjOSA7P/p0Q +4i_R_U8i*e9DPP5hkg%ED7'47q(X7s'\eon4u0;5Ii78,WPcqALiBe;>j>nX[]p`nf@>pU+rupOohq +kTqnesXSKUn,"">l9a&bR_ajkWG$/WhOrR-,,jX:'>D\RTa9&<(1(r$cQ4EDEC5$6drY6LUm\PpqRi +</e6Z9S4m[e5mn;)6QOk5B5)p4mi0+%u"gIFl))4j][E?[;-i&``?%_r:NCOn),r^*^Ssja@*%fFWg +8qEIu!j`A90^:2koLSO3ahnf(fDg!m#;t5<dd=)$jla&g>p)d)cA,eLVrh%^&ru^Y->n=D'T4k)WM$ +(G;XYL4F5TpV$q"?m%"L<"\]ul>GC2Slm"@(BC5cWq,'A4rd(qsD>1h6Fp/.[]_cS1R,OD8)OKFj<Z +$UJ#56"p<a:rkoCV8)T0&8Vk/M"j7T#f.qo5rb/r8;TY9(IB"[_4i0iF<V9L!CBD]#co7;A10d'.1[ +Bn_O1/7j7L3i.mi#D6L32he1Wf:0SoW\6Q@mL4>]E!2(V-"6X2Q;HoOKP3?!Pl6_$5*]KAR*4[[l86 +fA)6X&).#>r%j^_H?KHR(:.#K>^^q5VRp\@l2,DB=O/EZ9/*qgM!]nM2h.#NeAQ('9*8C8du[7W]5k +K$iWNc<AVia,#gi<*)DG+)iBSWMKDscKGb+!C6'>T$p5@ST^bHcL5A#tMCQ]A"CK,QAO[)>MI]r&U9 +_a_i'qs``MfZRZtC1k@Ys__VYKmT8B*u@_8[%ZUHECN*+Oh!E(4Ye0:Yn/UFN-OEYa$J$`nZpC6q?@ +h*gUW8*k^:UiVPi?D400(0!&H,_O/4R)`=H`tX4uI#'s+J>J^?81A)j8>/SmLl#Ak$oE`1gRCb;O\$ +OU8M$&s4HrE2Pt>5H8Sj_bI$dKaR3L+*XTW>T"HUIM8/DZ06nr#gG_F31,/f^FNSL3V9N$[WM3$_g_ +PC#MS>]&<g.8JK`U'(Y,H8hqKrP!1N(g?&Lm?$uqb!Qp8sHYA_bJ5%Z^>j?'_JFB%'5>nXuJgo9*mN +"C4f/a]h(&XbM9ik$q5u"[7gG79Ij.:`5>8"YKT\[9Ph`c/At50[EMmt8USU=lqE6-2S4'U_@-\W[) +%f>UT04t0SF_74J3NZc&$PVVMs'1d#,Rp84U>8c)LMr4O]/a0he7)ail94o+as0'$=@$c-2i^>=D9I +fKBr':2K)!bcsnsT$>uh4m_)]9]6R/iYQ_$#X%IJ/EDo`"\sI9(UVml/G)_3ohSfPbma;AI/$Krq+m +DGcZK"Z]_jH7h_531$]Lh'ZQMcdZn/S[M3I*mi0I).Mp3,K:\qXom*E(V"UN'M3EV]rE[WG0hotAq8 +pWeJ.#5<o@u.@:cKtJV3=JOE.\QY0$)IR>&P9(_G0s2=97,u"fbuJ6RF.cX/>11to;N$mEREk^;CML +k_-t[B]M]l+7SN9-9<$<e*/_,jc;?sW@Ob6]lI&*I$,dZY^n)]#Ys%lJXK'$5*@"KVQ-d>R;e7g.AF +l(RI@D@/#/)tE]f[*:0Ft9Ke&fh^OZ%oA5?ΞnYAUSO:mUa4(,FL[@B,;91`A1!o7_bfHL&BUdIi +Xjkchck)[Gj\A`+:C0+/d55RaN,D'93/B%X:oQCjFVkCi=u#D;$>e=Noid<-#>et]:uKdP];JL+KuE +>M:gdTTO<)i)AQDoi<1>b'[7&I6",aFDeqf%2W1q^bc;Lm%]0.nTb=J7i\;9fj3mbH>.TSS)b?$s;[ +(,GR;m$F?Dl!VL=/n)T5e:"V;cdHteptrp^o5lcVcXX9&8ch@aGd?>DUEEaf,Wus-$,+U+'2S6f5R! +8*!hC'Dc`c^,/&A+m>tH[OYqP>fc?8Z4d9)DQ!#Dufkm'YI@(DU$&jjO$^G$4op^f?>eROBOM+JXAY +#H?n(IL*eQD7mW4:AsJ\k]e%'\\/^o/iu?Wi8T=?1NVr'ZLWX$GJ+PIWBuZ$'4-cV'cLOEFJ.b0-N= +YR@E@Y*H"kHNi-@.pC>8>2"%ZD7,FA]U(dd*::$C>t,7AZ\cZ.M*8Q*ZM02U^>"@]>]%LlNMR%(]*M +]1N)`PVIEYs@bt`,=d9t.%Pdt&Td9Rd@>q+=ZlSFL5cpae[.Kn/Q0]q0#b1[6K#h9!5LoSeb^g2T.< +K^EeRP_sH$="Ic?3Pf&MCi"Hr]kR&\9&Gt8;>gBf#-4?>R8>Md'h]r.&OeK3"VS8=I<?!Cp;a5N9)W +>7ImN)e2*mdR/Q:,H%t1W&4Z/fhVE-Or<cm+bMNl*?G`.<8ts^rOPg2Q?WmFm;HR:X@7:X^?rFOC-. +9a!b)edni-#J=)9(I@$fKfa$#T/B:(Q:F&M\/3i>rXi6CVBhoAN^`_M-\LSYQSBfa;m<7.jLn:$"%" +)3$NjMDBh?j]9b"6</^gTZf_K9;IB@#ReoA&&fRK3.bSp_-Rarg$"&VU^(=g(?3uAcA9&=nQ&n_$fY +?oirH^Kj0Mi^r!`q$<tLh-0m(&[EsX0L$]@J9#aM7JiaV%6.NU5NSiW,00bC3;.gA8kNR-W`k2,$aj +)CGsJHY$NaKGrQj>a:%]/MKLeDoslAF5N=dMcAI*FQ$GAM-nm3EK_DdG7(oiN?-kITU0?0',sXARPj +UG$-CD*/[c(i+ddK0ZN+8K]7\4js)%J>nsXgl"2]PAmg8Q"pAO<CZ]T\AYAeWBl`>ITOu^Wh78:mL1 +gqETB5cOk:!n%/LVsV>%:!QfWIrU[WdQtCBu^bB<HL0r]qGd92Ja%A\i)n-%Cbp%;.SN6Y4e\;-E'i +T]at(kI("sIKPINLM2]m%H_aCk"-<ML1ZTIS;r+.Z^5>HJs-sIBc<:n"+C1OJjEekGJ"t3$\h#Wd.i +8`,nl/)@aTG=Ai1Nf7q9sB"GT>iP"B34GsnN0/!`h>deSR9AM]cLB%)%Dk&ibW:M8/Q"U9ZJU/>URH +:90G9;YX%O6UjWV,OBoC=RXLB!kjG=)6;EI=B.FZ<;"pHUXg^CURGaf)(0@j`A"=DV'6Sk4O)87k,> +1"m5i9_I7E9Hq#IuMoJGl38B6Y-'QJ_EnPi[B/Q1(B62c&%R)H@K4*]^q];1VW.I?Fn(I-7/Y]*ait +*WY\h1.`mjPe\rf]Wcg-mu+5");g(>X"UHs!!_)8M/Nq;$M<A#U4/8bu:Y<)7oXmDAbj57E1b"5-+h +'(0R7f/<0<]en&rMK/*@rHg3q!<Bo3*!l\^a8>Fd]W8+LMndD=]!=Ju>TU&^ksR0&5jIDD%E$99q%( +"IlTY]o;*5:$-Z>M/P=:<*.de`_MMi:PZ(cpb71n=#*ll\+JKW$3)]9Y?Y\N>H,-f"E#cr#D;'me)b +"X?00slcWb;(>1/[A813@IPL)]:@X'#I3j,?$of.3]CFLGpUp@_XoNZNSB4cVrWp50q^UGr6b/2#s= +HLhsY`c3T*n6IF)t&r+]]I47e:e@I_1U%E(e3['Yd0i6A"*D'/YeNHc/U_O&5-E$Kq>?J3gj^hWHe\ +$Z>-PR;8?J!a+JRI,2*Jn7Xb#MSSVKC7%?!13SgKIbrSZ-A,(347u>1VN?DP4B.%:l/uA\="-Lh3Bk +dV'Z/&R?e2_,%N)D6SXuG:i<eh!5^@I'fis%\VZ,4iE(]llFf4?oLD,JYQ=N'j+gV<Sr9Q=:<T,g,N +g`L`lK@NImj*4(3meD72lkAQ`>BQEti0>`e"T2GH>@kiQ9Q@_%MDYNBR(-_@(.8umW?frbUIk363(g +#u&"R`&oc)X!X'#QB^\lWW/UY3X</ZG()-qBqo>RRG8si!V_mZ>I`Bbb&W3IZh$R.,N=&k_Sr^P\th +#kuTZFl3kA-],U.=E'.JF`i0e>*Q[eVT..p`>=SA1F%M]A!qRDh6.#70*-]'fSNg!$oj(`3]Ch_@=4 +9F*G@B5!h7msbg)ZN&hY5k+JREYm%u?#8O;E]3q-C`@^2VDm0f=%<[V+a$^8gSbmG>_)`,6ua%CW7N +%,Te;W4_Zk=ar1Koc`49H1!5rap-X6IQB:1cl\t]kG`BEQ+qO;g<!:I+cdn6*d?O1hrF\pBIKCc+r^ +VUS-!*D.#OAa#U/)uq&&QQ&4.+g"-<?:-84;25_A.nM^0i+OK#EMilMK51aXbmfS.4t,7R7E3b.[Lb +<mPHRn?X.:Mq;]6USLZhr-,@"=bb4Jj0d%Hq5Qg4IJSa3`9:in7:UA@>O\I(ullQN6:!,3u"]+,10\ +UV7nK<\DFrbH$tYt&j)17niu0f-]`9GbssP"'oi\k<q6g,`1fsB8;pCl;8p3]fX2el4G]-]8jO"[/C +K@m]TL,f0ZJB+J)I]/-a6GJ8lkC-b5@lQ:]UP][rj6Y"IUC\.&b6S;$<R#qCf/&;\M/m(#U6q,8)]$ +8l?Wm)$'X@Es?;P)5Q9R@Eres\?F!ZCG$)j\ofb.T2"<N2[V+EGOZN_:+<&3-G_.%VnfjeJd`[_>kO +]6_KWVkjZU^beN#Ej^!3H`3=^H0S-8P.'$:JVk;0iC"l=pY_E0qQ2&(Qs`068(ksVK3*M_,5O=Jq78 +80@r8h^]i5[s+6TKL2he@q;K)J)V,UF`,resoYW*jKAjDPq"XMc6'u;!K>qW7;rb1:hC%C1P\hlOKM +Pg7COo%8EkA7YR4uVcE$@2j]eQYZ;[]=R.8EXOWoL<g*POCK55Re\8Op)Wb5iU8=i#Nd]M_oLS:ZH` +u!!^fVNZ@*:]W,F)<.P<!#>Al2TrB!mX6RRTSZ=a[&7;S8+G*_`Ct^Tr"p+]r2R<E1W;R"Spu76-D] +D-DY#KY#*fX#`YMXILKuAB20cKX38$TXW40f;iYlH'1`>ZS;$8>VbDW8j-Bb74-NrCIN0cXicUS0Tk +-.i*%Yr6b4_0n$PKE6d9c2]Jia\<pR!OXaSd5A]j`Y>E6!A0li>!`4''YM0"JYg*E#Uem1AcA8fC1^ +IkT-h9p_'Oq%Ib3&lLt;q54cAcKPj>g$>V0[+?J#K'Y^&2Yn3LgjZ!-C0'aft7u/E@*9V`D[(PooFL +G^+mW0hPaq9I=DPE!`Kp1U>npiORa_e-Q(S_/)5euE^iXBb*rLoneI2l(-YXl!2=#:UsQEe>@QZ'.q +ReNMDGu9b*eSQAt7D?o3l=S\[>8r*9!FZVKL2;h`OcPJ!RF`MU/>I3G89oT_'RbKK5Tk>1NXf'E0I) +G`Ai[fMbG+>pq%'6*9,E%&NH%Hdc.E#8@%^BumidV1huE6!RMa2#1>)AP6!gg:gUq3Qcc99+$eK?(a +iFLsp\JS&YB;O).1a]_`+elf('l=8$Rb#QnBMD4IKG^(?ipioQGApiU]KES6%q:<6n$Zq7N`g3Z&+0 +:e3i2Ye?F9%RO`Xc?'J;'"JnQZMS_\reqp$nC"8m-TeG[YbRn.!u#hmrUNq2lRVKM`(A"XC\JTE`pu ++8BC*\0uhT^X5f_"OE)>!]$NAFj@.72npXPH2W$%HgqT4t'&189-R<cgaNsFKER*0;4QkN"TQD6/d* +_uIbafEC)4hSkH=ot:h*7hRrZBX9VcE$;YFTfb[FY35L?a22Y]_!n_5+%Sjh'1jSJ5U+7scFAW(/Ta +G%Mf:7)C0/][AI@hK%Rq\o6gNdjG9-5Et+)4Q63dYdEaYm]pRt;scuN8FhD`#@AuDVlZ8C"?p'a[t0 +>XJ]K*Gpl=ba46O#EgR.V$%2.jo5'Wlp?>)rZR8RdJOoCW^^Nm-d2RmCJ<Za4u4J5"fW[DrOY'C`/N +?p-F>"K\gjG`maT-QTOLu'A/a2L\So@9Wqn!%F!<#aPN3ZON_)T-O)%KVV\7]CY0;LMPma]_Bd'=5I +KM/`re8;<2jNhR$`ijOiN!;1pZX"J35.EqXcWjP:0_I<lAK%?VK/1SL5!mN(+MkD;Ud$/:FWT.MHLh +nu,Z@tUJ2+Wu+!\-)91?iR2;9f0"YS9oC*r+_d"2[2'./<o'Y&0rbFiB_YU/lc#r5XG`"9K:$BO!TO +E1\PIA'eOHU'b_\,_*XJ.O^l/V'IVNp<*PWNpVT0At1Q05ZS*,$:<V#,#3t%o*6]%7D^siNW;C[hE@ +ck6K`V(E2]UB8fm2,\7=D"@U)(TIh6'k4n*.;./#V-o*lmW4e_;/NnPe@$p[R$ZRAN[j9?^2/6d*(, +"m[',B,V0*fVVmP@U2>63JBDp6.3r=ReL/a@R%S1jQ:c88%Fj,>f't^kp><OJH:WE/6,"OsRA@-#9a +b.2*P-71i;5b2qd*mPPmkM#8Fr)XuDRW2gkH*?-K?)Nh$RYh"MG4TC!b(8=Fbn\lN&[hfDO(/`ehl\ +?>Z)]jp#^iABU7dMq8gmp1o+;+`LESdnHocQlg*o`A,,"WiU6Qjee6IGZ?.Nou@.j=I6,6L.NE\eqp +GoQ1V*7?no;F`!f.0jld,mm'\;3rRa>3HT%-.66WZ;2fFC/WIucOsY5`Le.p7cNGfe`(3]Ji^fQ4sK +Q:-]u9O"($MV+XA6X)<,fsNjC,XUEecF,@`S\k></g[\8[sMG!gq@XS'9FsD%M@8XUhnsgmZPo)7'/ +CNN/OPV[S#UD0O^-Z0Z_TJCsFTqnS0*5aJcHe.QGps0%hhgYB@]8R4BVlFE,nct*.nMG^(*s9(/s>< +P7`ckFepAZj0WgWh9t)r'`@ms9atk.e1Bo0^8gcDE,SM.MdpQri(+OAD``#j2ZSj.o-n.f!1D>"+Ek +GtHI\X6/3(C;8PES"Y*B=1"2aXu*!pqJDRl\F:2MHQ8-p]q9Y#s/Z4462PZA^ba,V.>L4>YFOZbTWU +`d"iG4[ji`PN*eWi$&iY/G&@mF6HRklnsIH/@)SR&ssg4`[LE6!=`p"Z_f1p.mQt&)H-RaUB<0e'gW +GF/Q*<L;4/si[,K5a4UC:>Ua8APWg+3S4U;?Sm4Tp<%2,t<+Oi"r;lV:2>]*M!.s,Vd/JU`3GTmS?7 +ZET`PPF2-)b4QS,SQo86<c?7SNfnt,IEpZ'6Z01m&a`,5%Hp=_LG3.Y=l54Qf@*+'3=$XW=KIF&&c? +C@b"(F81<]Y];X`%oT_t3l;l.&,`Bh_'TE?t:*]DpU@AdN[%8VCBhD+_8u.:/1quE;q!)u=WKeU]FM +]Xe`[2!49$C!\o[-Gke1MI9a.i*'%mhNuiZrX/:<+ADF]2;#V+9'>/JM`2oi<hjA5r,&80hfq_@9Qk +4]^*A=;?Hj6_-$@L*uYO>EpuaV1Vn]^b.$p6mE:H[>e@TX'3tt>'6tpeZrADPiW(&>E6kXU-i*/%pV +!":pb4J("Z`VgKhb>72=]?PhTMElX&-1?NTO[[I[a_O^==M?kriP<X("\pL'&&+5oDgJd*4^s$Wbgd +Zf5P@T-SWYd(<?<e=UYU<tu1Kh"H6H?M%l[E:b!*`s/,0b$HG(/XBc2dG[e3J,ReU^:R"ojkq[@^SC +;Wl!:0Y'truKD#eQ2?"j/LJWS8@)@;1M?R5$-Y.h";H$"<&3;<7N_=PO:Ng(oARq=^ZsJXu;M@PRU^ +:f<HYG$S,PI^RWO*[Z`Fr</7-^d,iLVXPN>SD]BlYOMG17t,U?r_o9VSM$`3X9Uo4uh\CP#9"ig4VZ +h/"B)Ch*cjU31;3H@H_*GW+5lf&.m@F*![3VU]".G#`Vh6U?TT@NtDUkh/E5.:MoX=*I9`f.2#GC0% +dTG/o/QEM>6j-7p_=Do+;N2fj4tMftGFGm-]^(QrtYG#Hq_0nb=,$@R2`q.5LN@s=u#=16!?0mf8$= +8*K42naSTbC%I%GW3rs=4ZfA$[e;oIM_">f@&I]jTKcJ/`O$]ieMXC=[]]2#8SZh<$lLKC;2]*,Zho +2(]\pue18bbF`s<uk8Q]'p==qEJh0iO!^hLb+?NUiJ6"No1pMVK,Cts<KP+Y%m/9=c02k1XJ#1hN@K +moGRMU2/N5t<gA;64H+K)]A=BC5,2Q_5pYlH!AT^rS9f9S$+'LVVB96RDi<6cpohaaZdMQ'*FELN)c +::j,uUNgd;<M(G"8R(d!,M7F&a&e'rS1")iM+PTXDV7[MQZ6-Qcj&<`6=Gb53%6=q4;b/2\@2]p92C +eN,XM<d2j8r1-\W`fK;:_d,*R)drK='EK#9a(.Z9KE@uP&%Os`fn#6AUT>1%q/P2Q0ppjnXl6&TU]N +MA4nKIBrIi+JFI03Fm+q/A]Fl'8_#T&ZpbJrI#r"df%F/U:Z^78]@mOB>Y%_h@uT8BmKS&!tt2;Rp7 +Nq1Xq6i[!K2Ri0,6=iPS#Z^dH0SJfnI=k9XANLcKpSf-R[=m)BBpR\q`=95%&67a1$)BlX0,O@lXO+ +qVM)0M\AdT0)+V($P'ae<n*KD4qOi\Qa6`J"$NAQ4;P``]'X7un'-Dn&Cda^Ln4(SL3`PiDS),?KJ4 +=`f8mBs54HW:=t2g4A6*JBKU?U7"!lkTA`3,,+-AH@-mH0:rD#*;YM)<D.JO9:>p_&p0FH.W6'HZZ% +*mRB$X=-s4.XgfGE,+k`nei^oSJ+,U=EE;H.MR^5Jd$_u`9^JTtb3h:1fTHlSN-&Ne:g%QlJO0?DHW +?fn@W3A:_c`L@;#?mp1)QAbhekL8-j>s^oHFhbUI(m[P/@s+OHIHW(2cD`?UdHH23*B1kl&a;A_#ir ++63j]Sc*--WV0cRX>A(C6CUVu9[i9Ct>BdQGHahaZ\/U(1::;5;IUng4W#6Y"qDpC@pS-ZRVg$Oq/5 +Nj(L,)mj]%aR'<gB'+^h)96M5"@a$TPgZTrbl82Z(n8>Lt/3?6lKn]EVNQ,2D9Aa0H)P]\D+[>P5b# +qnLnc^`3H#\nf)d$c(O._&O,0]G88Q)o:;O_@C.Y<K%a`bpF?f,U9De;"u?J!OI)JOJ>;oql7T?i76 +SH1L$5[qiEd\?bXanUKgYtS7SB6BXE/'.D+^u)mE@9+/O?I,?ZN_#N<^Vn&,8DFQa0qOHl\V^VkA*L +3pg'M\W17nYf&`?"&6)Hm1*"^N"T2"JUarHV,T+V41FH7/>Z_DL6qU2mS$.a&Y]g,3-Z&&\R1W;],= +3>3DuOU+T0KhDlQ*;+6tL-*ZiHT@'4Rr4+hX]IA6ETXXaCI)mU=blPa[bs[CBSD5CFh^_so/fa.1r9 +d)qo5FpVZ+ToXSOpb%7Bf*AY81PGr<b;C&(3TSY5K0OgS:?f-;3-O6eY.7]OT(KL"HP*_[8W=l>#>S +c,Es+g((79`=(4K'A(2Fe&p"jWW'"_7!LS^-%+b,4ic?2J(f'H<o'sCgu,;?[Q,ARGMToV*Pe;\bMM +(Dh];9P>_1d<qqp60i"q6pIKSN"$fKkPi<EfMDRnAj'B.diiZ9=>]jp&./)oD=iuTsOSgi]+46,0^j +8tb\-7Ttf<==P?K3:p!OL^)<SAI9XN70=7n6*_mM:fN-;77:`GX8&f=iB%3aR]!U=rTb5Q6[/GA2dt +M-je^3N[;eUK0>9q*1KQLF0iSu-[h./SXr>sS)+5Rl9]RU_o]q3M<I)uk$h0HS>43N\1fl9l[l9%,S +ojc%Y7kU/lZ+F*JN[ZefiDlF(CWh*^VA#Gb.Ji(`9k*>W<tpJWQ52_H-98qb1`Er=FZ<eHjd,i`S.) +?%eHL-6:lUOmu>DYNt1rgd<S.*h"i+7=huICu2<B\:;u&39<A&,I]>'h,Z=oQ)U<>,\hWBqN^Q5j\H +s4U<o+oH>0c2mIC<_nlQ"bSHn`8RI^KYWTT#m^H+/N(*dS_p!U[8^IqLYb>.&,oo`q$++P_g:;<NQp +79n.hOfaY4@I:=pS(cJ[hi$G!<7U8i/h%t*Y-5'_BG#nF?Ui[M+$?c=L;Bh)3%,GOkB;T5p;+MTC9; +$r^dQ/^k;/YN!`VsP==Rel)\$;&9l,@E9Z^iD^(lOi_B2)jrjDN:?[dS$rW3&I`>1QqKu&59s%I^Q. +RZD/O+tfU@gS?Sd/>R<c&W)XW!%8[p8?f=s^I%@#!M^=0&a?r=cGCjAngZRd5^-;I^Q"DCR)q_IVYO +#bFXUR#kpcQYE#],CtL2-W(<u5=M-F>b\Z$A5b'seAO%eXg[(B[><P2=icS'I2Lg3[.*IQ6XQ,6D72 +/>oFl?YiUZYHILJH1&Egk*2/E4e*Q<SF4A\^Q=o[63E&%.?J#XISKK[TR<o6jGq>GdBTAT8?!'i4Nc +9K#K\]014l>-m/.B^fT#!d!o!p$n1P.:!+E4dJ,5HoGnm_c9Y7%l`AbY8^=0]X^E`K=&P&&mb.6Ms< +/e83p[:Y]o\.C%rULIN\>>`Qm]jGb9,O$cbFaAP^("g2ge1C1.H6A6`.$IjOBb>)<5*iP7&D%39Ke? +7b#as<jBT4P[K3)28ok;lAE[-p+Q1Xu-5^oA@cJ&,%r[5+NK!m<bXE234qc#b6F837Jb,(`[ue52@W +PgVuW,8BMi6dB`4<DgbXSMsKG<@\5P<%'mnMcL46:u`d@bAgTaPDmMB9pA$:=X1>fFGA=_m>.K<2.[ +!ndaD#"@%pZl_ac+rFcgKE1.g@s3YiaDE*P=9"`Lsg*RAh5/M]&$h,eaVG[<=okB^IDZR9<I2nep7g +*cjjINVYNnUFpWeY[r2=;h?U?mmmlKONN!-]2B@dI2Qof[`!*@+aU+O>bb:6]tuj2G]QK3E>BTATl& +IQQVZRnX)u%C,;:>G[=mOB=[_cTP-8J0qi9l1e!I=qGpUYl$@NFW+nAZVg;pcUue'.RELquar.k@WF +pOka0K7.L<Hr@4''tAD7auK\8F#:^K9i-[dUkI44a/?DnG`C^i2CP#JtGm2\3i3G4-*aEP-K;aDsD0 +-d$JB[kGsH4P)O;F1h3,`Uj$E8()Ll#qdm*k:*RFW>@%Oki[2-o(YCJ4'9aN9=JT_c)n]q)f5BD4Ki +.kc]!GI-kr#Z+OW`gKgDlQ/Zkf(i\fkk\o*kq.pc*QY1Ht]\a8#Uhg+EIaN)&+HL_I"8QY1qdjP((s +1e'qaIhhhX.OBRGY6ri/pHfW?6M3pjYZcr;@I.[.V+(o!W]Hkb[4.##_HX@q@LI3ZA.j3Io(k3+46B +)cj=Z*,rnqp7Ee9[@S)8#;AbLM`0;?P?@O5(*5/ZP!g]fQL8EG$&ZBU'Tuh:c:sBWg"@c61ir"UN9i +W9kSsH*$.u04H-(RT$>p9TaMlV^dQKYK!@JLm1EJ8k9W61'nr"XKhA\"$[INILuGE3?u4V2j2$-3fQ ++Afa\PgZlVL\u`o;?>UM'i>oBCe#\2mQs;#LE[n9"-CJfa2nC:(tX_(,SE(o`&Obb,qAVP,Sj@re1D +nL,bC':&K7<%hPh@IYUo@$K1^/'-)4'aNJ_UW^X<?7(Xa=jKHOSkBk#R6)gHR'+n_Z:\j58&\6k=]B +$IeX1Yd?sS!-E;c5)['QQ4UZP==B+'o=lI,4M/BH>jG4@RZ-$n"19SjuF;1\7C9(Ai!nE:cB%9*&Pd +1P?NXJWW]RT!f<PRaaR'$(<+Vu#U'NVMUB!q7pJ1kUW;eP[d"f&Bes_(%M"FoRTE)5r?YL/4[)^XnO +2V^qkYQqQB59-:$M=8W"fN1&1Pk#l8;(9<>MAP\`ZlUF\f"P7]BBKWE!3B0WNZ8XWQ9%<mW.!X;-Jp +<]\?*CGfb,'>CX#Rb:nQNG^s;m^Q=Zl!7)3d]V-_]iVf@?Yf=aYSIGZ=??f4X=]44(+."&],>*pFcW +gD7`eWpBk6S<Qa7H>buqY=B5I6?%o@LWQW&F8Mh1Ag;4*98>+4sJ>3dBp#,NNB148"!MHtmIGa@Z16 +1%5LIZODbcA0>gk,S$^A00gZHJ[EDC>$/k)JQ?'LM\<Rl$4'b^eW$2FB#Be+Vr:rOc"27XkCfa``ck +:'Y7SPq$=Kg8d**W7RRPs(S7EBOt*b7BCGCe(UGgqP_iFE?L]2A;2Sa1X/d_H\Sf'b!Vr\dDI"]SHb +q4@,bX5gL"f''=I=VgiZs_=;!o2TXDRI`ZFu,ANZuBkXKTmiAtm],"1"^9%hMu3K1I2<Vc`fqj?/7; +A#]RFQqg59$qRg:*\ot5#_?GrFd*.Q/i.c&-P="iGZVU],P\Nd;@L?P1#$6\Wc&J]P\$1ZDJs#eY;f +NE?rM*QELV4'k9%q()<0E3=bRA/@#UqEE01uLpUq/D\auQ&2NOu,HUob/fRIu-'"hCBdcm%j;t#V(\ +$b*]?GdP;[-!h-$.BmPAO0;'?E)Kj>>"2r+dpNFAP:_6=ud%6Su&Tu_1eL_l#Z[(Fl(0l%/X,!*H;@ +n?HLn9"'P"*mB?t9c'k,"Ebo:VYLq]cKgcYa+2,4n[l3F*)l:;`,.G0C<q"laa*DSdl+M;LpR?M*-? +"n>^N]DOi#DuQE'=TE>X&!/r$-i5^)=h4:nLo9T4X+h0Ku+.j%@tfj\/TdfJ%;%0osD1kfD[tD2m>4 +j;fTaMc!ddB(".GOFc5^-d;u>TB+>A7nUXKb]=PE5MZ2jF"W"lgV(J5S9dKl!bKfA%dmf\5H#8J^q+ +h:i8k]2icL+EFNAA^4.SG"]B>Aq;B=gOrEl]]otbgROV'9c1@T0&0NWIBCEU<BKb*_!XN1,3lhn8I& +@C3LG]dmAr<T,.=X\e64H(N@<H8k2B.rlL3lu<38+nb/[CPI0b:Sc1EL&KGgih_<=pM&TNYJY/Q\$d +fTo")2"VH0LHRN(4f:rJ,k0Ohcb+A&jW,205r+Z#G=]8mrJ`lGnd-'ni+6cqc&qG@A><kA:eM"ZO6+ +jC;o(XHROfC_ADGg9%h1UdbVTJ35DWOXn\]"Ap,NM!kGP.ubi=U!4r@,!^X<ZI-UC]Y"hnA6J5;8eF +"8`j#8.;eeYk.dKX5pS73X?D]M%aI7KB]QWLl3MMMX+3Vi/b\d#s+Pf/\9oQR#sX,JN:Pc447WT;N= +&$nA-(`X$dT%9FsM-+pqie)&+-O_tYNl9gA7k38>Z=WJS$0B;X`;#\3hM<%4h8+tLkf6DQ06oH0<V/ +4.Q6%9+GZ`$:>\CcA^H'?hf'UaRM$/OOV1[A5KDGr`^B3Q&3+Z9trc]KO0n5+%hP*1Rh_oKf!02FJf +XMH]%.6q,%)7[[_'6UXF4PY%;P6U[_6_.cY4]M6?*:6X0,*#(r^n:?3Q'*tgY\>!;d.$K[Z2i%/5Lo +>KQ&7N*7V?f7[Z/C3tLu\ge$j^ql\V(]jUQ`\:P.;P#-/;o^TS^Un;a\od\ZhbA..e*[)aj\/_l5aZ +\P5K5[ml3B`"ZaaG_a<HM%i>kPb`,OA6]ndZ]<]+Pd>#C;s+p4ANdrG%pXGuA:4ikB>N)24$^D#H`P +44XMYAI`k*\5!X?>j\jf%?/b8AN):jU0,Rm;`7ejSc.ona3lC_>VLoU'f$!Oqb+\5jLYE4CUfSW,ek +=B9i44&86W/Co=qhT6N__b5[86MKnS$E`t"?Zl"KCQT08sk_$W>MtYO[Q0"DSfU.Tih=aBfSc,!(2j +j8oZhpoW=dL-CCm6L`E7Tfs)$WYmo@m6PHXZr3`5-7#9T-9$!&3C\\8FWlo)r^=\OU=[JkL;$bPb+j +@I2)pATGX/5F11CF[('B(RFU5II)9Ik*OE@actSP6;s8`D*hpjl$G]SPT7MTj++a]^HI7#:I,b:u.P +C\03bEA>>#(EBK;R=!*:it9^;(t?VmOc%=-?]Lr<,=)@TX:%b-)&W"U6rWYM<!<m;!DN�Ve+CgqO +miKM2ee5/[&sdtGq1O#due05PG2%+.AGK8Le!ba]GBWfK\Dj+sMa4l_YB;men`a2_]%8HREWM\R4rN +L]Y<bdkD_nR>&6!49[WVgS3"i2i0Y]h_c3"6!#Vr<"J/:f#24:pVgtMau#ci6Ed/c[iIKTuKpr$6'u +tPGJN30[A&Pb#$1E%:p<_1pkY9)Oq6QM8<_"_0S@N<7*/]9Gr]7Og7hM`)6IP)MKB(`?\/UUf#e!d> +<a7obo=gM[?'9a.4PS["$NS/sf9Wde,<2e:aCs'iP^<#O;N<"Z+*Q+k(!]O4>W,KfR':',i/X;o-W* +>s-&22cJg&aYc=_'fXUL5:):GLr%T^!.L2pZ3._#cO>OF'FDgki)%!Me@b5!Lk[t(70p8la39CNI8% +8sQb<6.<.e)j+_j(uMiigF*rJr:#_PntieTD+2'Bu]jQQqXcj?cjciJ5diPqaC!Miur'VogW'eIjti +K4E'%fqEUQ"E#Ol:%gj3bsgXTRp4shk3oP;q[nXQ"(\;@EW&k\g^PfV#e&:?qEBe\J/c.D-dU@!h(o +@8*(&Kd"oeHJ(:m2eP1.hKRG=`aUj::P:66.m!o?]QIS*^V\)d`5iIH$@L/?H,P\j$]U=SSDTT:PS* +a;b(nHHRTd<6ubM2P([96QmIEFD0M"<)\.&PMeQA>Eo#mr;L.NlMUPZ0BGR.Va2rAbHi.QZfC#ghtV +;4J#p6J?C<:"?)nI<Wrjq7Pt%g&6?E;&qo\o#_s(#iO'*"H])lD[IU_bqWX.r4Bt5kUr)4#UN[.9+! +ECEnCs%K\Z4Q"hgfcOeb.(9cZo'FUo=kQ<Rn:8#&G;[,nO=U04V9fPM)4j>P_FTc#/XRpD]0l$HSk< +"#Dbg/JF1^q&0IQqKTgh%[P-X2)D3X.+ge3Le8sjh]\o`?LkWc"l\#/\#"J[$H-B:*Z7aXhe<$JQn6 +d>G.ZoZ`F]A]W)N=fN<q74e)m>?&6:?.,_`O5eu+n,>^h_?=ejdPBKu*8%(:%'>WjoGgk+E'NRZ:'@ +h&hXT]\mF'O;))b'>N<Sp?I$lL@c>k!?U?"U'(qN2@KR#G/QpsZG%<aUEkL4/*C^i$0:Uc%5a3DbaB +>CoN`1D/#-?i_oh%L8(!cBo(RS%[HVZ+sd%[GAs"hegKdXfE.hRkRDu@3ut^p'?`i$7_&D*.9!b((F +UQIUMDei;nqs7NE#r(73l(S!Fd6=i"QffLU:a@?!lfRD`QbZsg>6@U[JfdDFK"43$+QhYFlmUdrD3V +Fsg!edZ#Seh!7!qdU$WeTO$::,V(_5-6#GhiZ@Dl+LPgQ/_+;j8,ES.?rmRX5klt7OCY>Y"%K<9#RS +VRuTb)-:+-H8*"8!8CF0l=d3HjWT<bG%1Z>P&^cB$I#$X0"8EtpL$@]B=9qAtjc3L*DHpb=?0-SYK6 +UV^VHd]H?f$<MLMg;WaF]*7P*M,MM*VB!3^\T\MMB3'"\hk8;GB/B[nLf(e]&?I%P?5&DW`=%#X2OM +3'?=GKB;$D#52<`gA?[K=Qa@MA\\D(0Qq&7EsNt]U$.)`^kc<iLkk(if:[j0faPk(;FSi-$78g*d"; +Pb>A%o)!dOP&kideVMeBi^#Nf/mXbZ+e\de0J'J3\B0^l3:4p`!VL`IqHLem8cNa"dUANgaIeVjcIH +P@lW?XQ[-\:t7>T>ua`h]_aElbMd\2iY4QSWOHHp4N]b:Q^X-OrcVXo0bm)Y3B2X1dtfn:9.bVK'Bu +->+B]tn;?+8[H?D%l/\9C-r9/bq<@mOP%9`h+H$\NOd?iPUctE,I[Ua1WJD[G&Iu./(8u!IOhXlo#V +D8K(l+(N`+V,`C]JtKR"F\7H&'DaL`h(]0S/>5=>/63LWIhUY+LLBNaNWb?OUDa>jGIF9u.9V$Z0;0 +OG@HU5j\Q$hM?e@*"1D:=)Do-B=?3D(0gjrIHQnt%(9_Z-pOC0aQMnij)/^+H>ug'[giBO]C9?hY(; +G,hrXQ:LOND3mc=]Q?=&>Tk#TuMF1uQVl/e"\mloB8:lT%*JT&8+C_#?YT)S*':PH;qj_k-Tn7Rh5( +'U(V!hHddE;W:B;$mY=Z1_Ab^0$3:>4)=:E9+2.*heH,hVDM<>Y_Y4#i'!7`<[T1E<qJXaPR6C)",] +):=[KsE>^&d;MZ\6*d7VjQQQPm+Z^L#Ydf)>#9sM/nj8Ba,rQt8`l?F-*Af51Of'U!7bLd<[iVZNEC +dOo"j%#t/NR!go/3NRhDu(8ghiZ5nL8*l8;)"\@e62*&0!VH[iu)244UkPoC3Q9^!u3c_Ikj$'JDXh +(k-+pc>g(Gj`)&ULHsk4i%V+<VG(U/0$K-D7c#hZAZ-Q(0Pk>#%cr$<D'r6Q>j.(%9FVhi"IT9=`q\ +ZHq"6OT@#k0Rh*:BUs6rfaEL+f0QNQp\7u5Iq#O_n:LC&$0L@D.'E4aJR%h34P@rth&E;s</LCsn07 +60c;>R]uPYf^s!KQNgrnY^/1%rcO'6Ld&Pn`^'tnUC,'JbPb\'>=tjT-Wu0N:M!-GHFKpgfs:``"@J +bbJuGa:8R8-r,LUJh,Vs27Bh#9K6-F`9`5BE012AeoCJ:Yp[%$)R#Q=;3;:1<]Dk,0^P$Au'M3U!mq +7!'ITLXbdW\NDoT+'=\;:]1*^.83Mf2=Gs-i?4S7R1I#VT)$hjO.%CACADEE?2F+'9'[IW_7VFjF7t +a'*f7GF]tZf-(+`E/FE>ZmorLoWZsqehN'=169bj)<-hDbp.8,?('*GH\]4-^GTu$D[:Qmo;%4=f\C +fZgU+*]FQQejJ$og,]SP"`Xbhf1B>#1?OBN4-D@A]$Fj\c3_7CGGSJFqITmhD%GPs2Bb[3[Bs2=9"l +jsENLc]>HOZRsJLCb#8F_B3Pd;f)h8Gp[nrN2jml+qcDWVqV.Q]L0n8*,1brHVeEI:S-\$`B4s[!e? +'rX3n2QeZVDbQhg.#M;4on8IG!A:FSCN<etQ+7fF2om\@_rt)\i2t6iCpuVj5Im<Vj/:8G9J3.)`Zh +s_2#D&LKn9AIAp3g:,iNN"B7,J&o`8C%IHnI8e?Ug[XBbZk--^757;Rp>H>q_R=AT9/OhG3I-8=je" +'L#.eDoLlp.HGmR-D8S^<4ZX!SPQ1V?1SoWhG4$;7HuSEI;Z`*YZP^B3E*Ai*f7]Yk5(U9qe1`7AC] +E\f'R[Keg<(R4j%%/WCecSbOgYKD3JAcpfQ)k97WDhY8KI"<`+sG0CdKGA5<_8PWSKBXN"I=VpnhMd +X79?q'(;h[?KEoMWq+qDKf5X>aF9S[I7X!h/0/an([:+>e*So@C=5&,h-$m*_SeM8Ro*`Uc&*Bk'28 +[3G`.^*:Dc0&h(+sT`9]8@M;:C=2EtqIQ>jVHo"sAUI`;b2kK0c0]/YcqCGjda@k7m-nm1^q*At75l +8;MbV]jIOR,*ZTO[l52o1Ntm$U6r)@[?(.WbV#`Y")oKW(#J@i?RfS7N_]M/tSQTP5kH)^Z1)9-Qm3 +9U(:1C>%s;]CA:^qFP_/XX?_TPa_3dP.\H2[&VmSXikD-\sCR=SBe&tZM`Lhc)F[jL<XF;k(ZX1<6$ +rDOd)H$-k_\;.*o7P%#N<sI.ENL.1s6^d.E;&&'3(.+Hs_m'Mh;!PC.>+a&0IW\C<A&9U8@%I4gjQ& +L8r+V=eXt#ZUK!D-PU,c#m=DNC6[;enCkA<ZmN%rt\UK<*rtbMH)ipeeTL4:fqmXXWK(cW[AtC.2B4 +Hg:"]5PYULT)_Ord<QB76d`Q'?UNZ%X)-&/>p8D:&rT&gm2qhOshK1p^E[;Om)1JGa^&s)<#sAA0h: +Q<bYh\H5#pQ2;IO?dTYKae9gaQMaNDk)Y9W2+XAYPL)0!7R*a]RhrK2W>p>leO/Ao1\fplX]dT82q8 ++-Yi4c_'DWDNgf.g.$dj0*f2qhb<lcrj*]C^9!H2AGXe6l_n;IdBP)XA?fs0\l.7Dl"$`3\Z(d"Ua' +%IKs#.b[Y@SNqr/MaV+3QnEPMm,je(DmmZY9on*]n%E@Fs/P[Rg\#ajuKQ@@DSS%:JM\MudGP=OkDd +\i[`+oT_2H4(D#Cn.ZPPA5N/:qh&DS&MA<kP=8(Qeg[@^1N0!o6i&(IseJ=d-m%Tq!/_gPp7ZA0r7> +%n!`Wb$Qjh]*u\+O&)r#\+1SLuLKK<)a8`X3G4a>no/6qggY-\;Qh%ihO#g1Q;etcFVW$aE6;[R%Mo +$eF!R.#iTM1YUhBjK;nX=[u`LZT#I:P'fP#r9.N<,r'"<%l@@HO<Bf`rUW_;[SU9_@'q8p'IjEj,dZ +V;Q-#.duXCQac[0h=IY#,T52H;1AhoZ[sM+jF]8ZIh9ZtM^2&WB"r@Ym7@,?42`/X1.\5,=qcpRO<A +2G&gm@p4:4e[EM,6m^-c(.HA[Q>-5*Y#&B-X<NC0O)6hC*O82M,*`-J\B1(;o/B[@mH^kO^S^-dW;: +5TT[]o@%j4Bi.HC<]&>[q:lRg+0n$d8?9'=\OR>YlAF#FuZ+VpB4&uD3[[TIgroThF_L0MT4peR?AC +@b7$BW1<GGIKJrp'1oZkE%&L.1K_J)T]hkg33f`Hl=/J9J+"k]OQ^?!"-@'K$o"nq#EP;t+<%oc-Wc +^uj;*#9\m4!+tnP,:W^^&Za/(7&%7oFh#V*'2WF+u6/H2sY0biF4B>(RRdJl8N*S1mQTgsC)86V2,, ++gJ%3U$;L,.'a_c6l^TU\jB>nZ+?N[Ss>hNo/gYH/#B-lI'3ldoc_^iUP-(7.Z,9FVVAJTkDD)0)2T +?3$Y$%&Ybk*h]ePA.AKe<,YL'84)r`/?RLlErNALMm$M:n[_M!P8!h1UWGn_6=ND<)(M^p:-8Zl(=\ +lW)%Uh*6#PA"^3&rC-0jeT=0F*+80,WA9F<55DT!X]upidN=KgPE7$_EbU/==/p<RY6Q6<&Ct,l3pb +#d.YY[#OOM9"Qm(/OKd$R;aHND1F;b9h:W]<4tTnkYm$/K\bgFsmFuA&<*"lR3P@d2>m$f)L4n>d@; +1W'_5ChPl'mTWlYZI0[rdr!c%KMB+U&pa';Z5g>ImKI9mpCB@d%.PNAiK3\Yubc`h%N-.I$(I?FL&e +eE4_[a`UK)Pu+YjW8.elBhD&Xe>H=+%tUq7@<**CZBXY%>,u+qXj&d5f6W6BaaK/c(7lUVlqE1QaT' +1k.dF[*:Q+at0ud68*b.<LNUakc^PQ:8@b#;W="DtE&<u\F9QQ?Cej`9[#h2;%8rkJo0HFlB,r*VJ& +i)pZb?8[Wa'="'EDBc_7?9*sbZC2'7VU+La"ZYgh4+"i%Tg3KM9h.?6Z3#$cT0lH4XHMVl/g#cZ<:d +P[1.M)mYT=p01KX+-'s_UFOAeq18DM.V"DZpdo`A>l.nLc1m1nh/2'(uSIBc95+g@ms&>i^!Dfn.Vp +L=q<i5g-Wlj'U=:2_KCV=g/`piF,ip:QCiU.c+m_ROie9gOVNNtHCc5ujQ@Z]u@Y_CrXg-P(4O6s3W +8%U`8BFA.$q$>6Pq<h)eNL(u5mBAJ\,2$LbArY5-\2ICYgH3knDgdRiR'u?\KS5<t6H>8q5,1-+mF. +Vi\9s9N,M492I?CY#8[^Pk,eR-+$be@*="3AgCJ?TG*AVT%-6q.Houq8:=T\=(@-$$OPS#_`>$)V[; +Yr1hF1peJ-]uA)0NtTAD@l1)kpYcjK;$*?dV*q#(?_b8T9=3_cq3\#G>e6n@ZrZh\pZ-PX7NTlc5:5 +@?>Ad?(".4>q:+Rd<@$A<[iA^q\k>'!/n9.?m)33p[[N*rHSA[&53PR5-[IK%cP,r\)K^fh,*4pL2/ +`sR[^c>U,[>=9ET0X+fWQOZ#/L^^XoNT@U6aX:hgTFElpeJ(nMAqGM[Qr\55,9H+fr&G0ldf:pIYoI +U[8AW67qA]5o/1D5AQ%(#JC<?i7]-"N;ZJ3o6u0)qEHdtmM/oY^#n]olF1#I<-gl.)SosmbWCaQqtC +>?J+jj#@=IU&+33fcr^1ls/,=9Yn(.EVFRk"nAR\cr%lXH>AH;ihfT5kV`,]K8;Usio[_bjODJ]GI= +S78=!CC8h:%&,B9`n2p+ces+8-]&;h#<+Gs/%"DYV-1AYbdEslU"od"?cgHCr&HU#=OsEO?WrrB!mG +"Gp:&PVARA#E$bnPrfDe-&:h5a4UGn:$1JH4`^L).?mMsOi@n16YSQba+U,_V@ncb)_@UQ<83$*!"> +CW$Y@.Iq!tB3WAM=K%K,WB]')n!bj01X:Xp"<7nGks#"+g;LO?V<8V"q58%ILV:OT&9-G#e&;$ZRa2 +nM"+,cmU&d6)B8=0A?BeUtY;3&!-'l:\+K<k!]H2)t3e?nM:Q7+Bjmmo>2jeYnIni)]'(e!.kX[a`p +sM/7u-L'EUuA,^g.(-Q*+k%7g]Pn@EG_^BJQm$jIhNELtY,U0]Nh#*=HV_J9K(3=QLK#E,<-0W>=fN +uP<[*%p7Wlt6W%`>q;T*KeqZVg>l?2]X)H$*ik=Z*%A0@O"aYpV_Iud$Y;/.1Cf$%*\MeKAd]ph\bk +Y,*?"FZ3MM7Am,cr+cmQWnX0CHqX_!ZA5NCOd=E&f$??^j$'>r$&JYh=*nl\s5\>9f,05s_hJ6afPR +KO8,/,.LIKSOM(u`IU+n-S(r?u]DH=<EodZGtVR487-.WUS!17'D?O"&MV.T3Z&j$q"`\nTG]-]#QV +@p^VkR*">+/IDb<_^*'VqB_"!FbYu3U&:+p(^J$qET.C#Vh@iTBdcl8,Z:'V;P%iZ2(J0b0[dEb&r\ +)6^aqs(1hs7K62V818sG,c1*Z'[Cn-K!6mSINP%^L/o/Iq1#UQF;0S3"Ri\`1E9dp^12=e:9DUKh(k +-B`O22>S/o7/&P4AP&pG#O-F"+5A;k+,&9+i7!.Z.tu:DA_AC2MuE1Bju977lOm(\tSQ8">\Eb9HIk +(Bgj1-#m,/\KaS:l,dOI6Ng2AO:4+jD:gcKO.nHG4&oL4hJ1(mY1Y3TJ)a0oa4nJk#PR-Z.^46P+.1 +[CE1`nn3/7=:_6*^#0.m5>u;*`O`5]e8&$Z(6td'0dr0GEr)Za_;ZjC60N///1RZk5ZI1GKS-H]'I< +Ka0`hT#FR@aJY:l/eWP2G9-0k-r[;ue.NpUo.%)E8J?)-<-(6t9SS]%kgP-jZ\:Ok!D;q:H".nYF+$ +:eC*^,n,'.9?ZY;k&781&n3g@u@UKURYVC*^>H?1^>+SR[(rBqkY/e`:g@Il8'9MRBA.ME),!ujt!& +P^^j9d(QOk4qk@%k6K29VKcfErSb1c=d:t02d*<o(Y;pr30WI&7Sag@DM1VB%@7n6Hdq)7\)>,!g6N +9BSd$I62hoRU:qfG+J9d.P-$2hZS:u[)=js]dYfiC^K=C$*:fU=ooE3qThjZF-UIa7#sN9@b?E=Ldg +S0>%;m_J4qZbF*d*hPiBL60/R3GA>iC/\d>(@EcEXcD+N\N8l'a,5W<j8jK9bRCMsXana'<a(+gp5T +<XDK/a'Kt*BEf0d!h!DRQm>BYW8\^7eaP#pJ0f?X,h<c?'bN3%(b=pTUNQfK#d,Ugd`ec?W![@RK"_ +oi_.2J7AlH`\EWE&\=_-T')_$rGdEc58-mfWuB*,PQ[=BT!'f2r,.8,IWQA]EOX?8#&;aR6'(/QOTW +]>6tB"!FS<h:hc_`4pG3?i$K#ZYMmR;:efCT7$+(4[`4I,SjI,hCKep1lbkk?W7DBYpN]!Y8i7W16m +d\T\Eo8q];b3[D.JBU2"?FlH/u;J63r@L#R^OHCNK*&\Qf2)Z'l<Y&fMM,AI8\73*gcj7H3Pb8&0C? +Y:>2O;+TQBt9+.:M]jFOVa_#qFp6>$"@6[?E$UHRdVE.M]\$Fh;oXQ$HhGGkYr3FiGBnc$&(E-t.U2 +<^C$#WI!/_.J(Mbe`fXu#B&gk.Q-poj(h)!l"_WbF/)TRi[9)I?[`b"GN3geFonR/n2,;=I6nBQ(W_ +R0F`HRL?$HVu\*Q%4!$CsjI0)iKPEBt.NFg;Z$FXG_[LmFZM^-g<0\?FoQKBGc\SfuNCY#D:cK75K( +Id=jFuRTY\0ZfoTl#BcD:ZMh!af^[F^f6Y3EU-8\7dfZ_RW^45<)l'_Hhk?4t7D!L:DgabI;@5@tZ( +keG'fE6GV+ECa?I`K/PlFCb2.NSHlYLC=cg/kgPAtT5f$CA/N$0G9eV].<Cf#E-5J9G;LD-++^1]IY +&Gd=+O7J'4I9p+h(<"p@!-j>Ti_d<HjFGB-DQ[AU9\`.9C^uoojpS]6DoD??1I!(RVhu6:i`&-1%Oo +3Dl%g2gao[:RP4Jq-fRLAX6hH`,0:UN@%B)pqgN:/6QtEC,RA+Iu8kuQJ$bTq2q("d@".*RCATON8K +`-SXOi'R^oNMH(g\o2X!OnQ'me/q7K1"Z^Y+>S@Qn7m.ljUd@GR8PhF($=f%\"jdpb^Su'Dsq<ZAZ\ +3nreR/+O!)=a<#IjXR+-L[2qc_gDtr?_uL7P1S5m@s:"mND(,qp!b8XiNSa$m<@Z5\e%?L=_;m.ecb +6,k2#ng(,&f%,2:t,ON=@cp/bc'dSe:qnlj<dSMg42HPnY.*k@UO"B=00_>+i/<;Xh\q[PO5WWE9.2 +!=qY%iBF<:>j+kDp(G`5(m<J0k&`<8lKu,!MrCFWP!%?TO&qDVYQcXR0oC7L0GTQ!Cnb,=(q`XeUrZ +-4bso1Tq_>kSS8ZqWV^G?@jfB\3i'SK&Z&6a\t/o6gi*)m`qYsi\&n'41c*/%bn7$NNY_@YF?BsHD3 +U+ln)e<ZnHp9DYEP&TrR0^+i6G4Nt&J:+ghAEX//M\!f<nOYGa*5W?O1Og0co/3+28u/h]KMD^D;33 +:s%b,MIJ:%Nb:;o(K2m::af?\mcfNj1'EXp=`dD"-!H"s1'<q+ONA2oM5O)C09rB]n,n>io36l0P9# +[EXe91-2@@LV4sCt],E2n47OSb)##\tf:"PJccMe/jV)RPB<`*an#$kr3<$,<iA"=XU/Y4^'*&Y+9Z +"]>U;m?@fu(C&,]S%G"Pk=#:C]d.THu\<6gM[M=f"G&`<<rf+rePACBT#i;j%M,@ss[(3<`Z>>q\dc +BJfrIYYFZd*s+m'(gQ#Y%7,=uQs>us4Kl)I81ZhQQndRAgc\09n50%P3]&LF,>H<@*R*<2+6+<WI'R +1cZ,(Ce!:g`GOq]"D)9D*+A)\BG>]IcrKL:.i0Doo;ggD8`]>d7Obe4Z+r;jjR)&JgbdSg+nKqpG.* +GhS9.FMEE12o'*?c(6$_L):q&o'b8Fhq?deYN%AYrgK`*u%N?s%ufp>UUWJ/._\6)5KYaJc3KPkFaq +&/6s>5&T\J29t6o.f:lF#rBat!NrUp3`gmjkA2V`.%FFWVa.2D>E'MY0%EO5\cXkMM]T^U`_GWM>#5 +kJMSCHejbUN@2VHi+QrRrRRl7(N#N;*"h'1J]9!`,BY$5A?A$]rq&h;Ihfc2DY=n@?iA:WN"+)P(lo +4j7BjH;\#G+T3N/h/V/hNSB0#]KC8_KWie[9P%KSfn'[dh?hWNNTM3:,lKZXUj1BP5L].cg"f6^S5[ +r.BbceJ&qqGN+9~> +%%EndData +end restore showpage %%Trailer %%EOF --- mozart-1.4.0.orig/doc/wp/widgets-1.sgml +++ mozart-1.4.0/doc/wp/widgets-1.sgml @@ -538,15 +538,13 @@ <P> If the first character of the <<bitmap>> option value is an <File/@/, the value is interpreted as filename. For instance, feeding +<!-- Changed for Debian/GNU: Add Debian path to graphic --> <index class=tails/<<Property>><and><<get>>/ <chunk class=anonymous><title/Bitmap Options/ -{L2 tk(configure bitmap: '@'#{Property.get 'oz.home'}# - '/doc/wp/queen.xbm' +{L2 tk(configure bitmap: '@'#'/usr/share/mozart/doc/wp/queen.xbm' foreground: orange)} </chunk> - displays a bitmap stored in a file. Here the file name is given - relative to where the Mozart system has been installed, that - is relative to <<{Property.get 'oz.home'}>> (for the system module <<Property>> see <ptr.extern to="ozdoc:system" key="chapter.property">). + displays a bitmap stored in a file. <para class=apropos><title/predefined bitmaps/ If the first character is different from <File/@/, it is interpreted @@ -668,9 +666,10 @@ <Picture.Extern to="images-1.gif" type=gif> <Picture.Extern id="pict.ext.widgets-1.images-1" to="pictures/widgets-1/images-1.eps" type=ps> </picture.choice> +<!-- Changed for Debian/GNU: Add Debian path to graphic --> <index class=tails/<<Tk>><and><<image>>/ <chunk class=anonymous><title/Tk.image/ -D ={Property.get 'oz.home'}#'/doc/wp/' +D ='/usr/share/mozart/doc/wp/' I ={New Tk.image tkInit(type:photo format:ppm file:D#'truck-left.ppm')} L1={New Tk.label tkInit(parent:W image:I)} L2={New Tk.label tkInit(parent:W image:I)} --- mozart-1.4.0.orig/doc/wp/canvas.sgml +++ mozart-1.4.0/doc/wp/canvas.sgml @@ -320,6 +320,7 @@ method <<move>>. <p> +<!-- Changed for Debian/GNU: Add Debian path to graphic --> <figure id="figure.canvas.animclass"> <Caption/An animated time waster class./ <chunk class=anonymous><title/animated class/ @@ -330,8 +331,7 @@ meth init(parent:P done:D stopped:S) {self tkInit(parent:P)} {P tk(create bitmap 0 0 - bitmap:'@'#{Property.get 'oz.home'}# - '/doc/wp/magnifier.xbm' + bitmap:'@'#'/usr/share/mozart/doc/wp/magnifier.xbm' tags:self foreground:blue)} thread {self move(D S)} end end --- mozart-1.4.0.orig/doc/changes/main.sgml +++ mozart-1.4.0/doc/changes/main.sgml @@ -59,6 +59,11 @@ <Front> <meta name="proglang.mode" arg1="oz" arg2="oz-mode"> + <meta name="html.split" value="chapter.m141"> + <meta name="html.split" value="section.m141.lang"> + <meta name="html.split" value="section.m141.impl"> + <meta name="html.split" value="section.m141.fixes"> + <meta name="html.split" value="chapter.m140"> <meta name="html.split" value="section.m140.lang"> <meta name="html.split" value="section.m140.impl"> @@ -118,6 +123,87 @@ </Abstract> <Body> + <chapter id="chapter.m141"> + <title>Mozart 1.4.1 + +

Mozart 1.4.1 is a bug-fix and maintenance release. Most bug + fixes are related to the new distribution layer, built on top of + the DSS (Distribution SubSystem).

+ +
+ Changes to the language +
+ +
+ Changes to the implementation + +
+ +
+ Bug fixes + + + Emulator and base libraries + +

+ + + There was a bug in the way the distribution layer is + reading sockets. This was an inappropriate attempt at + optimizing, which was simply removed. The bug was + isolated by Peter Van Roy, and fixed by Raphael Collet. + + + + The <> detection mechanism turned out to be + too sensitive in the case where the round-trip time + between sites is not varying much. In that case, the + timeout value used to trigger the <> is too + close from the average round-trip time. Any tiny + variation in the round-trip time then triggers a + <>, which is followed very soon by an <> + notification. The fix made by Raphael Collet consists + in making the timeout value at least twice the average + round-trip time between the sites. + + +

+ + + + + Configuration and building + +

While building the packages for Mozart 1.4.0, a certain + number of configuration, compiling and linking issues were + encountered. + + + Yves Jaradin fixed some corrupted files in the + documentation sources, and fixed other files to make it + possible to build the documentation. Those fixes were + already distributed with Mozart 1.4.0. + + + + Keri Harris made significant contributions for linking + properly the DSS on Linux and Solaris. He also modified + makefiles to allow parallel make support. + + + + Denys Duchier contributed some patches to compile Mozart + on Linux. He also added the configure option + --enable-opt=native. + + +

+ + +
+ + + + <section id="section.m140.lang" proglang=oz> <title/Changes to the language/ <p>This new release provides a certain number of changes in the @@ -241,7 +327,7 @@ </section> - <section id="section.m140.fixes" proglang=sh> + <section id="section.m140.fixes" proglang=oz> <title/Bug fixes/ <p>A various number of small bug fixes have been incorporated to --- mozart-1.4.0.orig/doc/chm/configure +++ mozart-1.4.0/doc/chm/configure @@ -588,7 +588,7 @@ oz_tmp_dir=. oz_tmp_ok= - oz_for="contrib config.cache" + oz_for="config.cache" for oz_tmp1 in $oz_for; do for oz_tmp2 in $oz_tmp_dir \ $oz_tmp_dir/.. \ @@ -1242,9 +1242,22 @@ OZBUILDDATE=$oz_cv_build_date; + echo $ac_n "checking for build time""... $ac_c" 1>&6 +echo "configure:1247: checking for build time" >&5 +if eval "test \"`echo '$''{'oz_cv_build_time'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + oz_cv_build_time=`date +"%H%M%S"` +fi + +echo "$ac_t""$oz_cv_build_time" 1>&6 + OZBUILDTIME=$oz_cv_build_time; + + echo $ac_n "checking for OZLOADSEP""... $ac_c" 1>&6 -echo "configure:1248: checking for OZLOADSEP" >&5 +echo "configure:1261: checking for OZLOADSEP" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADSEP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1264,7 +1277,7 @@ echo $ac_n "checking for OZLOADWIN""... $ac_c" 1>&6 -echo "configure:1268: checking for OZLOADWIN" >&5 +echo "configure:1281: checking for OZLOADWIN" >&5 if eval "test \"`echo '$''{'oz_cv_OZLOADWIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1304,7 +1317,7 @@ if test -z "$WITH_GLOBAL_OZ"; then echo $ac_n "checking for --with-global-oz""... $ac_c" 1>&6 -echo "configure:1308: checking for --with-global-oz" >&5 +echo "configure:1321: checking for --with-global-oz" >&5 # Check whether --with-global-oz or --without-global-oz was given. if test "${with_global_oz+set}" = set; then withval="$with_global_oz" @@ -1338,7 +1351,7 @@ # Extract the first word of "gawk awk", so it can be a program name with args. set dummy gawk awk; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1342: checking for $ac_word" >&5 +echo "configure:1355: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1383,7 +1396,7 @@ echo $ac_n "checking for --with-stdlib""... $ac_c" 1>&6 -echo "configure:1387: checking for --with-stdlib" >&5 +echo "configure:1400: checking for --with-stdlib" >&5 # Check whether --with-stdlib or --without-stdlib was given. if test "${with_stdlib+set}" = set; then withval="$with_stdlib" @@ -1560,6 +1573,7 @@ s%@OZPLATFORM@%$OZPLATFORM%g s%@OZTOOL@%$OZTOOL%g s%@OZBUILDDATE@%$OZBUILDDATE%g +s%@OZBUILDTIME@%$OZBUILDTIME%g s%@PLATFORM@%$PLATFORM%g s%@OZLOADSEP@%$OZLOADSEP%g s%@OZLOADWIN@%$OZLOADWIN%g --- mozart-1.4.0.orig/doc/opi/opi.sgml +++ mozart-1.4.0/doc/opi/opi.sgml @@ -600,20 +600,14 @@ <P> <Index/<<oz>> shell script/ <Index/shell script<And><<oz>>/ +<!-- Changed for Debian/GNU: directory Oz is installed (?) --> In order to run the Mozart system, the &OPI; has to know its - installation path. This is normally found through the environment - variable <Var type=env/OZHOME/; it will have been set by the - <File/oz/ shell script if you started the &OPI; with it. - If it is not set, the value of the following variable will be used - instead. + installation path. <List> <Entry class=useroption><Span class=index/<<OZ-HOME>>/ - (default: <File>/usr/local/oz</File><Note foot>This default is - actually fixed at the time the Mozart system is configured and - built, so it might vary on your system.</Note>) + (default: <File>/usr/share/mozart</File>) <Item> - Directory where Oz is installed. Only used as fallback when - the environment variable <Var type=env/OZHOME/ is not set. + Directory where Oz is installed. </List> <Section> <Title/Running and Halting/ @@ -1383,10 +1377,13 @@ The default value of this variable is taken from the environment variable <Var type=env/OZ_LOAD/ if it is set, else it is set to + +Changed for Debian/GNU (but commented out anyway): Add Debian paths to cache + <<<prefix=x-oz\\://system/=?{oz-build-dir}/share/lib/: prefix=x-oz\\://system/=?{oz-build-dir}/share/tools/: prefix=x-oz\\://boot/=?{oz-build-dir}/platform/emulator/: -cache=~/.oz/cache:cache=?{oz-home}/cache>>> +cache=~/.oz/cache:cache=/usr/lib/mozart/cache:cache=/usr/share/mozart/cache>>> where ?{oz-home} stands for the value of the environment variable <Var type=env/OZHOME/. <Entry class=useroption><Span class=index/<<oz-root-functor>>/ --- mozart-1.4.0.orig/doc/foreign/foreign.sgml +++ mozart-1.4.0/doc/foreign/foreign.sgml @@ -382,7 +382,7 @@ macro <code /OZ_declareAtom/ used in our example makes use of this function. Type errors can be signaled using <code display > -OZ_Return OZ_typeError(int pos, char *expectedType); +OZ_Return OZ_typeError(int pos, const char *expectedType); </code> This is an exception signaling that the argument at position <code /pos/ is incorrect and the name of the expected type is <code /expectedType/. @@ -818,7 +818,7 @@ <entry><<OZ_CStringToInt>> <index class=module/OZ_CStringToInt/ <synopsis> - <code >OZ_Term OZ_CStringToInt(char *s)</code> + <code >OZ_Term OZ_CStringToInt(const char *s)</code> <item>Converts C string <code /s/ to an &Oz; integer. <code /s/ must be a valid integer in &Oz; syntax (see <ptr.extern to="ozdoc:notation">). @@ -943,7 +943,7 @@ <entry><<OZ_mkTupleC>> <index class=module/OZ_mkTupleC/ <synopsis> - <code >OZ_Term OZ_mkTupleC(char *label, int width, ...)</code> + <code >OZ_Term OZ_mkTupleC(const char *label, int width, ...)</code> <item>Analogously to <code /OZ_mkTuple/, but expects the label as a C string. @@ -1149,14 +1149,14 @@ <entry><<OZ_raiseC>> <index class=module/OZ_raiseC/ <synopsis> - <code >OZ_Return OZ_raiseC(char *label,int arity,...)</code> + <code >OZ_Return OZ_raiseC(const char *label,int arity,...)</code> <item>Raises an exception. The exception is created from the argument list just the way it is done by <code /OZ_mkTupleC/. <entry><<OZ_typeError>> <index class=module/OZ_typeError/ <synopsis> - <code >OZ_Return OZ_typeError(int pos, char *type)</code> + <code >OZ_Return OZ_typeError(int pos, const char *type)</code> <item>Raises an exception indicating that the argument at position <code /pos/ is of incorrect type. <code /type/ should be a string describing the expected type.