From 32e799db485107ba9d47fb4fb4cd44c9d6f57b8a Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 9 Apr 1999 18:04:08 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 54 + MANIFEST | 1 + Makefile.in | 6 + README.EXT | 85 +- README.EXT.jp | 2 +- ToDo | 2 - config.guess | 3 + config.sub | 2 + configure | 470 +++-- configure.in | 19 +- defines.h | 2 +- dir.c | 2 +- dln.c | 11 +- eval.c | 27 +- ext/extmk.rb.in | 10 +- ext/nkf/nkf.c | 2 +- ext/socket/extconf.rb | 3 + ext/socket/socket.c | 5 +- file.c | 19 +- hash.c | 6 +- io.c | 42 +- lib/debug.rb | 8 +- lib/ftools.rb | 11 + lib/ftplib.rb | 6 +- lib/mailread.rb | 2 +- lib/matrix.rb | 3 +- lib/mkmf.rb | 2 +- lib/weakref.rb | 9 +- missing/os2.c | 13 + pack.c | 12 +- parse.c | 4374 +++++++++++++++++++++-------------------- parse.y | 467 +++-- process.c | 16 +- range.c | 6 +- regex.c | 4 +- ruby.c | 6 + sample/list.rb | 2 +- sample/test.rb | 6 +- sample/trojan.rb | 3 +- signal.c | 6 + st.c | 2 +- time.c | 11 +- util.h | 19 +- version.h | 4 +- win32/config.h | 3 - 45 files changed, 3118 insertions(+), 2650 deletions(-) create mode 100644 missing/os2.c diff --git a/ChangeLog b/ChangeLog index 3eee11bdb8..e5bbfaab80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,59 @@ +Fri Apr 9 17:45:11 1999 Yukihiro Matsumoto + + * regex.c (re_match): should pop non-greedy stack items on + failure, after best_regs are fixed. + +Thu Apr 8 17:30:40 1999 Yukihiro Matsumoto + + * pack.c (PACK_LENGTH_ADJUST): need to adjust for `*' length. + +Tue Apr 6 23:28:44 1999 Yukihiro Matsumoto + + * parse.y (void_check): add void context checks. + +Mon Apr 5 12:23:42 1999 Yukihiro Matsumoto + + * time.c (time_s_at): should copy gmt-mode. + + * eval.c (eval_node): preserve ruby_eval_tree. + +Fri Apr 2 14:00:34 1999 NAKAMURA, Hiroshi + + * lib/debug.rb: wrong command interpreting. + +Fri Apr 2 11:46:22 1999 Yukihiro Matsumoto + + * version 1.3.2 + +Fri Apr 2 10:40:04 1999 Yukihiro Matsumoto + + * io.c (rb_io_s_pipe): forgot to define IO::pipe. + +Thu Apr 1 14:40:46 1999 Yukihiro Matsumoto + + * eval.c (assign): modified for rhs change. + + * parse.y (stmt): unparenthesisized method calls can be right hand + side expression of the assignment. + +Sat Mar 27 22:42:47 1999 Koji Arai + + * ext/nkf/nkf.c (rb_nkf_kconv): check size output_ctr before + decrement. + +Thu Mar 25 09:11:03 1999 Yukihiro Matsumoto + + * time.c (time_s_at): preserve gmt-mode for result. + + * parse.y (rb_compile_string): do not use cur_mid, use + compile_for_eval instead. + + * st.c (PTR_NOT_EQUAL): wrong logical condition. + Wed Mar 24 13:06:43 1999 Yukihiro Matsumoto + * parse.y (yycompile): should clear cur_mid after compilation. + * io.c (next_argv): need to check type for ARGV.shift. * eval.c (blk_copy_prev): need to preverse outer scope as well as diff --git a/MANIFEST b/MANIFEST index e32c4fc309..3fa09708fb 100644 --- a/MANIFEST +++ b/MANIFEST @@ -151,6 +151,7 @@ missing/isnan.c missing/memcmp.c missing/memmove.c missing/mkdir.c +missing/os2.c missing/strcasecmp.c missing/strchr.c missing/strdup.c diff --git a/Makefile.in b/Makefile.in index a9d84c8778..b6e37a5335 100644 --- a/Makefile.in +++ b/Makefile.in @@ -208,6 +208,12 @@ nt.o: @srcdir@/missing/nt.c x68.o: @srcdir@/missing/x68.c $(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/x68.c +os2.o: @srcdir@/missing/os2.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/os2.c + +dl_os2.o: @srcdir@/missing/dl_os2.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c @srcdir@/missing/dl_os2.c + # Prevent GNU make v3 from overflowing arg limit on SysV. .NOEXPORT: ### diff --git a/README.EXT b/README.EXT index 97b5b1d328..cc6c963baf 100644 --- a/README.EXT +++ b/README.EXT @@ -487,12 +487,10 @@ struct dbmdata { obj = Data_Make_Struct(class,struct dbmdata,0,free_dbm,dbmp); -- -ここではdbmstruct構造体へのポインタをDataにカプセル化してい -ます．DBM*を直接カプセル化しないのはclose()した時の処理を考 -えてのことです． +This code wraps dbmdata structure into Ruby object. We avoid wrapping +DBM* directly, because we want to cache size information. -Dataオブジェクトからdbmstruct構造体のポインタを取り出すため -に以下のマクロを使っています． +To retrieve dbmdata structure from Ruby object, we define the macro below: -- #define GetDBM(obj, dbmp) {\ @@ -501,14 +499,11 @@ Data } -- -ちょっと複雑なマクロですが，要するにdbmdata構造体のポインタ -の取り出しと，closeされているかどうかのチェックをまとめてい -るだけです． +This sort of complicated macro do the retrieving and close check for +the DBM. -DBMクラスにはたくさんメソッドがありますが，分類すると3種類の -引数の受け方があります．ひとつは引数の数が固定のもので，例と -してはdeleteメソッドがあります．deleteメソッドを実装している -fdbm_delete()はこのようになっています． +There are three kind of way to receiving method arguments. First, the +methods with fixed number of arguments receives arguments like this: -- static VALUE @@ -519,13 +514,11 @@ fdbm_delete(obj, keystr) } -- -引数の数が固定のタイプは第1引数がself，第2引数以降がメソッド -の引数となります． +The first argument of the C function is the self, the rest are the +arguments to the method. -引数の数が不定のものはCの配列で受けるものとRubyの配列で受け -るものとがあります．dbmモジュールの中で，Cの配列で受けるもの -はDBMのクラスメソッドであるopen()です．これを実装している関 -数fdbm_s_open()はこうなっています． +Second, the methods with arbtrary number of arguments receives +arguments like this: -- static VALUE @@ -542,22 +535,16 @@ fdbm_s_open(argc, argv, class) } -- -このタイプの関数は第1引数が与えられた引数の数，第2引数が与え -られた引数の入っている配列になります．selfは第3引数として与 -えられます． +The first argument is the number of method arguments. the second +argument is the C array of the method arguments. And the third +argument is the receiver of the method. -この配列で与えられた引数を解析するための関数がopen()でも使わ -れているrb_scan_args()です．第3引数に指定したフォーマットに -従い，第4変数以降に指定した変数に値を代入してくれます．この -フォーマットは，第1文字目が省略できない引数の数，第2文字目が -省略できる引数の数，第3文字目が対応する相手が無いあまりの引 -数があるかどうかを示す"*"です．2文字目と3文字目は省略できま -す．dbm.cの例では，フォーマットは"11"ですから，引数は最低1つ -で，2つまで許されるという意味になります．省略されている時の -変数の値はnil(C言語のレベルではQnil)になります． +You can use the function rb_scan_args() to check and retrieve the +arguments. For exapmle "11" means, the method requires at least one +argument, and at most receives two arguments. -Rubyの配列で引数を受け取るものはindexesがあります．実装はこ -うです． +The methods with arbtrary number of arguments can receives arguments +by Ruby's array, like this: -- static VALUE @@ -709,16 +696,13 @@ class library Appendix B. Ruby extension API reference -C言語からRubyの機能を利用するAPIは以下の通りである． - -** 型 +** Types VALUE -Rubyオブジェクトを表現する型．必要に応じてキャストして用いる． -組み込み型を表現するCの型はruby.hに記述してあるRで始まる構造 -体である．VALUE型をこれらにキャストするためにRで始まる構造体 -名を全て大文字にした名前のマクロが用意されている． +The type for Ruby object. Actual structures are defined in ruby.h, +such as struct RString, etc. To refer the values in structures, use +casting macros like RSTRING(obj). ** Variables and constants @@ -738,11 +722,10 @@ const: false object Data_Wrap_Struct(VALUE class, void (*mark)(), void (*free)(), void *sval) -Cの任意のポインタをカプセル化したRubyオブジェクトを返す．こ -のポインタがRubyからアクセスされなくなった時，freeで指定した -関数が呼ばれる．また，このポインタの指すデータが他のRubyオブ -ジェクトを指している場合，markに指定する関数でマークする必要 -がある． +Wrap C pointer into Ruby object. If object has references to other +Ruby object, they should be marked by using mark function during GC +process. Otherwise, mark should be 0. When this object is no longer +referred by anywhere, the pointer will be discarded by free function. Data_Make_Struct(class, type, mark, free, sval) @@ -857,15 +840,13 @@ rb_define_method(). Defines a singleton method. Arguments are same as rb_define_method(). - rb_scan_args(int atgc, VALUE *argv, char *fmt, ...) + rb_scan_args(int argc, VALUE *argv, char *fmt, ...) -argc,argv形式で与えられた引数を分解する．fmtは必須引数の数, -付加引数の数, 残りの引数があるかを指定する文字列で, "数字数 -字*"という形式である． 2 番目の数字と"*"はそれぞれ省略可能で -ある．必須引数が一つもない場合は0を指定する．第3引数以降は変 -数へのポインタで, 該当する要素がその変数に格納される．付加引 -数に対応する引数が与えられていない場合は変数にQnilが代入され -る． +Retrieve argument from argc, argv. The fmt is the format string for +the arguments, such as "12" for 1 non-optinal argument, 2 optinal +aruguments. If `*' appears at the end of fmt, it means the rest of +the arguments are assigned to corresponding variable, packed in +array. ** Invoking Ruby method diff --git a/README.EXT.jp b/README.EXT.jp index 1cec213d1f..dab85df08a 100644 --- a/README.EXT.jp +++ b/README.EXT.jp @@ -989,7 +989,7 @@ private 特異メソッドを定義する．引数はrb_define_method()と同じ． - rb_scan_args(int atgc, VALUE *argv, char *fmt, ...) + rb_scan_args(int argc, VALUE *argv, char *fmt, ...) argc,argv形式で与えられた引数を分解する．fmtは必須引数の数, 付加引数の数, 残りの引数があるかを指定する文字列で, "数字数 diff --git a/ToDo b/ToDo index 97fc29eb88..191a83e509 100644 --- a/ToDo +++ b/ToDo @@ -6,7 +6,6 @@ Language Spec. * multiple return values, yield values. maybe imcompatible * cascading method invocation. * def Class#method .. end -* exclusive range n...m (means n<=x&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:589: checking host system type" >&5 +echo "configure:591: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -616,7 +618,7 @@ fi if test "$fat_binary" = yes ; then echo $ac_n "checking target architecture""... $ac_c" 1>&6 -echo "configure:620: checking target architecture" >&5 +echo "configure:622: checking target architecture" >&5 case "$host_os" in rhapsody*) @@ -681,7 +683,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # 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:685: checking for $ac_word" >&5 +echo "configure:687: 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 @@ -711,7 +713,7 @@ if test -z "$CC"; then # 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:715: checking for $ac_word" >&5 +echo "configure:717: 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 @@ -762,7 +764,7 @@ fi # 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:766: checking for $ac_word" >&5 +echo "configure:768: 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 @@ -794,7 +796,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:798: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:800: 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. @@ -805,12 +807,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 809 "configure" +#line 811 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:816: \"$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 @@ -836,12 +838,12 @@ if test $ac_cv_prog_cc_works = no; then { 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:840: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:842: 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:845: checking whether we are using GNU C" >&5 +echo "configure:847: 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 @@ -850,7 +852,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:854: \"$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:856: \"$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 @@ -869,7 +871,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:873: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:875: 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 @@ -901,7 +903,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:905: checking how to run the C preprocessor" >&5 +echo "configure:907: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -916,13 +918,13 @@ else # 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:926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:928: \"$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 : @@ -933,13 +935,13 @@ else 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:943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:945: \"$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 : @@ -950,13 +952,13 @@ else 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:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:962: \"$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 : @@ -982,13 +984,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:986: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:988: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1006,7 +1008,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1032,7 +1034,7 @@ do # 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:1036: checking for $ac_word" >&5 +echo "configure:1038: 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 @@ -1065,7 +1067,7 @@ test -n "$YACC" || YACC="yacc" # 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:1069: checking for $ac_word" >&5 +echo "configure:1071: 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 @@ -1098,7 +1100,7 @@ do # 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:1102: checking for $ac_word" >&5 +echo "configure:1104: 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 @@ -1140,7 +1142,7 @@ test -n "$AR" || AR="ar" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1144: checking for a BSD compatible install" >&5 +echo "configure:1146: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1193,7 +1195,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1197: checking whether ln -s works" >&5 +echo "configure:1199: 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 @@ -1214,7 +1216,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1218: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1220: 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 @@ -1244,17 +1246,17 @@ fi # checks for UNIX variants that set C preprocessor variables ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1248: checking for minix/config.h" >&5 +echo "configure:1250: checking for minix/config.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:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1260: \"$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* @@ -1293,7 +1295,7 @@ fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1297: checking size of int" >&5 +echo "configure:1299: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1301,7 +1303,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1312,7 +1314,7 @@ main() exit(0); } EOF -if { (eval echo configure:1316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1332,7 +1334,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1336: checking size of short" >&5 +echo "configure:1338: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1340,7 +1342,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1351,7 +1353,7 @@ main() exit(0); } EOF -if { (eval echo configure:1355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1371,7 +1373,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1375: checking size of long" >&5 +echo "configure:1377: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1379,7 +1381,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1390,7 +1392,7 @@ main() exit(0); } EOF -if { (eval echo configure:1394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1410,7 +1412,7 @@ EOF echo $ac_n "checking size of void*""... $ac_c" 1>&6 -echo "configure:1414: checking size of void*" >&5 +echo "configure:1416: checking size of void*" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1418,7 +1420,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1429,7 +1431,7 @@ main() exit(0); } EOF -if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_voidp=`cat conftestval` else @@ -1449,7 +1451,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:1453: checking size of float" >&5 +echo "configure:1455: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1457,7 +1459,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1468,7 +1470,7 @@ main() exit(0); } EOF -if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -1488,7 +1490,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:1492: checking size of double" >&5 +echo "configure:1494: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1496,7 +1498,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < main() @@ -1507,7 +1509,7 @@ main() exit(0); } EOF -if { (eval echo configure:1511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -1528,19 +1530,19 @@ EOF echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:1532: checking for prototypes" >&5 +echo "configure:1534: checking for prototypes" >&5 if eval "test \"`echo '$''{'rb_cv_have_prototypes'+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:1546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_have_prototypes=yes else @@ -1561,19 +1563,19 @@ EOF fi echo $ac_n "checking token paste string""... $ac_c" 1>&6 -echo "configure:1565: checking token paste string" >&5 +echo "configure:1567: checking token paste string" >&5 if eval "test \"`echo '$''{'rb_cv_tokenpaste'+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:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_tokenpaste=ansi else @@ -1599,12 +1601,12 @@ EOF fi echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:1603: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:1605: checking for variable length prototypes and stdarg.h" >&5 if eval "test \"`echo '$''{'rb_cv_stdarg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1621,7 +1623,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:1625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_stdarg=yes else @@ -1642,19 +1644,19 @@ EOF fi echo $ac_n "checking for gcc attribute noreturn""... $ac_c" 1>&6 -echo "configure:1646: checking for gcc attribute noreturn" >&5 +echo "configure:1648: checking for gcc attribute noreturn" >&5 if eval "test \"`echo '$''{'rb_cv_have_attr_noreturn'+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:1660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_have_attr_noreturn=yes else @@ -1683,7 +1685,7 @@ beos*) ;; *) LIBS="-lm $LIBS";; esac echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:1687: checking for crypt in -lcrypt" >&5 +echo "configure:1689: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1691,7 +1693,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1708: \"$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 @@ -1730,7 +1732,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1734: checking for dlopen in -ldl" >&5 +echo "configure:1736: 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 @@ -1738,7 +1740,7 @@ else 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:1755: \"$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 @@ -1777,7 +1779,7 @@ else fi # Dynamic linking for SunOS/Solaris and SYSV echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1781: checking for shl_load in -ldld" >&5 +echo "configure:1783: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1785,7 +1787,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1802: \"$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 @@ -1824,7 +1826,7 @@ else fi # Dynamic linking for HP-UX echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:1828: checking for setlocale in -lxpg4" >&5 +echo "configure:1830: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1832,7 +1834,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1849: \"$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 @@ -1876,12 +1878,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1880: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1882: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1889,7 +1891,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1914,7 +1916,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1918: checking for opendir in -ldir" >&5 +echo "configure:1920: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'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 @@ -1922,7 +1924,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1939: \"$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 @@ -1955,7 +1957,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1959: checking for opendir in -lx" >&5 +echo "configure:1961: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'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 @@ -1963,7 +1965,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1980: \"$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 @@ -1997,12 +1999,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2001: checking for ANSI C header files" >&5 +echo "configure:2003: 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 @@ -2010,7 +2012,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2014: \"$ac_try\") 1>&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* @@ -2027,7 +2029,7 @@ rm -f conftest* 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 @@ -2045,7 +2047,7 @@ fi 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 @@ -2066,7 +2068,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2077,7 +2079,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2106,17 +2108,17 @@ for ac_hdr in stdlib.h unistd.h limits.h sys/file.h sys/ioctl.h pwd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2110: checking for $ac_hdr" >&5 +echo "configure:2112: 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:2120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2122: \"$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* @@ -2144,12 +2146,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2148: checking for uid_t in sys/types.h" >&5 +echo "configure:2150: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2178,12 +2180,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2182: checking for size_t" >&5 +echo "configure:2184: 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 @@ -2211,12 +2213,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:2215: checking for st_blksize in struct stat" >&5 +echo "configure:2217: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2224,7 +2226,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:2228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -2246,12 +2248,12 @@ fi save_LIBOJBS="$LIBOBJS" echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:2250: checking for st_blocks in struct stat" >&5 +echo "configure:2252: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2259,7 +2261,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:2263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -2283,12 +2285,12 @@ fi LIBOBJS="$save_LIBOBJS" echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2287: checking for st_rdev in struct stat" >&5 +echo "configure:2289: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2296,7 +2298,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2318,7 +2320,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2322: checking type of array argument to getgroups" >&5 +echo "configure:2324: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2326,7 +2328,7 @@ else ac_cv_type_getgroups=cross 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:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2365,7 +2367,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -2389,12 +2391,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2393: checking return type of signal handlers" >&5 +echo "configure:2395: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2411,7 +2413,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2432,19 +2434,19 @@ EOF # 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:2436: checking for working alloca.h" >&5 +echo "configure:2438: 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:2448: \"$ac_link\") 1>&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* ac_cv_header_alloca_h=yes else @@ -2465,12 +2467,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2469: checking for alloca" >&5 +echo "configure:2471: 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:2504: \"$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 @@ -2530,12 +2532,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2534: checking whether alloca needs Cray hooks" >&5 +echo "configure:2536: 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 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2564: checking for $ac_func" >&5 +echo "configure:2566: 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:2594: \"$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 @@ -2615,7 +2617,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2619: checking stack direction for C alloca" >&5 +echo "configure:2621: 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 @@ -2623,7 +2625,7 @@ else 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:2648: \"$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 @@ -2664,12 +2666,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2668: checking for pid_t" >&5 +echo "configure:2670: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2698,17 +2700,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:2702: checking for vfork.h" >&5 +echo "configure:2704: checking for vfork.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:2712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2714: \"$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* @@ -2733,18 +2735,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:2737: checking for working vfork" >&5 +echo "configure:2739: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:2743: checking for vfork" >&5 +echo "configure:2745: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+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:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -2789,7 +2791,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext < @@ -2884,7 +2886,7 @@ main() { } } EOF -if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -2907,7 +2909,7 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2911: checking for 8-bit clean memcmp" >&5 +echo "configure:2913: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2915,7 +2917,7 @@ else ac_cv_func_memcmp_clean=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:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2947,12 +2949,12 @@ for ac_func in dup2 memmove mkdir strcasecmp strerror strftime\ fnmatch isinf isnan finite do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2951: checking for $ac_func" >&5 +echo "configure:2953: 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:2981: \"$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 @@ -3008,12 +3010,12 @@ for ac_func in fmod killpg drand48 random wait4 waitpid syscall getcwd\ dlopen sigprocmask sigaction _setjmp setsid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3012: checking for $ac_func" >&5 +echo "configure:3014: 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:3042: \"$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 @@ -3061,12 +3063,12 @@ fi done echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3065: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3067: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3074,7 +3076,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3095,12 +3097,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3099: checking for tm_zone in struct tm" >&5 +echo "configure:3101: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3108,7 +3110,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3128,12 +3130,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3132: checking for tzname" >&5 +echo "configure:3134: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3143,7 +3145,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3166,14 +3168,14 @@ fi if test "$ac_cv_func_strftime" = no; then 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* cat >> confdefs.h <<\EOF #define HAVE_DAYLIGHT 1 @@ -3193,7 +3195,7 @@ EOF else echo $ac_n "checking for BSD signal semantics""... $ac_c" 1>&6 -echo "configure:3197: checking for BSD signal semantics" >&5 +echo "configure:3199: checking for BSD signal semantics" >&5 if eval "test \"`echo '$''{'rb_cv_bsd_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3201,7 +3203,7 @@ else rb_cv_bsd_signal=no else cat > conftest.$ac_ext < @@ -3223,7 +3225,7 @@ main() } EOF -if { (eval echo configure:3227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_bsd_signal=yes else @@ -3247,7 +3249,7 @@ EOF fi echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3251: checking whether getpgrp takes no argument" >&5 +echo "configure:3253: checking whether getpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3255,7 +3257,7 @@ else { echo "configure: error: cannot check getpgrp if 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:3316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getpgrp_void=yes else @@ -3334,7 +3336,7 @@ EOF fi echo $ac_n "checking whether setpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:3338: checking whether setpgrp takes no argument" >&5 +echo "configure:3340: checking whether setpgrp takes no argument" >&5 if eval "test \"`echo '$''{'ac_cv_func_setpgrp_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3342,7 +3344,7 @@ else { echo "configure: error: cannot check setpgrp if 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:3368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setpgrp_void=no else @@ -3387,7 +3389,7 @@ fi echo $ac_n "checking for working strtod""... $ac_c" 1>&6 -echo "configure:3391: checking for working strtod" >&5 +echo "configure:3393: checking for working strtod" >&5 if eval "test \"`echo '$''{'rb_cv_func_strtod'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3395,7 +3397,7 @@ else rb_cv_func_strtod=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:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_func_strtod=yes else @@ -3443,14 +3445,14 @@ echo "$ac_t""$rb_cv_func_strtod" 1>&6 test $rb_cv_func_strtod = no && LIBOBJS="$LIBOBJS strtod.o" echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3447: checking whether byte ordering is bigendian" >&5 +echo "configure:3449: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3461,11 +3463,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3476,7 +3478,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3496,7 +3498,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while 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:3515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3533,12 +3535,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3537: checking for working const" >&5 +echo "configure:3539: 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:3593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3608,14 +3610,14 @@ EOF fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3612: checking whether char is unsigned" >&5 +echo "configure:3614: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <&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:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3672,7 +3674,7 @@ fi echo $ac_n "checking whether right shift preserve sign bit""... $ac_c" 1>&6 -echo "configure:3676: checking whether right shift preserve sign bit" >&5 +echo "configure:3678: checking whether right shift preserve sign bit" >&5 if eval "test \"`echo '$''{'rb_cv_rshift_sign'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3680,7 +3682,7 @@ else rb_cv_rshift_sign=yes 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:3698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_rshift_sign=yes else @@ -3720,19 +3722,19 @@ EOF fi echo $ac_n "checking count field in FILE structures""... $ac_c" 1>&6 -echo "configure:3724: checking count field in FILE structures" >&5 +echo "configure:3726: checking count field in FILE structures" >&5 if eval "test \"`echo '$''{'rb_cv_fcnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_cnt = 0; ; return 0; } EOF -if { (eval echo configure:3736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_cnt" else @@ -3742,14 +3744,14 @@ fi rm -f conftest* if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->__cnt = 0; ; return 0; } EOF -if { (eval echo configure:3753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="__cnt" else @@ -3760,14 +3762,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->_r = 0; ; return 0; } EOF -if { (eval echo configure:3771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_r" else @@ -3778,16 +3780,34 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext < int main() { FILE *f = stdin; f->readCount = 0; ; return 0; } EOF -if { (eval echo configure:3789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="readCount" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +fi +if test "$rb_cv_fcnt" = ""; then + cat > conftest.$ac_ext < +int main() { +FILE *f = stdin; f->_rcount = 0; +; return 0; } +EOF +if { (eval echo configure:3809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + rb_cv_fcnt="_rcount" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 @@ -3824,7 +3844,7 @@ fi case "$host_os" in linux*) echo $ac_n "checking whether ELF binaries are produced""... $ac_c" 1>&6 -echo "configure:3828: checking whether ELF binaries are produced" >&5 +echo "configure:3848: checking whether ELF binaries are produced" >&5 if eval "test \"`echo '$''{'rb_cv_binary_elf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3832,7 +3852,7 @@ else rb_cv_binary_elf=yes 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:3876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_binary_elf=yes else @@ -3882,7 +3902,7 @@ STATIC= if test "$with_dln_a_out" != yes; then rb_cv_dlopen=unknown echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6 -echo "configure:3886: checking whether OS depend dynamic link works" >&5 +echo "configure:3906: checking whether OS depend dynamic link works" >&5 if test "$GCC" = yes; then case "$host_os" in nextstep*) ;; @@ -3989,12 +4009,12 @@ if test "$ac_cv_header_a_out_h" = yes; then if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then cat confdefs.h > config.h echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6 -echo "configure:3993: checking whether matz's dln works" >&5 +echo "configure:4013: checking whether matz's dln works" >&5 if eval "test \"`echo '$''{'rb_cv_dln_a_out'+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:4028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_dln_a_out=yes else @@ -4065,6 +4085,11 @@ EOF cat >> confdefs.h <<\EOF #define DLEXT ".dll" EOF +;; + os2_emx) DLEXT=o + cat >> confdefs.h <<\EOF +#define DLEXT ".o" +EOF ;; *) DLEXT=so cat >> confdefs.h <<\EOF @@ -4106,7 +4131,7 @@ fi case "$host_os" in human*) echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 -echo "configure:4110: checking for _harderr in -lsignal" >&5 +echo "configure:4135: checking for _harderr in -lsignal" >&5 ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4114,7 +4139,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsignal $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4154: \"$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 @@ -4153,7 +4178,7 @@ else fi echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 -echo "configure:4157: checking for hmemset in -lhmem" >&5 +echo "configure:4182: checking for hmemset in -lhmem" >&5 ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4161,7 +4186,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhmem $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4201: \"$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 @@ -4202,12 +4227,12 @@ fi for ac_func in select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4206: checking for $ac_func" >&5 +echo "configure:4231: 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:4259: \"$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 @@ -4255,7 +4280,7 @@ fi done echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6 -echo "configure:4259: checking whether PD libc _dtos18 fail to convert big number" >&5 +echo "configure:4284: checking whether PD libc _dtos18 fail to convert big number" >&5 if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4263,7 +4288,7 @@ else rb_cv_missing__dtos18=no else cat > conftest.$ac_ext < @@ -4275,7 +4300,7 @@ main () } EOF -if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing__dtos18=yes else @@ -4297,7 +4322,7 @@ EOF fi echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6 -echo "configure:4301: checking whether PD libc fconvert fail to round" >&5 +echo "configure:4326: checking whether PD libc fconvert fail to round" >&5 if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4305,7 +4330,7 @@ else rb_cv_missing_fconvert=no else cat > conftest.$ac_ext < @@ -4318,7 +4343,7 @@ main () } EOF -if { (eval echo configure:4322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then rb_cv_missing_fconvert=yes else @@ -4344,6 +4369,11 @@ EOF binsuffix=.x setup=Setup.x68 ;; + os2_emx) + LIBOBJS="$LIBOBJS os2.o" + binsuffix=.exe + setup=Setup.emx + ;; cygwin*) binsuffix=.exe setup=Setup @@ -4393,6 +4423,12 @@ fi LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so' +# Check whether --enable-enable-shared or --disable-enable-shared was given. +if test "${enable_enable_shared+set}" = set; then + enableval="$enable_enable_shared" + enable_shared=$enableval +fi + if test "$enable_shared" = 'yes'; then LIBRUBY='$(LIBRUBY_SO)' LIBRUBYARG='-L./ -l$(RUBY_INSTALL_NAME)' diff --git a/configure.in b/configure.in index 23ad2c23bf..8da240448e 100644 --- a/configure.in +++ b/configure.in @@ -293,7 +293,13 @@ fi if test "$rb_cv_fcnt" = ""; then AC_TRY_COMPILE([#include ], [FILE *f = stdin; f->readCount = 0;], - rb_cv_fcnt="readCount", rb_cv_fcnt="not found") + rb_cv_fcnt="readCount", ) +fi +dnl for emx0.9c +if test "$rb_cv_fcnt" = ""; then + AC_TRY_COMPILE([#include ], + [FILE *f = stdin; f->_rcount = 0;], + rb_cv_fcnt="_rcount", rb_cv_fcnt="not found") fi]) if test "$rb_cv_fcnt" = "not found"; then AC_MSG_RESULT([not found(OK if using GNU libc)]) @@ -493,6 +499,8 @@ else AC_DEFINE(DLEXT, ".bundle");; cygwin*) DLEXT=dll AC_DEFINE(DLEXT, ".dll");; + os2_emx) DLEXT=o + AC_DEFINE(DLEXT, ".o");; *) DLEXT=so AC_DEFINE(DLEXT, ".so");; esac @@ -573,6 +581,12 @@ rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no binsuffix=.x setup=Setup.x68 ;; + dnl OS/2 environment w/ Autoconf 2.1x for EMX + os2_emx) + LIBOBJS="$LIBOBJS os2.o" + binsuffix=.exe + setup=Setup.emx + ;; cygwin*) binsuffix=.exe setup=Setup @@ -622,6 +636,9 @@ fi LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so' +AC_ARG_ENABLE(enable-shared, + [--enable-shared build a shared library for Ruby. ], + [enable_shared=$enableval]) if test "$enable_shared" = 'yes'; then LIBRUBY='$(LIBRUBY_SO)' LIBRUBYARG='-L./ -l$(RUBY_INSTALL_NAME)' diff --git a/defines.h b/defines.h index d9b744b71f..f28724dc45 100644 --- a/defines.h +++ b/defines.h @@ -13,7 +13,7 @@ #define RUBY /* define RUBY_USE_EUC/SJIS for default kanji-code */ -#if defined(MSDOS) || defined(__CYGWIN32__) || defined(__human68k__) || defined(__MACOS__) +#if defined(MSDOS) || defined(__CYGWIN32__) || defined(__human68k__) || defined(__MACOS__) || defined(__EMX__) || defined(OS2) #undef RUBY_USE_EUC #define RUBY_USE_SJIS #else diff --git a/dir.c b/dir.c index c77294cd3b..31c574e536 100644 --- a/dir.c +++ b/dir.c @@ -248,7 +248,7 @@ static VALUE dir_s_chroot(dir, path) VALUE dir, path; { -#if !defined(DJGPP) && !defined(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) +#if !defined(DJGPP) && !defined(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) && !defined(__EMX__) rb_secure(2); Check_SafeStr(path); diff --git a/dln.c b/dln.c index 936dc7a98d..76e0785a58 100644 --- a/dln.c +++ b/dln.c @@ -1585,7 +1585,7 @@ dln_find_1(fname, path, exe_flag) if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0) return fname; if (exe_flag && strchr(fname, '/')) return fname; -#if defined(MSDOS) || defined(NT) || defined(__human68k__) +#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__) if (fname[0] == '\\') return fname; if (strlen(fname) > 2 && fname[1] == ':') return fname; if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0) @@ -1617,7 +1617,7 @@ dln_find_1(fname, path, exe_flag) */ if (*dp == '~' && (l == 1 || -#if defined(MSDOS) || defined(NT) || defined(__human68k__) +#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__) dp[1] == '\\' || #endif dp[1] == '/')) { @@ -1671,7 +1671,7 @@ dln_find_1(fname, path, exe_flag) if (eaccess(mac_fullpath, X_OK) == 0) return mac_fullpath; } #endif -#if defined(MSDOS) || defined(NT) || defined(__human68k__) +#if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__) if (exe_flag) { static const char *extension[] = { #if defined(MSDOS) @@ -1680,7 +1680,10 @@ dln_find_1(fname, path, exe_flag) ".btm", ".sh", ".ksh", ".pl", ".sed", #endif #else +#if defined(__EMX__) + ".exe", ".com", ".cmd", ".bat", ".r", ".R", ".x", ".X", ".bat", ".BAT", +#endif /*__EMX__*/ #endif (char *) NULL }; @@ -1703,7 +1706,7 @@ dln_find_1(fname, path, exe_flag) #endif } } -#endif /* MSDOS or NT or __human68k__ */ +#endif /* MSDOS or NT or __human68k__ or __EMX__ */ /* if not, and no other alternatives, life is bleak */ if (*ep == '\0') { return NULL; diff --git a/eval.c b/eval.c index 578b119864..00a0d6390e 100644 --- a/eval.c +++ b/eval.c @@ -940,22 +940,19 @@ static VALUE eval_node(self) VALUE self; { - VALUE result = Qnil; - NODE *tree; + NODE *beg_tree, *tree; - if (ruby_eval_tree_begin) { - tree = ruby_eval_tree_begin; + beg_tree = ruby_eval_tree_begin; + tree = ruby_eval_tree; + if (beg_tree) { ruby_eval_tree_begin = 0; - rb_eval(self, tree); + rb_eval(self, beg_tree); } - if (!ruby_eval_tree) return Qnil; - - tree = ruby_eval_tree; + if (!tree) return Qnil; ruby_eval_tree = 0; - result = rb_eval(self, tree); - return result; + return rb_eval(self, tree); } int ruby_in_eval; @@ -3258,7 +3255,7 @@ assign(self, lhs, val) { VALUE recv; recv = rb_eval(self, lhs->nd_recv); - if (!lhs->nd_args->nd_head) { + if (!lhs->nd_args) { /* attr set */ rb_call(CLASS_OF(recv), recv, lhs->nd_mid, 1, &val, 0); } @@ -3267,7 +3264,7 @@ assign(self, lhs, val) VALUE args; args = rb_eval(self, lhs->nd_args); - RARRAY(args)->ptr[RARRAY(args)->len-1] = val; + rb_ary_push(args, val); rb_call(CLASS_OF(recv), recv, lhs->nd_mid, RARRAY(args)->len, RARRAY(args)->ptr, 0); } @@ -4095,7 +4092,7 @@ compile(src) NODE *node; Check_Type(src, T_STRING); - node = rb_compile_string(ruby_sourcefile, src); + node = rb_compile_string("(eval)", src); if (ruby_nerrs == 0) return node; return 0; @@ -4165,7 +4162,7 @@ eval(self, src, scope, file, line) PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { ruby_sourcefile = file; - ruby_sourceline = line; + ruby_sourceline = line - 1; compile(src); if (ruby_nerrs > 0) { compile_error(0); @@ -4380,7 +4377,7 @@ is_absolute_path(path) const char *path; { if (path[0] == '/') return 1; -# if defined(MSDOS) || defined(NT) || defined(__human68k__) +# if defined(MSDOS) || defined(NT) || defined(__human68k__) || defined(__EMX__) if (path[0] == '\\') return 1; if (strlen(path) > 2 && path[1] == ':') return 1; # endif diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index d7f58d7b3b..7f4087472f 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -37,7 +37,13 @@ if $topdir !~ "^/" $topdir = Dir.pwd Dir.chdir save end -$dots = if "@INSTALL@" =~ /^\// then "" else "#{$topdir}/ext/" end + +## drive letter +if PLATFORM == "i386-os2_emx" then + $dots = "" +else + $dots = if "@INSTALL@" =~ /^\// then "" else "#{$topdir}/ext/" end +end if File.exist?("config.cache") then f = open("config.cache", "r") @@ -75,7 +81,7 @@ end LINK = "@CC@ -o conftest -I#$topdir -I#$top_srcdir -I@includedir@ #{CFLAGS} %s @LDFLAGS@ %s conftest.c @LIBS@ %s" CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir -I@includedir@ #{CFLAGS} %s conftest.c" -if /cygwin|mswin32|djgpp|mingw32|m68k-human/i =~ PLATFORM +if /cygwin|mswin32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ PLATFORM $null = open("nul", "w") else $null = open("/dev/null", "w") diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c index 2442973f2f..4c46948538 100644 --- a/ext/nkf/nkf.c +++ b/ext/nkf/nkf.c @@ -78,7 +78,7 @@ rb_nkf_kconv(obj, opt, src) } kanji_convert(NULL); - output_ctr--; + if (output_ctr > 0) output_ctr--; if (output[output_ctr] == '\0') { /* printf("([%c][%d])\n", output[output_ctr], output_ctr); diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 449d5a2785..5b3986735c 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -9,6 +9,9 @@ when /cygwin32/ when /beos/ test_func = "socket" have_library("net", "socket") +when /i386-os2_emx/ + test_func = "socket" + have_library("socket", "socket") else test_func = "socket" have_library("nsl", "t_open") diff --git a/ext/socket/socket.c b/ext/socket/socket.c index fcf8f18c1b..b7502e2915 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -19,6 +19,9 @@ #include #endif #include +#ifdef __EMX__ +#undef HAVE_SYS_UN_H +#endif #ifdef HAVE_SYS_UN_H #include #endif @@ -1244,7 +1247,7 @@ static VALUE sock_s_socketpair(class, domain, type, protocol) VALUE class, domain, type, protocol; { -#if !defined(NT) && !defined(__BEOS__) +#if !defined(NT) && !defined(__BEOS__) && !defined(__EMX__) int d, t, sp[2]; setup_domain_and_type(domain, &d, type, &t); diff --git a/file.c b/file.c index 0f68582e08..3369140586 100644 --- a/file.c +++ b/file.c @@ -64,6 +64,10 @@ char *strrchr _((const char*,const char)); char* strdup(char*); #endif +#ifdef __EMX__ +#define lstat stat +#endif + VALUE rb_cFile; VALUE rb_mFileTest; static VALUE sStat; @@ -190,7 +194,7 @@ static VALUE rb_file_s_lstat(obj, fname) VALUE obj, fname; { -#if !defined(MSDOS) && !defined(NT) +#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__) struct stat st; Check_SafeStr(fname); @@ -208,7 +212,7 @@ static VALUE rb_file_lstat(obj) VALUE obj; { -#if !defined(MSDOS) && !defined(NT) +#if !defined(MSDOS) && !defined(NT) OpenFile *fptr; struct stat st; @@ -779,7 +783,7 @@ rb_file_chmod(obj, vmode) mode = NUM2INT(vmode); GetOpenFile(obj, fptr); -#if defined(DJGPP) || defined(NT) || defined(USE_CWGUSI) || defined(__BEOS__) +#if defined(DJGPP) || defined(NT) || defined(USE_CWGUSI) || defined(__BEOS__) || defined(__EMX__) if (chmod(fptr->path, mode) == -1) rb_sys_fail(fptr->path); #else @@ -838,7 +842,7 @@ rb_file_chown(obj, owner, group) rb_secure(4); GetOpenFile(obj, fptr); -#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) || defined(USE_CWGUSI) +#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) || defined(USE_CWGUSI) || defined(__EMX__) if (chown(fptr->path, NUM2INT(owner), NUM2INT(group)) == -1) rb_sys_fail(fptr->path); #else @@ -952,7 +956,7 @@ static VALUE rb_file_s_symlink(obj, from, to) VALUE obj, from, to; { -#if !defined(MSDOS) && !defined(NT) +#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__) Check_SafeStr(from); Check_SafeStr(to); @@ -969,7 +973,7 @@ static VALUE rb_file_s_readlink(obj, path) VALUE obj, path; { -#if !defined(MSDOS) && !defined(NT) +#if !defined(MSDOS) && !defined(NT) && !defined(__EMX__) char buf[MAXPATHLEN]; int cc; @@ -1585,9 +1589,12 @@ Init_File() separator = rb_str_new2("/"); rb_define_const(rb_cFile, "Separator", separator); + rb_define_const(rb_cFile, "SEPARATOR", separator); rb_define_singleton_method(rb_cFile, "split", rb_file_s_split, 1); rb_define_singleton_method(rb_cFile, "join", rb_file_s_join, -2); + rb_define_const(rb_cFile, "PATH_SEPARATOR", rb_str_new2(RUBY_PATH_SEP)); + rb_define_method(rb_cIO, "stat", rb_io_stat, 0); /* this is IO's method */ rb_define_method(rb_cFile, "lstat", rb_file_lstat, 0); diff --git a/hash.c b/hash.c index f860c98a12..34b02df8ee 100644 --- a/hash.c +++ b/hash.c @@ -984,8 +984,8 @@ char *nam; void ruby_setenv(name, value) - char *name; - char *value; + const char *name; + const char *value; { #if defined(WIN32) && !defined(__CYGWIN32__) #ifdef USE_WIN32_RTL_ENV @@ -1092,7 +1092,7 @@ ruby_setenv(name, value) void ruby_unsetenv(name) - char *name; + const char *name; { ruby_setenv(name, 0); } diff --git a/io.c b/io.c index 5852bee244..81f1003aa4 100644 --- a/io.c +++ b/io.c @@ -40,7 +40,8 @@ struct timeval { #include -#ifdef HAVE_SYS_PARAM_H +/* EMX has sys/parm.h, but.. */ +#if defined(HAVE_SYS_PARAM_H) && !defined(__EMX__) # include #else # define NOFILE 64 @@ -185,7 +186,7 @@ io_write(io, str) rb_sys_fail(fptr->path); #else n = fwrite(RSTRING(str)->ptr, 1, RSTRING(str)->len, f); - if (n == 0 || ferror(f)) { + if (ferror(f)) { rb_sys_fail(fptr->path); } #endif @@ -236,7 +237,7 @@ rb_io_tell(io) GetOpenFile(io, fptr); pos = ftell(fptr->f); - if (ferror(fptr->f) != 0) rb_sys_fail(fptr->path); + if (ferror(fptr->f)) rb_sys_fail(fptr->path); return rb_int2inum(pos); } @@ -700,6 +701,20 @@ lineno_setter(val, id, var) *var = INT2FIX(gets_lineno); } +static VALUE +arg_set_lineno(argf, val) + VALUE argf, val; +{ + gets_lineno = NUM2INT(val); + lineno = INT2FIX(gets_lineno); +} + +static VALUE +arg_lineno() +{ + return lineno; +} + static VALUE rb_io_readline(argc, argv, io) int argc; @@ -763,7 +778,7 @@ rb_io_each_byte(io) if (c == EOF) break; rb_yield(INT2FIX(c & 0xff)); } - if (ferror(f) != 0) rb_sys_fail(fptr->path); + if (ferror(f)) rb_sys_fail(fptr->path); return Qnil; } @@ -785,7 +800,7 @@ rb_io_getc(io) TRAP_END; if (c == EOF) { - if (ferror(f) != 0) rb_sys_fail(fptr->path); + if (ferror(f)) rb_sys_fail(fptr->path); return Qnil; } return INT2FIX(c & 0xff); @@ -1012,7 +1027,8 @@ VALUE rb_io_binmode(io) VALUE io; { -#if defined(NT) || defined(DJGPP) || defined(__CYGWIN32__) || defined(__human68k__) || defined(USE_CWGUSI) +#if defined(NT) || defined(DJGPP) || defined(__CYGWIN32__)\ + || defined(__human68k__) || defined(USE_CWGUSI) || defined(__EMX__) OpenFile *fptr; GetOpenFile(io, fptr); @@ -1837,7 +1853,7 @@ rb_io_putc(io, ch) rb_io_check_writable(fptr); f = GetWriteFile(fptr); - if (fputc(c, f) == EOF || ferror(f)) + if (fputc(c, f) == EOF) rb_sys_fail(fptr->path); if (fptr->mode & FMODE_SYNC) fflush(f); @@ -2079,7 +2095,7 @@ next_argv() rb_str_cat(str, ruby_inplace_mode, strlen(ruby_inplace_mode)); #endif -#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN32__) || defined(NT) || defined(__human68k__) +#if defined(MSDOS) || defined(__BOW__) || defined(__CYGWIN32__) || defined(NT) || defined(__human68k__) || defined(__EMX__) (void)fclose(fr); (void)unlink(RSTRING(str)->ptr); (void)rename(fn, RSTRING(str)->ptr); @@ -2106,7 +2122,7 @@ next_argv() #endif } fw = rb_fopen(fn, "w"); -#if !defined(MSDOS) && !defined(__CYGWIN32__) && !(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) +#if !defined(MSDOS) && !defined(__CYGWIN32__) && !(NT) && !defined(__human68k__) && !defined(USE_CWGUSI) && !defined(__BEOS__) && !defined(__EMX__) fstat(fileno(fw), &st2); fchmod(fileno(fw), st.st_mode); if (st.st_uid!=st2.st_uid || st.st_gid!=st2.st_gid) { @@ -2947,6 +2963,7 @@ Init_IO() rb_define_singleton_method(rb_cIO, "foreach", rb_io_s_foreach, -1); rb_define_singleton_method(rb_cIO, "readlines", rb_io_s_readlines, -1); rb_define_singleton_method(rb_cIO, "select", rb_f_select, -1); + rb_define_singleton_method(rb_cIO, "pipe", rb_io_s_pipe, 0); rb_fs = rb_output_fs = Qnil; rb_define_hooked_variable("$;", &rb_fs, 0, rb_str_setter); @@ -3070,10 +3087,13 @@ Init_IO() rb_define_singleton_method(argf, "close", arg_close, 0); rb_define_singleton_method(argf, "closed?", arg_closed, 0); - filename = rb_str_new2("-"); - rb_define_readonly_variable("$FILENAME", &filename); + rb_define_singleton_method(argf, "lineno", arg_lineno, 0); + rb_define_singleton_method(argf, "lineno=", arg_set_lineno, 1); + file = rb_stdin; rb_global_variable(&file); + filename = rb_str_new2("-"); + rb_define_readonly_variable("$FILENAME", &filename); rb_define_virtual_variable("$-i", opt_i_get, opt_i_set); diff --git a/lib/debug.rb b/lib/debug.rb index 90270a3fe7..430d6472f6 100644 --- a/lib/debug.rb +++ b/lib/debug.rb @@ -92,16 +92,16 @@ class DEBUGGER__ when /^c(ont)?$/ return when /^s(tep)?\s*(\d+)?$/ - if $1 - lev = Integer($1) + if $2 + lev = Integer($2) else lev = 1 end @stop_next = lev return when /^n(ext)?\s*(\d+)?$/ - if $1 - lev = Integer($1) + if $2 + lev = Integer($2) else lev = 1 end diff --git a/lib/ftools.rb b/lib/ftools.rb index 103e27adbd..7bba07e9f1 100644 --- a/lib/ftools.rb +++ b/lib/ftools.rb @@ -24,6 +24,9 @@ class << File fsize = 1024 if fsize < 512 fsize = TOO_BIG if fsize > TOO_BIG + fmode = stat(from).mode + tpath = to + from = open(from, "r") from.binmode to = open(to, "w") @@ -47,6 +50,7 @@ class << File to.close from.close end + chmod(fmode, tpath) ret end @@ -66,10 +70,17 @@ class << File if PLATFORM =~ /djgpp|cygwin|mswin32/ and FileTest.file? to unlink to end + fstat = stat(from) begin rename from, to rescue + from_stat = stat(from) syscopy from, to and unlink from + utime(from_stat.atime, from_stat.mtime, to) + begin + chown(fstat.uid, fstat.gid, tpath) + rescue + end end end diff --git a/lib/ftplib.rb b/lib/ftplib.rb index 617d85899b..4cba9c50e5 100644 --- a/lib/ftplib.rb +++ b/lib/ftplib.rb @@ -293,11 +293,7 @@ class FTP buf = file.gets break if buf == nil if buf[-2, 2] != CRLF - if buf[-1] == ?\r or - buf[-1] == ?\n - buf = buf[0 .. -2] - end - buf = buf + CRLF + buf = buf.chop + CRLF end conn.write(buf) callback.call(buf) if use_callback diff --git a/lib/mailread.rb b/lib/mailread.rb index 5e46606c09..2edcca002a 100644 --- a/lib/mailread.rb +++ b/lib/mailread.rb @@ -43,6 +43,6 @@ class Mail end def [](field) - @header[field] + @header[field.capitalize] end end diff --git a/lib/matrix.rb b/lib/matrix.rb index 4767b4b545..bca6c40c95 100644 --- a/lib/matrix.rb +++ b/lib/matrix.rb @@ -221,7 +221,6 @@ class Matrix row[j] = values[j] row } - self rows(rows, FALSE) end @@ -875,7 +874,7 @@ class Vector # ARITHMETIC - def *(x) "is matrix or number" + def *(x) # is matrix or number case x when Numeric els = @elements.collect{|e| e * x} diff --git a/lib/mkmf.rb b/lib/mkmf.rb index df03b128fc..74de7beae3 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -55,7 +55,7 @@ CFLAGS = CONFIG["CFLAGS"] if PLATFORM == "m68k-human" CFLAGS.gsub!(/-c..-stack=[0-9]+ */, '') end -if /win32|djgpp|mingw32|m68k-human/i =~ PLATFORM +if /win32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ PLATFORM $null = open("nul", "w") else $null = open("/dev/null", "w") diff --git a/lib/weakref.rb b/lib/weakref.rb index d969553090..c6fe8cd21b 100644 --- a/lib/weakref.rb +++ b/lib/weakref.rb @@ -16,8 +16,8 @@ class WeakRef [ref,...] + ID_REV_MAP = {} # ref -> obj ObjectSpace.add_finalizer(lambda{|id| rids = ID_MAP[id] if rids @@ -29,10 +29,11 @@ class WeakRef (send - s)/sizeof(type)) { \ - tmp = len - (send - s) / sizeof(type); \ - len = (send - s) / sizeof(type); \ + if (len > (send-s)/sizeof(type)) { \ + if (!star) { \ + tmp = len - (send-s)/sizeof(type); \ + } \ + len = (send-s)/sizeof(type); \ } \ } while (0) @@ -933,7 +935,7 @@ pack_unpack(str, fmt) char *p, *pend; VALUE ary; char type; - int len, tmp; + int len, tmp, star; s = rb_str2cstr(str, &len); send = s + len; @@ -942,8 +944,10 @@ pack_unpack(str, fmt) ary = rb_ary_new(); while (p < pend) { + star = 0; type = *p++; if (*p == '*') { + star = 1; len = send - s; p++; } diff --git a/parse.c b/parse.c index 255cdc3542..4623005327 100644 --- a/parse.c +++ b/parse.c @@ -148,19 +148,23 @@ static enum lex_state { static int class_nest = 0; static int in_single = 0; +static int compile_for_eval = 0; static ID cur_mid = 0; -static int value_expr(); static NODE *cond(); static NODE *logop(); static NODE *newline_node(); static void fixpos(); +static int value_expr(); +static void void_expr(); +static void void_stmts(); + static NODE *block_append(); static NODE *list_append(); static NODE *list_concat(); -static NODE *arg_add(); +static NODE *arg_concat(); static NODE *call_op(); static int in_defined = 0; @@ -173,6 +177,7 @@ static NODE *assignable(); static NODE *aryset(); static NODE *attrset(); static void rb_backref_error(); +static NODE *node_assign(); static NODE *match_gen(); static void local_push(); @@ -193,7 +198,7 @@ static NODE *cur_cref; static void top_local_init(); static void top_local_setup(); -#line 111 "parse.y" +#line 116 "parse.y" typedef union { NODE *node; VALUE val; @@ -211,11 +216,11 @@ typedef union { -#define YYFINAL 619 +#define YYFINAL 644 #define YYFLAG -32768 #define YYNTBASE 118 -#define YYTRANSLATE(x) ((unsigned)(x) <= 345 ? yytranslate[x] : 207) +#define YYTRANSLATE(x) ((unsigned)(x) <= 345 ? yytranslate[x] : 210) static const char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 116, @@ -257,198 +262,199 @@ static const char yytranslate[] = { 0, #if YYDEBUG != 0 static const short yyprhs[] = { 0, - 0, 1, 4, 7, 8, 10, 14, 17, 20, 21, + 0, 1, 4, 7, 9, 11, 15, 18, 20, 21, 26, 30, 34, 38, 41, 45, 49, 53, 57, 58, - 64, 69, 71, 75, 78, 81, 83, 87, 91, 94, - 97, 99, 102, 107, 112, 115, 117, 121, 123, 127, - 129, 133, 136, 142, 145, 147, 151, 154, 156, 160, - 162, 167, 171, 173, 175, 177, 179, 181, 183, 185, - 187, 189, 190, 195, 197, 199, 201, 203, 205, 207, - 209, 211, 213, 215, 217, 219, 221, 223, 225, 227, - 229, 231, 233, 235, 237, 239, 241, 243, 245, 247, - 249, 251, 253, 255, 257, 259, 261, 263, 265, 267, - 269, 271, 273, 275, 277, 279, 281, 283, 285, 287, - 289, 291, 293, 295, 297, 299, 301, 303, 305, 307, - 309, 311, 313, 315, 317, 319, 321, 323, 325, 327, - 329, 330, 335, 342, 348, 354, 358, 359, 364, 371, - 377, 383, 387, 391, 395, 399, 403, 407, 411, 415, - 419, 422, 425, 429, 433, 437, 441, 445, 449, 453, - 457, 461, 465, 469, 473, 477, 480, 483, 487, 491, - 495, 499, 500, 505, 511, 513, 515, 516, 519, 521, - 524, 527, 533, 536, 539, 545, 550, 555, 563, 567, - 569, 572, 575, 576, 578, 579, 581, 585, 587, 592, - 595, 597, 598, 601, 603, 607, 610, 612, 614, 616, - 618, 620, 622, 624, 629, 633, 637, 642, 646, 648, - 653, 657, 659, 660, 667, 669, 672, 674, 677, 684, - 691, 697, 703, 708, 716, 723, 727, 728, 735, 736, - 744, 745, 751, 752, 759, 760, 761, 771, 773, 775, - 777, 779, 781, 783, 786, 788, 790, 792, 798, 799, - 802, 804, 806, 807, 810, 812, 816, 817, 823, 824, - 830, 832, 834, 836, 838, 840, 845, 852, 856, 863, - 867, 872, 874, 880, 882, 887, 890, 892, 894, 900, - 901, 902, 905, 907, 910, 912, 914, 916, 918, 920, - 922, 924, 926, 928, 930, 932, 934, 936, 938, 940, - 942, 944, 946, 948, 950, 951, 956, 959, 964, 967, - 974, 979, 984, 987, 992, 995, 998, 1000, 1001, 1003, - 1007, 1011, 1013, 1017, 1020, 1023, 1026, 1027, 1029, 1034, - 1035, 1038, 1041, 1043, 1047, 1051, 1053, 1055, 1057, 1059, - 1061, 1063, 1065, 1066, 1068, 1069, 1071, 1072, 1074, 1076, - 1078, 1080, 1082 + 64, 69, 73, 75, 79, 82, 85, 87, 91, 95, + 98, 101, 103, 106, 111, 116, 119, 121, 125, 127, + 131, 133, 137, 140, 146, 149, 151, 155, 158, 160, + 164, 166, 171, 175, 177, 179, 184, 188, 190, 192, + 194, 196, 198, 200, 202, 204, 206, 207, 212, 214, + 216, 218, 220, 222, 224, 226, 228, 230, 232, 234, + 236, 238, 240, 242, 244, 246, 248, 250, 252, 254, + 256, 258, 260, 262, 264, 266, 268, 270, 272, 274, + 276, 278, 280, 282, 284, 286, 288, 290, 292, 294, + 296, 298, 300, 302, 304, 306, 308, 310, 312, 314, + 316, 318, 320, 322, 324, 326, 328, 330, 332, 334, + 336, 338, 340, 342, 344, 346, 350, 351, 356, 363, + 369, 375, 379, 383, 387, 391, 395, 399, 403, 407, + 411, 414, 417, 421, 425, 429, 433, 437, 441, 445, + 449, 453, 457, 461, 465, 469, 472, 475, 479, 483, + 487, 491, 492, 497, 503, 505, 507, 509, 512, 514, + 517, 520, 526, 529, 532, 538, 543, 548, 556, 560, + 562, 565, 568, 570, 572, 574, 576, 580, 582, 587, + 590, 592, 594, 597, 599, 603, 606, 608, 610, 612, + 614, 616, 618, 620, 625, 629, 633, 638, 642, 644, + 649, 653, 655, 656, 663, 665, 668, 670, 673, 680, + 687, 693, 699, 704, 712, 719, 723, 724, 731, 732, + 740, 741, 747, 748, 755, 756, 757, 767, 769, 771, + 773, 775, 777, 779, 782, 784, 786, 788, 794, 796, + 799, 801, 803, 805, 808, 810, 814, 815, 821, 822, + 828, 830, 832, 834, 836, 838, 841, 846, 853, 857, + 864, 868, 873, 875, 877, 879, 885, 887, 892, 895, + 897, 899, 905, 907, 909, 912, 914, 917, 919, 921, + 923, 925, 927, 929, 931, 933, 935, 937, 939, 941, + 943, 945, 947, 949, 951, 953, 955, 957, 958, 963, + 966, 971, 974, 981, 986, 991, 994, 999, 1002, 1005, + 1007, 1008, 1010, 1014, 1018, 1020, 1024, 1027, 1030, 1033, + 1035, 1037, 1042, 1044, 1047, 1050, 1052, 1056, 1060, 1062, + 1064, 1066, 1068, 1070, 1072, 1074, 1075, 1077, 1078, 1080, + 1081, 1083, 1085, 1087, 1089, 1091, 1094 }; static const short yyrhs[] = { -1, - 119, 120, 0, 121, 202, 0, 0, 122, 0, 121, - 206, 122, 0, 1, 122, 0, 172, 168, 0, 0, - 41, 135, 123, 135, 0, 41, 49, 49, 0, 41, - 49, 61, 0, 41, 49, 60, 0, 6, 136, 0, + 119, 120, 0, 121, 204, 0, 209, 0, 122, 0, + 121, 208, 122, 0, 1, 122, 0, 173, 0, 0, + 41, 136, 123, 136, 0, 41, 49, 49, 0, 41, + 49, 61, 0, 41, 49, 60, 0, 6, 137, 0, 122, 37, 125, 0, 122, 38, 125, 0, 122, 39, 125, 0, 122, 40, 125, 0, 0, 43, 124, 107, - 120, 108, 0, 44, 107, 120, 108, 0, 125, 0, - 127, 91, 151, 0, 27, 152, 0, 28, 152, 0, - 126, 0, 125, 34, 125, 0, 125, 35, 125, 0, - 36, 125, 0, 104, 126, 0, 140, 0, 199, 146, - 0, 154, 109, 199, 146, 0, 154, 81, 199, 146, - 0, 29, 146, 0, 129, 0, 85, 128, 110, 0, - 129, 0, 85, 128, 110, 0, 131, 0, 131, 88, - 133, 0, 131, 132, 0, 131, 132, 111, 88, 133, - 0, 88, 133, 0, 133, 0, 85, 128, 110, 0, - 130, 111, 0, 130, 0, 132, 111, 130, 0, 182, - 0, 154, 112, 144, 113, 0, 154, 109, 47, 0, - 184, 0, 47, 0, 51, 0, 47, 0, 51, 0, - 48, 0, 138, 0, 139, 0, 135, 0, 0, 136, - 111, 137, 135, 0, 75, 0, 96, 0, 97, 0, - 98, 0, 65, 0, 66, 0, 67, 0, 73, 0, - 94, 0, 69, 0, 95, 0, 70, 0, 79, 0, - 80, 0, 99, 0, 100, 0, 101, 0, 88, 0, - 102, 0, 103, 0, 64, 0, 105, 0, 62, 0, - 63, 0, 77, 0, 78, 0, 114, 0, 45, 0, - 46, 0, 43, 0, 44, 0, 41, 0, 34, 0, - 7, 0, 21, 0, 16, 0, 3, 0, 5, 0, - 42, 0, 26, 0, 15, 0, 14, 0, 10, 0, - 9, 0, 33, 0, 20, 0, 37, 0, 25, 0, - 4, 0, 22, 0, 31, 0, 36, 0, 35, 0, - 23, 0, 8, 0, 24, 0, 27, 0, 30, 0, - 29, 0, 13, 0, 32, 0, 6, 0, 38, 0, - 40, 0, 17, 0, 39, 0, 28, 0, 0, 182, - 91, 141, 140, 0, 154, 112, 144, 113, 91, 140, - 0, 154, 109, 47, 91, 140, 0, 154, 109, 51, - 91, 140, 0, 184, 91, 140, 0, 0, 182, 83, - 142, 140, 0, 154, 112, 144, 113, 83, 140, 0, - 154, 109, 47, 83, 140, 0, 154, 109, 51, 83, - 140, 0, 184, 83, 140, 0, 140, 75, 140, 0, - 140, 76, 140, 0, 140, 99, 140, 0, 140, 100, - 140, 0, 140, 101, 140, 0, 140, 102, 140, 0, - 140, 103, 140, 0, 140, 64, 140, 0, 62, 140, - 0, 63, 140, 0, 140, 96, 140, 0, 140, 97, - 140, 0, 140, 98, 140, 0, 140, 65, 140, 0, - 140, 94, 140, 0, 140, 69, 140, 0, 140, 95, - 140, 0, 140, 70, 140, 0, 140, 66, 140, 0, - 140, 67, 140, 0, 140, 68, 140, 0, 140, 73, - 140, 0, 140, 74, 140, 0, 104, 140, 0, 105, - 140, 0, 140, 79, 140, 0, 140, 80, 140, 0, - 140, 71, 140, 0, 140, 72, 140, 0, 0, 42, - 203, 143, 140, 0, 140, 92, 140, 93, 140, 0, - 154, 0, 145, 0, 0, 146, 203, 0, 126, 0, - 150, 111, 0, 150, 148, 0, 150, 111, 88, 140, - 148, 0, 197, 111, 0, 197, 148, 0, 197, 111, - 88, 140, 148, 0, 150, 111, 197, 148, 0, 150, - 111, 197, 111, 0, 150, 111, 197, 111, 88, 140, - 148, 0, 88, 140, 148, 0, 147, 0, 89, 140, - 0, 111, 147, 0, 0, 150, 0, 0, 140, 0, - 150, 111, 140, 0, 150, 0, 150, 111, 88, 140, - 0, 88, 140, 0, 146, 0, 0, 150, 204, 0, - 179, 0, 154, 81, 51, 0, 82, 134, 0, 54, - 0, 57, 0, 55, 0, 58, 0, 59, 0, 183, - 0, 184, 0, 154, 112, 144, 113, 0, 86, 153, - 113, 0, 87, 196, 108, 0, 27, 115, 152, 110, - 0, 27, 115, 110, 0, 27, 0, 28, 115, 152, - 110, 0, 28, 115, 110, 0, 28, 0, 0, 42, - 203, 115, 155, 125, 110, 0, 48, 0, 199, 170, - 0, 173, 0, 173, 170, 0, 11, 125, 162, 120, - 164, 10, 0, 12, 125, 162, 120, 165, 10, 0, - 18, 125, 163, 120, 10, 0, 19, 125, 163, 120, - 10, 0, 16, 120, 174, 10, 0, 20, 166, 25, - 125, 163, 120, 10, 0, 7, 120, 177, 165, 178, - 10, 0, 85, 120, 110, 0, 0, 3, 134, 185, - 156, 120, 10, 0, 0, 3, 79, 125, 205, 157, - 120, 10, 0, 0, 4, 134, 158, 120, 10, 0, - 0, 5, 135, 159, 187, 120, 10, 0, 0, 0, - 5, 195, 201, 160, 135, 161, 187, 120, 10, 0, - 21, 0, 22, 0, 23, 0, 24, 0, 205, 0, - 13, 0, 205, 13, 0, 205, 0, 26, 0, 165, - 0, 14, 125, 162, 120, 164, 0, 0, 15, 120, - 0, 133, 0, 127, 0, 0, 96, 96, 0, 72, - 0, 96, 166, 96, 0, 0, 26, 169, 167, 120, - 10, 0, 0, 107, 171, 167, 120, 108, 0, 47, - 0, 51, 0, 48, 0, 173, 0, 126, 0, 199, - 115, 145, 110, 0, 154, 109, 199, 115, 145, 110, - 0, 154, 109, 199, 0, 154, 81, 199, 115, 145, - 110, 0, 154, 81, 200, 0, 29, 115, 145, 110, - 0, 29, 0, 17, 175, 162, 120, 176, 0, 150, - 0, 150, 111, 88, 140, 0, 88, 140, 0, 165, - 0, 174, 0, 8, 149, 163, 120, 177, 0, 0, - 0, 9, 120, 0, 181, 0, 90, 180, 0, 56, - 0, 135, 0, 50, 0, 49, 0, 52, 0, 53, - 0, 47, 0, 50, 0, 49, 0, 51, 0, 31, - 0, 30, 0, 32, 0, 33, 0, 46, 0, 45, - 0, 182, 0, 60, 0, 61, 0, 205, 0, 0, - 95, 186, 125, 205, 0, 1, 205, 0, 115, 188, - 203, 110, 0, 188, 205, 0, 189, 111, 191, 111, - 192, 194, 0, 189, 111, 191, 194, 0, 189, 111, - 192, 194, 0, 189, 194, 0, 191, 111, 192, 194, - 0, 191, 194, 0, 192, 194, 0, 193, 0, 0, - 47, 0, 189, 111, 47, 0, 47, 91, 140, 0, - 190, 0, 191, 111, 190, 0, 88, 47, 0, 89, - 47, 0, 111, 193, 0, 0, 183, 0, 115, 125, - 203, 110, 0, 0, 197, 204, 0, 150, 204, 0, - 198, 0, 197, 111, 198, 0, 140, 84, 140, 0, - 47, 0, 51, 0, 48, 0, 47, 0, 48, 0, - 109, 0, 81, 0, 0, 206, 0, 0, 116, 0, - 0, 116, 0, 111, 0, 117, 0, 116, 0, 205, - 0, 206, 117, 0 + 120, 108, 0, 44, 107, 120, 108, 0, 134, 91, + 175, 0, 125, 0, 127, 91, 151, 0, 27, 152, + 0, 28, 152, 0, 126, 0, 125, 34, 125, 0, + 125, 35, 125, 0, 36, 125, 0, 104, 126, 0, + 141, 0, 201, 146, 0, 154, 109, 201, 146, 0, + 154, 81, 201, 146, 0, 29, 146, 0, 129, 0, + 85, 128, 110, 0, 129, 0, 85, 128, 110, 0, + 131, 0, 131, 88, 134, 0, 131, 132, 0, 131, + 132, 111, 88, 134, 0, 88, 133, 0, 133, 0, + 85, 128, 110, 0, 130, 111, 0, 130, 0, 132, + 111, 130, 0, 184, 0, 154, 112, 144, 113, 0, + 154, 109, 47, 0, 186, 0, 184, 0, 154, 112, + 144, 113, 0, 154, 109, 47, 0, 186, 0, 47, + 0, 51, 0, 47, 0, 51, 0, 48, 0, 139, + 0, 140, 0, 136, 0, 0, 137, 111, 138, 136, + 0, 75, 0, 96, 0, 97, 0, 98, 0, 65, + 0, 66, 0, 67, 0, 73, 0, 94, 0, 69, + 0, 95, 0, 70, 0, 79, 0, 80, 0, 99, + 0, 100, 0, 101, 0, 88, 0, 102, 0, 103, + 0, 64, 0, 105, 0, 62, 0, 63, 0, 77, + 0, 78, 0, 114, 0, 45, 0, 46, 0, 43, + 0, 44, 0, 41, 0, 34, 0, 7, 0, 21, + 0, 16, 0, 3, 0, 5, 0, 42, 0, 26, + 0, 15, 0, 14, 0, 10, 0, 9, 0, 33, + 0, 20, 0, 37, 0, 25, 0, 4, 0, 22, + 0, 31, 0, 36, 0, 35, 0, 23, 0, 8, + 0, 24, 0, 27, 0, 30, 0, 29, 0, 13, + 0, 32, 0, 6, 0, 38, 0, 40, 0, 17, + 0, 39, 0, 28, 0, 134, 91, 141, 0, 0, + 184, 83, 142, 141, 0, 154, 112, 144, 113, 83, + 141, 0, 154, 109, 47, 83, 141, 0, 154, 109, + 51, 83, 141, 0, 186, 83, 141, 0, 141, 75, + 141, 0, 141, 76, 141, 0, 141, 99, 141, 0, + 141, 100, 141, 0, 141, 101, 141, 0, 141, 102, + 141, 0, 141, 103, 141, 0, 141, 64, 141, 0, + 62, 141, 0, 63, 141, 0, 141, 96, 141, 0, + 141, 97, 141, 0, 141, 98, 141, 0, 141, 65, + 141, 0, 141, 94, 141, 0, 141, 69, 141, 0, + 141, 95, 141, 0, 141, 70, 141, 0, 141, 66, + 141, 0, 141, 67, 141, 0, 141, 68, 141, 0, + 141, 73, 141, 0, 141, 74, 141, 0, 104, 141, + 0, 105, 141, 0, 141, 79, 141, 0, 141, 80, + 141, 0, 141, 71, 141, 0, 141, 72, 141, 0, + 0, 42, 205, 143, 141, 0, 141, 92, 141, 93, + 141, 0, 154, 0, 145, 0, 209, 0, 146, 205, + 0, 126, 0, 150, 111, 0, 150, 148, 0, 150, + 111, 88, 141, 148, 0, 199, 111, 0, 199, 148, + 0, 199, 111, 88, 141, 148, 0, 150, 111, 199, + 148, 0, 150, 111, 199, 111, 0, 150, 111, 199, + 111, 88, 141, 148, 0, 88, 141, 148, 0, 147, + 0, 89, 141, 0, 111, 147, 0, 209, 0, 150, + 0, 209, 0, 141, 0, 150, 111, 141, 0, 150, + 0, 150, 111, 88, 141, 0, 88, 141, 0, 146, + 0, 209, 0, 150, 206, 0, 181, 0, 154, 81, + 51, 0, 82, 135, 0, 54, 0, 57, 0, 55, + 0, 58, 0, 59, 0, 185, 0, 186, 0, 154, + 112, 144, 113, 0, 86, 153, 113, 0, 87, 198, + 108, 0, 27, 115, 152, 110, 0, 27, 115, 110, + 0, 27, 0, 28, 115, 152, 110, 0, 28, 115, + 110, 0, 28, 0, 0, 42, 205, 115, 155, 125, + 110, 0, 48, 0, 201, 170, 0, 174, 0, 174, + 170, 0, 11, 125, 162, 120, 164, 10, 0, 12, + 125, 162, 120, 165, 10, 0, 18, 125, 163, 120, + 10, 0, 19, 125, 163, 120, 10, 0, 16, 120, + 176, 10, 0, 20, 166, 25, 125, 163, 120, 10, + 0, 7, 120, 179, 165, 180, 10, 0, 85, 120, + 110, 0, 0, 3, 135, 187, 156, 120, 10, 0, + 0, 3, 79, 125, 207, 157, 120, 10, 0, 0, + 4, 135, 158, 120, 10, 0, 0, 5, 136, 159, + 189, 120, 10, 0, 0, 0, 5, 197, 203, 160, + 136, 161, 189, 120, 10, 0, 21, 0, 22, 0, + 23, 0, 24, 0, 207, 0, 13, 0, 207, 13, + 0, 207, 0, 26, 0, 165, 0, 14, 125, 162, + 120, 164, 0, 209, 0, 15, 120, 0, 134, 0, + 127, 0, 209, 0, 96, 96, 0, 72, 0, 96, + 166, 96, 0, 0, 26, 169, 167, 120, 10, 0, + 0, 107, 171, 167, 120, 108, 0, 47, 0, 51, + 0, 48, 0, 174, 0, 126, 0, 172, 168, 0, + 201, 115, 145, 110, 0, 154, 109, 201, 115, 145, + 110, 0, 154, 109, 201, 0, 154, 81, 201, 115, + 145, 110, 0, 154, 81, 202, 0, 29, 115, 145, + 110, 0, 29, 0, 173, 0, 126, 0, 17, 177, + 162, 120, 178, 0, 150, 0, 150, 111, 88, 141, + 0, 88, 141, 0, 165, 0, 176, 0, 8, 149, + 163, 120, 179, 0, 209, 0, 209, 0, 9, 120, + 0, 183, 0, 90, 182, 0, 56, 0, 136, 0, + 50, 0, 49, 0, 52, 0, 53, 0, 47, 0, + 50, 0, 49, 0, 51, 0, 31, 0, 30, 0, + 32, 0, 33, 0, 46, 0, 45, 0, 184, 0, + 60, 0, 61, 0, 207, 0, 0, 95, 188, 125, + 207, 0, 1, 207, 0, 115, 190, 205, 110, 0, + 190, 207, 0, 191, 111, 193, 111, 194, 196, 0, + 191, 111, 193, 196, 0, 191, 111, 194, 196, 0, + 191, 196, 0, 193, 111, 194, 196, 0, 193, 196, + 0, 194, 196, 0, 195, 0, 0, 47, 0, 191, + 111, 47, 0, 47, 91, 141, 0, 192, 0, 193, + 111, 192, 0, 88, 47, 0, 89, 47, 0, 111, + 195, 0, 209, 0, 185, 0, 115, 125, 205, 110, + 0, 209, 0, 199, 206, 0, 150, 206, 0, 200, + 0, 199, 111, 200, 0, 141, 84, 141, 0, 47, + 0, 51, 0, 48, 0, 47, 0, 48, 0, 109, + 0, 81, 0, 0, 208, 0, 0, 116, 0, 0, + 116, 0, 111, 0, 117, 0, 116, 0, 207, 0, + 208, 117, 0, 0 }; #endif #if YYDEBUG != 0 static const short yyrline[] = { 0, - 233, 242, 250, 252, 256, 260, 264, 269, 278, 279, - 284, 290, 299, 304, 310, 316, 322, 332, 342, 350, - 357, 365, 367, 373, 380, 385, 386, 390, 394, 399, - 404, 406, 411, 417, 423, 431, 432, 437, 438, 443, - 447, 451, 455, 459, 464, 465, 470, 475, 479, 484, - 488, 492, 496, 502, 506, 508, 509, 510, 511, 516, - 522, 526, 527, 531, 532, 533, 534, 535, 536, 537, - 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, - 548, 549, 550, 551, 552, 553, 554, 555, 556, 557, - 559, 559, 559, 559, 560, 560, 560, 560, 560, 560, - 560, 561, 561, 561, 561, 561, 561, 561, 562, 562, - 562, 562, 562, 562, 562, 563, 563, 563, 563, 563, - 563, 563, 564, 564, 564, 564, 564, 564, 565, 565, - 567, 568, 575, 580, 585, 590, 596, 597, 612, 627, - 638, 649, 654, 658, 662, 666, 670, 674, 678, 682, - 686, 690, 694, 698, 702, 706, 710, 714, 718, 722, - 726, 730, 734, 738, 742, 746, 751, 755, 759, 763, - 767, 771, 772, 776, 782, 787, 795, 799, 801, 806, - 810, 814, 819, 823, 828, 833, 838, 842, 847, 852, - 854, 860, 864, 869, 870, 875, 880, 886, 898, 903, - 909, 923, 927, 929, 933, 938, 942, 946, 947, 951, - 952, 953, 954, 955, 960, 968, 972, 979, 985, 991, - 996, 1000, 1004, 1004, 1009, 1013, 1018, 1019, 1028, 1037, - 1046, 1054, 1062, 1070, 1078, 1098, 1102, 1112, 1120, 1127, - 1135, 1144, 1152, 1160, 1169, 1170, 1177, 1185, 1189, 1193, - 1197, 1202, 1203, 1204, 1206, 1207, 1209, 1210, 1219, 1223, - 1228, 1229, 1231, 1235, 1239, 1243, 1248, 1253, 1261, 1266, - 1273, 1277, 1281, 1285, 1286, 1288, 1293, 1299, 1305, 1311, - 1316, 1322, 1330, 1337, 1338, 1343, 1349, 1350, 1352, 1359, - 1364, 1368, 1373, 1374, 1378, 1380, 1381, 1382, 1384, 1385, - 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, - 1398, 1403, 1404, 1406, 1410, 1414, 1418, 1420, 1425, 1430, - 1434, 1438, 1442, 1446, 1450, 1454, 1458, 1462, 1467, 1474, - 1482, 1489, 1494, 1499, 1506, 1511, 1515, 1520, 1533, 1551, - 1555, 1559, 1567, 1568, 1573, 1578, 1579, 1580, 1582, 1583, - 1585, 1586, 1588, 1589, 1591, 1592, 1594, 1595, 1596, 1598, - 1599, 1601, 1602 + 238, 247, 265, 271, 272, 276, 280, 285, 286, 287, + 292, 298, 307, 312, 318, 324, 330, 340, 350, 357, + 364, 372, 377, 379, 385, 392, 397, 398, 402, 406, + 411, 416, 418, 423, 429, 435, 443, 444, 449, 450, + 455, 459, 463, 467, 471, 476, 477, 482, 487, 491, + 496, 500, 504, 508, 514, 518, 522, 526, 532, 536, + 538, 539, 540, 541, 546, 552, 556, 557, 561, 562, + 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, + 573, 574, 575, 576, 577, 578, 579, 580, 581, 582, + 583, 584, 585, 586, 587, 589, 589, 589, 589, 590, + 590, 590, 590, 590, 590, 590, 591, 591, 591, 591, + 591, 591, 591, 592, 592, 592, 592, 592, 592, 592, + 593, 593, 593, 593, 593, 593, 593, 594, 594, 594, + 594, 594, 594, 595, 595, 597, 602, 603, 618, 633, + 644, 655, 660, 664, 668, 672, 676, 680, 684, 688, + 692, 696, 700, 704, 708, 712, 716, 720, 724, 728, + 732, 736, 740, 744, 748, 752, 757, 761, 765, 769, + 773, 777, 778, 782, 788, 793, 801, 802, 804, 809, + 813, 817, 822, 826, 831, 836, 841, 845, 850, 855, + 857, 863, 867, 869, 870, 872, 877, 883, 895, 900, + 906, 920, 921, 923, 927, 932, 936, 940, 941, 945, + 946, 947, 948, 949, 954, 962, 966, 973, 979, 985, + 990, 994, 998, 998, 1003, 1007, 1012, 1013, 1022, 1031, + 1040, 1048, 1056, 1064, 1072, 1092, 1096, 1106, 1114, 1121, + 1129, 1138, 1146, 1154, 1163, 1164, 1171, 1179, 1183, 1187, + 1191, 1196, 1197, 1198, 1200, 1201, 1203, 1204, 1213, 1214, + 1219, 1220, 1222, 1223, 1227, 1231, 1236, 1241, 1249, 1254, + 1261, 1265, 1269, 1273, 1274, 1276, 1286, 1291, 1297, 1303, + 1309, 1314, 1321, 1330, 1331, 1333, 1340, 1341, 1346, 1352, + 1353, 1355, 1362, 1364, 1365, 1370, 1371, 1375, 1377, 1378, + 1379, 1381, 1382, 1384, 1385, 1386, 1387, 1388, 1389, 1390, + 1391, 1392, 1393, 1395, 1400, 1401, 1403, 1407, 1411, 1415, + 1417, 1422, 1427, 1431, 1435, 1439, 1443, 1447, 1451, 1455, + 1459, 1464, 1471, 1479, 1486, 1491, 1496, 1503, 1508, 1512, + 1514, 1527, 1545, 1546, 1550, 1558, 1559, 1564, 1569, 1570, + 1571, 1573, 1574, 1576, 1577, 1579, 1580, 1582, 1583, 1585, + 1586, 1587, 1589, 1590, 1592, 1593, 1595 }; #endif @@ -469,38 +475,39 @@ static const char * const yytname[] = { "$","error","$undefined.","kCLASS", "'='","'?'","':'","'>'","'<'","'|'","'^'","'&'","'+'","'-'","'*'","'/'","'%'", "'!'","'~'","LAST_TOKEN","'{'","'}'","'.'","')'","','","'['","']'","'`'","'('", "'\\n'","';'","program","@1","compstmt","stmts","stmt","@2","@3","expr","command_call", -"mlhs","mlhs_entry","mlhs_basic","mlhs_item","mlhs_head","mlhs_tail","lhs","cname", -"fname","undef_list","@4","op","reswords","arg","@5","@6","@7","aref_args","opt_call_args", -"call_args","block_arg","opt_block_arg","opt_list","args","mrhs","ret_args", -"array","primary","@8","@9","@10","@11","@12","@13","@14","then","do","if_tail", -"opt_else","iter_var","opt_iter_var","iter_do_block","@15","iter_block","@16", -"iterator","method_call","case_body","when_args","cases","rescue","ensure","literal", -"symbol","numeric","variable","var_ref","backref","superclass","@17","f_arglist", -"f_args","f_arg","f_opt","f_optarg","f_rest_arg","f_block_arg","opt_f_block_arg", -"singleton","assoc_list","assocs","assoc","operation","operation2","dot_or_colon", -"opt_terms","opt_nl","trailer","term","terms", NULL +"mlhs","mlhs_entry","mlhs_basic","mlhs_item","mlhs_head","mlhs_tail","mlhs_node", +"lhs","cname","fname","undef_list","@4","op","reswords","arg","@5","@6","aref_args", +"opt_call_args","call_args","block_arg","opt_block_arg","opt_list","args","mrhs", +"ret_args","array","primary","@7","@8","@9","@10","@11","@12","@13","then","do", +"if_tail","opt_else","block_var","opt_block_var","do_block","@14","brace_block", +"@15","generic_call","block_call","method_call","stmt_rhs","case_body","when_args", +"cases","rescue","ensure","literal","symbol","numeric","variable","var_ref", +"backref","superclass","@16","f_arglist","f_args","f_arg","f_opt","f_optarg", +"f_rest_arg","f_block_arg","opt_f_block_arg","singleton","assoc_list","assocs", +"assoc","operation","operation2","dot_or_colon","opt_terms","opt_nl","trailer", +"term","terms","none", NULL }; #endif static const short yyr1[] = { 0, 119, 118, 120, 121, 121, 121, 121, 122, 123, 122, 122, 122, 122, 122, 122, 122, 122, 122, 124, 122, - 122, 122, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 126, 126, 126, 126, 127, 127, 128, 128, 129, - 129, 129, 129, 129, 130, 130, 131, 132, 132, 133, - 133, 133, 133, 134, 134, 135, 135, 135, 135, 135, - 136, 137, 136, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, - 138, 138, 138, 138, 138, 138, 138, 138, 138, 138, + 122, 122, 122, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 126, 126, 126, 126, 127, 127, 128, 128, + 129, 129, 129, 129, 129, 130, 130, 131, 132, 132, + 133, 133, 133, 133, 134, 134, 134, 134, 135, 135, + 136, 136, 136, 136, 136, 137, 138, 137, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 139, 139, 139, 139, 139, 139, 139, 139, 139, 139, - 141, 140, 140, 140, 140, 140, 142, 140, 140, 140, + 139, 139, 139, 139, 139, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 143, 140, 140, 140, 144, 145, 145, 146, 146, + 140, 140, 140, 140, 140, 141, 142, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 141, 141, 141, 141, 141, 141, 141, 141, 141, + 141, 143, 141, 141, 141, 144, 145, 145, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 146, 147, 148, 148, 149, 149, 150, 150, 151, 151, 151, 152, 153, 153, 154, 154, 154, 154, 154, 154, 154, @@ -510,423 +517,523 @@ static const short yyr1[] = { 0, 158, 154, 159, 154, 160, 161, 154, 154, 154, 154, 154, 162, 162, 162, 163, 163, 164, 164, 165, 165, 166, 166, 167, 167, 167, 167, 169, 168, 171, 170, - 172, 172, 172, 172, 172, 173, 173, 173, 173, 173, - 173, 173, 174, 175, 175, 175, 176, 176, 177, 177, - 178, 178, 179, 179, 179, 180, 180, 180, 181, 181, - 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, - 183, 184, 184, 185, 186, 185, 185, 187, 187, 188, - 188, 188, 188, 188, 188, 188, 188, 188, 189, 189, - 190, 191, 191, 192, 193, 194, 194, 195, 195, 196, - 196, 196, 197, 197, 198, 199, 199, 199, 200, 200, - 201, 201, 202, 202, 203, 203, 204, 204, 204, 205, - 205, 206, 206 + 172, 172, 172, 172, 172, 173, 174, 174, 174, 174, + 174, 174, 174, 175, 175, 176, 177, 177, 177, 178, + 178, 179, 179, 180, 180, 181, 181, 181, 182, 182, + 182, 183, 183, 184, 184, 184, 184, 184, 184, 184, + 184, 184, 184, 185, 186, 186, 187, 188, 187, 187, + 189, 189, 190, 190, 190, 190, 190, 190, 190, 190, + 190, 191, 191, 192, 193, 193, 194, 195, 196, 196, + 197, 197, 198, 198, 198, 199, 199, 200, 201, 201, + 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, + 206, 206, 207, 207, 208, 208, 209 }; static const short yyr2[] = { 0, - 0, 2, 2, 0, 1, 3, 2, 2, 0, 4, + 0, 2, 2, 1, 1, 3, 2, 1, 0, 4, 3, 3, 3, 2, 3, 3, 3, 3, 0, 5, - 4, 1, 3, 2, 2, 1, 3, 3, 2, 2, - 1, 2, 4, 4, 2, 1, 3, 1, 3, 1, - 3, 2, 5, 2, 1, 3, 2, 1, 3, 1, - 4, 3, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 0, 4, 1, 1, 1, 1, 1, 1, 1, + 4, 3, 1, 3, 2, 2, 1, 3, 3, 2, + 2, 1, 2, 4, 4, 2, 1, 3, 1, 3, + 1, 3, 2, 5, 2, 1, 3, 2, 1, 3, + 1, 4, 3, 1, 1, 4, 3, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 4, 6, 5, 5, 3, 0, 4, 6, 5, + 1, 1, 1, 1, 1, 3, 0, 4, 6, 5, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 2, 3, 3, 3, - 3, 0, 4, 5, 1, 1, 0, 2, 1, 2, + 3, 0, 4, 5, 1, 1, 1, 2, 1, 2, 2, 5, 2, 2, 5, 4, 4, 7, 3, 1, - 2, 2, 0, 1, 0, 1, 3, 1, 4, 2, - 1, 0, 2, 1, 3, 2, 1, 1, 1, 1, + 2, 2, 1, 1, 1, 1, 3, 1, 4, 2, + 1, 1, 2, 1, 3, 2, 1, 1, 1, 1, 1, 1, 1, 4, 3, 3, 4, 3, 1, 4, 3, 1, 0, 6, 1, 2, 1, 2, 6, 6, 5, 5, 4, 7, 6, 3, 0, 6, 0, 7, 0, 5, 0, 6, 0, 0, 9, 1, 1, 1, - 1, 1, 1, 2, 1, 1, 1, 5, 0, 2, - 1, 1, 0, 2, 1, 3, 0, 5, 0, 5, - 1, 1, 1, 1, 1, 4, 6, 3, 6, 3, - 4, 1, 5, 1, 4, 2, 1, 1, 5, 0, - 0, 2, 1, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 2, 1, 1, 1, 5, 1, 2, + 1, 1, 1, 2, 1, 3, 0, 5, 0, 5, + 1, 1, 1, 1, 1, 2, 4, 6, 3, 6, + 3, 4, 1, 1, 1, 5, 1, 4, 2, 1, + 1, 5, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 4, 2, 4, 2, 6, - 4, 4, 2, 4, 2, 2, 1, 0, 1, 3, - 3, 1, 3, 2, 2, 2, 0, 1, 4, 0, - 2, 2, 1, 3, 3, 1, 1, 1, 1, 1, - 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, - 1, 1, 2 + 1, 1, 1, 1, 1, 1, 1, 0, 4, 2, + 4, 2, 6, 4, 4, 2, 4, 2, 2, 1, + 0, 1, 3, 3, 1, 3, 2, 2, 2, 1, + 1, 4, 1, 2, 2, 1, 3, 3, 1, 1, + 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, + 1, 1, 1, 1, 1, 2, 0 }; static const short yydefact[] = { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 248, 249, 250, 251, 219, 222, 282, - 306, 305, 307, 308, 0, 0, 355, 19, 0, 310, - 309, 346, 348, 303, 302, 347, 299, 300, 207, 209, - 295, 208, 210, 211, 312, 313, 0, 0, 0, 0, - 202, 340, 0, 0, 0, 0, 2, 353, 5, 22, - 26, 0, 36, 0, 40, 45, 31, 175, 0, 227, - 204, 293, 311, 212, 213, 0, 7, 54, 55, 0, - 0, 241, 100, 112, 101, 125, 97, 118, 107, 106, - 123, 105, 104, 99, 128, 109, 98, 113, 117, 119, - 111, 103, 120, 130, 122, 121, 114, 124, 108, 96, - 116, 115, 110, 126, 129, 127, 95, 102, 93, 94, - 91, 92, 56, 58, 57, 86, 87, 84, 68, 69, - 70, 73, 75, 71, 64, 88, 89, 76, 77, 81, - 72, 74, 65, 66, 67, 78, 79, 80, 82, 83, - 85, 90, 0, 243, 59, 60, 311, 338, 0, 121, - 114, 124, 108, 91, 92, 56, 57, 61, 14, 290, - 301, 225, 304, 0, 26, 227, 0, 0, 0, 0, - 219, 222, 282, 355, 262, 261, 0, 0, 50, 53, - 0, 0, 0, 0, 0, 0, 179, 196, 201, 190, - 193, 24, 175, 311, 213, 193, 343, 0, 25, 177, - 35, 29, 0, 9, 356, 172, 0, 0, 151, 175, - 152, 206, 0, 0, 0, 36, 196, 357, 0, 357, - 0, 357, 44, 298, 297, 296, 294, 30, 166, 167, - 361, 360, 3, 362, 354, 0, 0, 0, 0, 0, - 0, 0, 47, 0, 0, 48, 42, 0, 0, 0, + 0, 0, 0, 248, 249, 250, 251, 219, 222, 283, + 309, 308, 310, 311, 0, 0, 358, 19, 0, 313, + 312, 349, 351, 306, 305, 350, 302, 303, 207, 209, + 298, 208, 210, 211, 315, 316, 0, 0, 0, 0, + 367, 367, 0, 0, 0, 0, 2, 356, 5, 23, + 27, 0, 37, 0, 41, 46, 0, 32, 175, 0, + 8, 227, 204, 296, 314, 212, 213, 0, 4, 7, + 59, 60, 0, 0, 241, 105, 117, 106, 130, 102, + 123, 112, 111, 128, 110, 109, 104, 133, 114, 103, + 118, 122, 124, 116, 108, 125, 135, 127, 126, 119, + 129, 113, 101, 121, 120, 115, 131, 134, 132, 100, + 107, 98, 99, 96, 97, 61, 63, 62, 91, 92, + 89, 73, 74, 75, 78, 80, 76, 69, 93, 94, + 81, 82, 86, 77, 79, 70, 71, 72, 83, 84, + 85, 87, 88, 90, 95, 0, 243, 64, 65, 314, + 341, 0, 126, 119, 129, 113, 96, 97, 61, 62, + 66, 14, 367, 304, 225, 307, 0, 27, 0, 227, + 0, 0, 0, 0, 219, 222, 283, 358, 262, 261, + 0, 0, 314, 213, 0, 0, 0, 0, 0, 0, + 179, 196, 201, 190, 367, 25, 175, 314, 213, 367, + 346, 0, 26, 367, 36, 30, 0, 9, 359, 172, + 0, 0, 151, 175, 152, 206, 0, 0, 0, 37, + 196, 360, 0, 202, 360, 0, 360, 343, 45, 0, + 51, 54, 301, 300, 299, 297, 31, 166, 167, 364, + 363, 3, 365, 357, 0, 0, 0, 0, 0, 0, + 0, 48, 0, 0, 49, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 177, 267, 8, 269, 228, - 137, 131, 0, 0, 177, 32, 226, 0, 0, 315, - 237, 314, 0, 355, 328, 352, 351, 245, 62, 195, - 259, 253, 0, 252, 0, 0, 0, 256, 0, 255, - 0, 0, 0, 0, 177, 0, 193, 191, 218, 0, - 0, 180, 181, 0, 177, 183, 184, 221, 0, 0, - 355, 11, 13, 12, 0, 223, 0, 0, 0, 0, - 0, 236, 37, 359, 358, 203, 215, 342, 216, 359, - 341, 363, 6, 15, 16, 17, 18, 27, 28, 0, - 198, 23, 0, 41, 0, 150, 156, 161, 162, 163, - 158, 160, 170, 171, 164, 165, 143, 144, 168, 169, - 0, 157, 159, 153, 154, 155, 145, 146, 147, 148, - 149, 349, 350, 205, 0, 280, 346, 348, 347, 278, - 0, 176, 263, 263, 0, 0, 142, 136, 0, 239, - 317, 0, 0, 0, 0, 329, 0, 0, 328, 0, - 0, 337, 332, 337, 337, 327, 0, 0, 0, 194, - 0, 291, 259, 254, 259, 0, 284, 0, 233, 0, - 0, 0, 52, 347, 278, 0, 0, 0, 189, 217, - 345, 0, 197, 192, 193, 346, 0, 0, 0, 344, - 220, 281, 178, 10, 0, 173, 0, 21, 37, 197, - 200, 0, 46, 0, 49, 0, 177, 34, 0, 0, - 0, 0, 177, 33, 214, 265, 0, 0, 0, 138, - 132, 276, 0, 0, 0, 242, 339, 0, 334, 335, - 355, 0, 319, 0, 323, 0, 325, 0, 326, 246, - 63, 0, 0, 260, 0, 0, 0, 0, 257, 0, - 286, 0, 0, 231, 232, 51, 0, 193, 187, 186, - 214, 193, 0, 20, 0, 43, 174, 0, 140, 134, - 141, 135, 0, 0, 0, 264, 0, 0, 0, 0, - 316, 238, 331, 0, 244, 330, 337, 337, 336, 0, - 333, 337, 328, 290, 292, 235, 0, 229, 230, 0, - 259, 0, 182, 0, 185, 224, 199, 279, 277, 139, - 133, 266, 268, 270, 240, 318, 0, 321, 322, 324, - 0, 289, 0, 285, 287, 288, 283, 234, 193, 337, - 0, 259, 188, 320, 247, 258, 0, 0, 0 + 0, 0, 0, 0, 0, 367, 267, 276, 269, 228, + 137, 0, 367, 33, 226, 0, 0, 318, 237, 317, + 0, 358, 331, 355, 354, 245, 67, 367, 367, 293, + 253, 0, 252, 0, 0, 0, 0, 256, 0, 255, + 0, 0, 0, 0, 367, 0, 367, 191, 218, 0, + 0, 180, 181, 193, 0, 367, 183, 184, 221, 0, + 0, 358, 177, 11, 13, 12, 0, 223, 0, 0, + 0, 0, 0, 236, 38, 362, 361, 203, 215, 345, + 216, 362, 344, 0, 367, 366, 6, 15, 16, 17, + 18, 28, 29, 0, 198, 24, 0, 42, 0, 55, + 58, 0, 285, 136, 284, 22, 150, 156, 161, 162, + 163, 158, 160, 170, 171, 164, 165, 143, 144, 168, + 169, 0, 157, 159, 153, 154, 155, 145, 146, 147, + 148, 149, 352, 353, 205, 0, 281, 349, 351, 350, + 279, 0, 176, 367, 367, 0, 142, 0, 239, 320, + 0, 0, 0, 0, 332, 0, 0, 331, 0, 0, + 367, 335, 367, 367, 330, 0, 0, 0, 194, 195, + 0, 367, 259, 367, 254, 367, 0, 287, 0, 233, + 0, 0, 0, 349, 350, 279, 0, 0, 0, 189, + 217, 348, 0, 197, 192, 367, 349, 0, 0, 0, + 347, 220, 282, 178, 10, 0, 173, 0, 21, 38, + 197, 53, 0, 200, 0, 47, 0, 367, 0, 50, + 0, 367, 35, 0, 0, 367, 34, 214, 265, 0, + 0, 263, 0, 138, 277, 0, 0, 0, 242, 342, + 0, 337, 338, 358, 0, 322, 0, 326, 340, 0, + 328, 0, 329, 246, 68, 0, 0, 260, 0, 0, + 294, 0, 0, 257, 0, 289, 0, 0, 231, 232, + 214, 0, 367, 187, 186, 214, 367, 0, 20, 52, + 0, 349, 0, 44, 174, 0, 140, 141, 0, 0, + 264, 0, 0, 0, 0, 319, 238, 334, 0, 244, + 333, 367, 367, 339, 0, 336, 367, 331, 367, 295, + 235, 0, 229, 230, 0, 367, 0, 182, 0, 185, + 224, 199, 56, 280, 278, 139, 266, 268, 270, 240, + 321, 0, 324, 325, 327, 0, 292, 0, 288, 290, + 291, 286, 234, 367, 367, 0, 367, 188, 323, 247, + 258, 0, 0, 0 }; -static const short yydefgoto[] = { 617, - 1, 224, 58, 59, 345, 217, 60, 61, 62, 225, - 63, 64, 65, 257, 66, 81, 154, 169, 438, 155, - 156, 67, 416, 415, 347, 411, 412, 341, 200, 333, - 439, 201, 372, 202, 229, 220, 475, 423, 503, 303, - 305, 437, 573, 313, 319, 528, 529, 188, 498, 288, - 413, 290, 414, 69, 176, 317, 448, 607, 311, 526, - 71, 237, 72, 204, 74, 205, 301, 422, 430, 431, - 432, 433, 434, 435, 569, 515, 159, 231, 206, 207, - 191, 406, 308, 243, 216, 356, 314, 245 +static const short yydefgoto[] = { 642, + 1, 228, 58, 59, 357, 221, 60, 61, 62, 229, + 63, 64, 65, 266, 66, 179, 84, 157, 172, 457, + 158, 159, 68, 436, 359, 432, 433, 352, 204, 343, + 458, 205, 386, 206, 233, 224, 496, 442, 526, 311, + 313, 456, 598, 322, 329, 553, 554, 192, 521, 298, + 434, 300, 435, 70, 71, 180, 396, 327, 469, 632, + 319, 550, 73, 246, 74, 208, 76, 209, 309, 441, + 449, 450, 451, 452, 453, 454, 594, 538, 162, 236, + 210, 211, 195, 427, 316, 252, 220, 368, 323, 254, + 79 }; static const short yypact[] = {-32768, - 1542, 4807, 38, 69, 3109, 4513, 2043, 4897, 4897, 2515, - 4897, 4897, 5975,-32768,-32768,-32768,-32768, 3574, 3664, 3754, --32768,-32768,-32768,-32768, 4897, 4410, -48,-32768, -23,-32768, --32768, 1716, 1926,-32768,-32768, 1821,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768, 5707, 5707, 69, 2606, - 5707, 5707, 6239, 4307, 5797, 5707,-32768, 123, 348, 336, - 108, 82,-32768, 43, 6063,-32768, 6278, 78, 157, 40, --32768,-32768, 83,-32768, 199, 3214, 348,-32768,-32768, 4897, - 41,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, + 1852, 5056, 27, 236, 3358, 4762, 2292, 5146, 5146, 2764, + 5146, 5146, 6314,-32768,-32768,-32768,-32768, 3823, 3913, 4003, +-32768,-32768,-32768,-32768, 5146, 4659, -52,-32768, -36,-32768, +-32768, 1965, 2175,-32768,-32768, 2070,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 5956, 5956, 236, 2855, + 5956, 5956, 6578, 4556, 6046, 5956,-32768, 87, 395, 266, + 54, -5,-32768, -56, 6402,-32768, 36, 1278, 96, 159, +-32768, 62,-32768,-32768, 99,-32768, 109, 3463,-32768, 395, +-32768,-32768, 5146, 51,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, 90, 105, 142, 182,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 191, 206, 226,-32768, 230,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 106, 107, + 168, 209,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, 238, 242, 262,-32768, 267,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 4897,-32768,-32768,-32768,-32768,-32768, 240,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 85, 122, - 3304, 3394, 3484, 48,-32768, 109, 48, 186, 52, 52, - 106, 110, 126, -48,-32768, 141, 96, 194, 117, 146, - 63, 2714, 5707, 5707, 5707, 4617,-32768, 690,-32768,-32768, - 166,-32768, 147, 193, 195, 208,-32768, 4712,-32768, 4987, --32768,-32768, 62,-32768,-32768, 202, 150, 2822, 286, 162, - 286,-32768, 2606, 250, 252, 255, 6278, -13, 278, -13, - 265, 104,-32768,-32768,-32768,-32768,-32768,-32768, 286, 286, --32768,-32768,-32768,-32768, 3004, 4897, 4897, 4897, 4897, 4897, - 4897, 5347,-32768, 2606, 6239,-32768, 282, 5707, 5707, 5707, - 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, - 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, 5707, - 5707, 5707, 5707, 308, 310, 4987,-32768,-32768,-32768,-32768, --32768,-32768, 5707, 5707, 4987,-32768,-32768, 11, 123,-32768, --32768,-32768, 2913, 35, 3,-32768,-32768,-32768,-32768, 5707, - 379,-32768, 2151, 382, 2333, 5437, 386,-32768, 2913,-32768, - 2913, 202, 308, 316, 4987, 4897, 1569, 6278,-32768, 288, - 5707, 5077,-32768, 321, 4987, 5167,-32768,-32768, 289, 290, - -48,-32768,-32768,-32768, 4513,-32768, 5707, 2822, 295, 321, - 297,-32768, 294, 5707,-32768,-32768,-32768,-32768,-32768, 5707, --32768,-32768, 348, 336, 336, 336, 336,-32768,-32768, 5707, - 299,-32768, 301,-32768, 6151, 286, 1062, 1062, 1062, 1062, - 539, 539, 1304, 993, 1062, 1062, 1252, 1252, -6, -6, - 6238, 539, 539, 229, 229, 133, 99, 99, 286, 286, - 286, 3844, 3934, 4024, 4114,-32768, 205,-32768, 253, 4204, - 300,-32768, 5, 5, 5707, 5707, 6278, 6278, 307,-32768, --32768, 4897, 2913, 408, 313, 333, 380, 383, 20, 2913, - 123, 315,-32768, 320, 325,-32768, 4513, 4513, 8, 326, - 2424, 423, 368,-32768, 379, 5707, 328, 27,-32768, 432, - 434, 331, -5,-32768, 332, 335, 52, 361,-32768,-32768, - 6278, 5707, 690,-32768, 341, 260, 344, 5707, 690,-32768, --32768,-32768,-32768,-32768, 4897, 6278, 350,-32768, 279, 6278, - 6278, 5527,-32768, 6239,-32768, 5707, 4987,-32768, 5707, 5707, - 5707, 5707, 4987,-32768, 222,-32768, 5887, 2913, 2822, 6278, - 6278,-32768, 2913, 11, 449,-32768,-32768, 5707,-32768,-32768, - -48, 450,-32768, 24,-32768, 26,-32768, 372,-32768,-32768, --32768, 2043, 5707,-32768, 2913, 452, 4897, 453,-32768, 456, - 6278, 5617, 2242,-32768,-32768, 180, 2913, 1569, 5257,-32768, - 263, 1569, 46,-32768, 5707,-32768, 6278, 357, 6278, 6278, - 6278, 6278, 358, 5707, 5707,-32768, 373, 460, 363, 462, --32768,-32768, 6278, 365,-32768, 333, 362, 325,-32768, 333, --32768, 325, 3, 122,-32768,-32768, 48,-32768,-32768, 5707, - 118, 466,-32768, 5707,-32768,-32768, 6278,-32768,-32768, 6278, - 6278,-32768,-32768,-32768,-32768,-32768, 26,-32768,-32768,-32768, - 2913,-32768, 2151, 6278,-32768,-32768,-32768,-32768, 1569, 325, - 469, 368,-32768,-32768,-32768,-32768, 481, 482,-32768 +-32768,-32768,-32768,-32768,-32768, 5146,-32768,-32768,-32768,-32768, +-32768, 268,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, +-32768, 82, 193, 3553, 3643, 3733, 55,-32768, 118, 115, + 55, 197, 57, 57, 110, 121, 126, -52,-32768,-32768, + 151, 226, 15, 19, -34, 2963, 5956, 5956, 5956, 4866, +-32768, 775,-32768,-32768, 123,-32768, 152, 4, 29, 165, +-32768, 4961,-32768, 5236,-32768,-32768, 318,-32768,-32768, 137, + 160, 3071, 218, 156, 218,-32768, 2855, 178, 182, 199, + 1278, -41, 212,-32768, -41, 244, 67,-32768,-32768, 166, + 204, 208,-32768,-32768,-32768,-32768,-32768, 218, 218,-32768, +-32768,-32768,-32768, 3253, 5146, 5146, 5146, 5146, 5146, 5146, + 5596,-32768, 2855, 6578,-32768, 235, 6136, 5956, 5956, 5956, + 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, + 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, 5956, + 5956, 5956, 5956, 309, 333, 5236,-32768,-32768,-32768,-32768, +-32768, 5956, 5236,-32768,-32768, 59, 87,-32768,-32768,-32768, + 3162, 31, 20,-32768,-32768,-32768,-32768, 5956, 349,-32768, +-32768, 2400, 359, 5956, 2582, 5686, 365,-32768, 3162,-32768, + 3162, 137, 309, 355, 5236, 5146, 678, 1278,-32768, 275, + 5956, 5326,-32768,-32768, 362, 5236, 5416,-32768,-32768, 284, + 297, -52,-32768,-32768,-32768,-32768, 4762,-32768, 5956, 3071, + 306, 362, 308,-32768, 310, 5956,-32768,-32768,-32768,-32768, +-32768, 5956,-32768, 364, 5236,-32768, 395, 266, 266, 266, + 266,-32768,-32768, 5956, 311,-32768, 316,-32768, 217, 204, + 208, 6490, 54, 1278,-32768,-32768, 218, 1716, 1716, 1716, + 1716, 290, 290, 6576, 987, 1716, 1716, 1471, 1471, 143, + 143, 1196, 290, 290, 475, 475, 389, -3, -3, 218, + 218, 218, 4093, 4183, 4273, 4363,-32768, 216,-32768, 336, + 4453, 314,-32768, 0, 0, 5956, 1278, 326,-32768,-32768, + 5146, 3162, 418, 328, 348, 396, 398, 92, 3162, 87, + 331,-32768, 335, 339,-32768, 4762, 4762, 12, 345,-32768, + 2673, 438,-32768, 119,-32768, 349, 5956, 346, 24,-32768, + 448, 449, 347, 25,-32768, 352, 358, 57, 372,-32768, +-32768, 1278, 5956, 775,-32768, 368, 34, 360, 5956, 775, +-32768,-32768,-32768,-32768,-32768, 5146, 1278, 385,-32768, 272, + 1278, -2, 381, 1278, 5776,-32768, 369, 5236, 6578,-32768, + 5956, 5236,-32768, 5956, 5956, 5236,-32768, 231,-32768, 6226, + 3162,-32768, 3071, 1278,-32768, 3162, 59, 486,-32768,-32768, + 5956,-32768,-32768, -52, 487,-32768, 139,-32768,-32768, 142, +-32768, 410,-32768,-32768,-32768, 2292, 5956,-32768, 3162, 492, +-32768, 5146, 493,-32768, 494, 1278, 5866, 2491,-32768,-32768, + 26, 3162, 678, 5506,-32768, 40, 678, 69,-32768, 227, + 5956, 28, 392,-32768, 1278, 402, 1278, 1278, 403, 5956, +-32768, 412, 504, 409, 508,-32768,-32768, 1278, 411,-32768, + 348, 408, 339,-32768, 348,-32768, 339, 20, 193,-32768, +-32768, 55,-32768,-32768, 5956, 101, 514,-32768, 5956,-32768, +-32768, 1278, 227,-32768,-32768, 1278,-32768,-32768,-32768,-32768, +-32768, 142,-32768,-32768,-32768, 3162,-32768, 2400, 1278,-32768, +-32768,-32768,-32768, 678, 339, 517, 119,-32768,-32768,-32768, +-32768, 528, 529,-32768 }; static const short yypgoto[] = {-32768, --32768, 549,-32768, 30,-32768,-32768, 19, 1282, -9, -149, - -12, -52,-32768,-32768, 7, 39, -3,-32768,-32768,-32768, --32768, 929,-32768,-32768,-32768, -235, -189, -4, -279, -201, --32768, -15,-32768, 22,-32768, -1,-32768,-32768,-32768,-32768, --32768,-32768,-32768, -175, -158, -128, -278, -7, 87,-32768, --32768, -29,-32768,-32768, 174, -69,-32768,-32768, -61,-32768, --32768,-32768,-32768, 498, 509, 581,-32768,-32768, -58, 88, --32768, -468, 2, -451, -276, -379,-32768,-32768, -26, -301, - 130,-32768,-32768,-32768, -159, -111, -19,-32768 +-32768, 588,-32768, 30,-32768,-32768, 14, 1502, -11, -179, + -15, -61,-32768,-32768, 477, 598, 65, 8,-32768,-32768, +-32768,-32768, 1123,-32768,-32768, -290, -201, 23, -314, -205, +-32768, -22,-32768, 17,-32768, 141,-32768,-32768,-32768,-32768, +-32768,-32768,-32768, -178, -172, -106, -303, 16, 97,-32768, +-32768, -31,-32768,-32768, 270, 684,-32768, -72,-32768,-32768, + -64,-32768,-32768,-32768,-32768, 473, 535, 631,-32768,-32768, + -57, 94,-32768, -464, 6, -477, -286, -395,-32768,-32768, + -37, -326, -1,-32768,-32768,-32768, -168, 103, -27,-32768, + 1157 }; -#define YYLAST 6381 +#define YYLAST 6679 -static const short yytable[] = { 68, - 68, 315, 168, 185, 337, 68, 68, 68, 68, 68, - 68, 187, 256, 199, 199, 211, 203, 203, 203, 186, - 340, 321, 214, 68, 322, 232, 174, 177, 436, 179, - 180, 77, 442, 318, 470, 228, 230, 226, 244, 312, - 209, 299, 82, 212, 250, 251, 297, 571, 68, 426, - 236, 187, 464, 203, 517, 519, 464, 258, 470, 233, - 312, 302, 568, 187, 572, -274, 426, 215, 250, 251, - 566, 296, 570, 351, 203, -346, 496, 318, 68, 250, - 251, 250, 251, 218, 78, 250, 251, 222, 79, 456, - 427, 428, 279, 280, 281, 282, 283, 354, 298, 467, - 497, -346, 355, -346, 373, 419, -346, 427, 428, -346, - 342, 427, 428, 427, 428, 78, 80, 429, 358, 79, - 361, 343, 344, 241, 242, 459, 241, 242, 571, 310, - 76, 76, 441, -275, 316, 300, 76, 76, 76, 76, - 76, 76, 241, 242, 425, 610, 289, 76, 76, 76, - 215, 68, 436, 253, 76, 586, 241, 242, 284, 320, - 320, 297, 258, 241, 242, 291, 530, 241, 242, 289, - -306, 304, 252, 292, 70, 70, 323, 295, 464, 76, - 70, 473, 287, 70, 76, -305, 285, 598, 599, 286, - 68, 199, 600, -50, 203, 309, 258, -311, -306, 281, - 282, 283, 316, 199, 324, 76, 203, 325, 203, 76, - 226, 271, 272, -305, 360, 289, 68, 330, 326, 355, - 196, 68, -307, 70, 208, -311, -213, 284, -311, 339, - 614, 279, 280, 281, 282, 283, 371, 470, 241, 242, - 210, 226, 323, 68, 68, 68, 68, 68, 68, 68, - -307, -45, 68, 187, -213, 334, 348, -213, 335, 464, - -214, 374, -308, 540, 364, 365, 366, 367, 368, 369, - 350, -310, 533, 335, 363, 291, 332, 293, 420, 421, - 522, 293, 76, 292, 203, 294, -309, 489, -214, 294, - -308, -214, 258, 203, 440, 490, 436, 548, 537, -310, - 447, 68, 605, 553, 554, 465, -301, 271, 272, -53, - -304, 68, 555, 68, -309, -52, 346, 68, 336, 68, - 306, 76, 485, 203, 68, 76, 278, 279, 280, 281, - 282, 283, -51, 203, -301, 491, 583, 76, -304, 76, - 585, 474, 489, 492, 457, 554, 68, 76, 307, 258, - 490, 564, 76, 555, 402, 403, 407, 408, 404, 352, - 409, 353, 453, 408, -38, 70, 454, 466, 408, 250, - 251, 409, 359, 187, 76, 76, 76, 76, 76, 76, - 76, 527, 441, 76, 246, 247, 248, 249, -39, -46, - 357, 70, 375, 441, 444, 449, 70, 460, 471, 472, - 488, 603, 478, 203, -46, 494, 479, 613, 203, 482, - 483, 513, 495, 405, 410, 76, 502, 506, 70, 320, - 68, 68, 507, 508, 76, 514, 509, 70, 68, 510, - 516, 525, 76, 520, 521, 518, 523, 320, 532, 68, - 504, 534, 76, 535, 76, 487, 493, 536, 76, 194, - 76, 539, 452, 455, 76, 76, 541, 544, 562, 565, - 428, 576, 578, 410, 76, 579, 588, 589, 592, 593, - 594, 595, 597, 68, 596, 608, 70, 76, 615, 455, - 618, 619, 187, 616, 561, 203, 70, 185, 70, 557, - 546, 203, 70, 543, 70, 187, 68, 68, 73, 73, - 499, 68, 157, 186, 73, 73, 73, 73, 73, 73, - 189, 606, 602, 158, 601, 567, 511, 0, 0, 0, - 68, 70, 73, 68, 0, 68, 0, 0, 0, 0, - 0, 68, 0, 0, 76, 68, 0, 0, 0, 76, - 0, 0, 0, 0, 0, 577, 0, 73, 0, 57, - 189, 76, 76, 0, 0, 170, 0, 0, 178, 76, - 0, 0, 189, 0, 0, 0, 0, 0, 0, 0, - 76, 0, 0, 0, 0, 0, 0, 73, 0, 0, - 0, 75, 75, 0, 0, 0, 0, 75, 75, 75, - 75, 75, 75, 190, 0, 0, 70, 0, 0, 68, - 0, 68, 258, 70, 76, 75, 0, 0, 0, 0, - 0, 0, 0, 0, 70, 0, 76, 271, 272, 0, - 0, 0, 76, 0, 0, 0, 0, 76, 76, 0, - 75, 0, 76, 190, 276, 277, 278, 279, 280, 281, - 282, 283, 0, 0, 0, 190, 0, 0, 0, 0, - 73, 76, 0, 0, 76, 0, 76, 0, 0, 0, - 75, 0, 76, 0, 0, 0, 76, 0, 0, 0, - 0, 70, 70, 0, 0, 0, 70, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 0, 0, 0, 0, 0, 70, 0, 0, 70, 0, - 0, 0, 0, 0, 0, 0, 70, 0, 0, 0, - 70, 0, 0, 0, 0, 73, 0, 0, 0, 0, - 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 76, 0, 76, 75, 0, 0, 0, 0, 0, 0, - 0, 0, 73, 73, 73, 73, 73, 73, 73, 0, - 0, 73, 189, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 349, 0, 271, 272, - 0, 0, 75, 331, 70, 0, 70, 0, 0, 0, - 0, 273, 0, 274, 275, 276, 277, 278, 279, 280, - 281, 282, 283, 0, 0, 0, 0, 0, 75, 0, - 73, 0, 0, 75, 0, 0, 0, 0, 0, 0, - 73, 0, 73, 0, 0, 0, 73, 0, 73, 0, - 0, 0, 0, 73, 0, 75, 75, 75, 75, 75, - 75, 75, 0, 0, 75, 190, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 73, 0, 0, 0, 0, - 0, 424, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 443, 0, 445, 0, 0, 0, 450, 0, 451, - 0, 0, 189, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 75, 0, 75, 477, 0, 0, 75, - 0, 75, 0, 0, 0, 0, 75, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 73, 0, 0, 0, 0, 0, 0, 73, 75, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 73, 0, - 0, 0, 0, 0, 0, 0, 198, 198, 198, 0, - 0, 0, 0, 0, 0, 190, 0, 0, 0, 0, +static const short yytable[] = { 78, + 78, 189, 325, 265, 348, 78, 78, 78, 78, 78, + 78, 331, 351, 171, 237, 462, 78, 78, 78, 332, + 491, 177, 181, 78, 183, 184, 455, 485, 232, 235, + 253, 80, 485, 218, 230, 213, 321, 328, 216, -55, + 203, 203, 215, -58, 477, 491, 305, 363, 78, -57, + -56, 307, -57, 78, 262, 488, 310, 541, 543, 593, + 268, 245, 597, 219, 259, 260, 445, 321, 85, 366, + 222, 519, 299, 81, 367, 596, 78, 82, -349, -275, + 303, 78, 328, 387, 503, 261, 301, -274, 259, 260, + 259, 260, 259, 260, -55, 520, 306, 291, 292, 293, + 304, 438, 259, 260, -349, 83, -349, 446, 447, -349, + -55, 302, -349, 226, -58, 461, 514, 326, -57, -58, + -57, -56, 580, -57, -57, -51, 267, 250, 251, -54, + -56, 480, 552, 461, 448, -53, -52, -57, 445, 250, + 251, 69, 69, 444, 635, 308, 219, 69, 69, 69, + 69, 69, 69, 191, 78, 330, 330, 596, 207, 207, + 207, 455, 555, 305, 485, 69, 250, 251, 299, 312, + 250, 251, 250, 251, 250, 251, 294, 372, 611, 446, + 447, 301, 367, 494, 297, 591, -309, -308, 595, -55, + 69, 302, 317, 240, 78, 207, 623, 624, 78, -58, + 318, 625, 250, 251, 295, 240, 268, 296, 324, -51, + 78, 230, 78, 326, -309, -308, 340, 573, 207, -54, + 78, 299, 203, 69, 200, 78, 446, 447, 350, 446, + 447, 333, 294, 342, 203, 212, 333, 491, 385, 639, + 214, 289, 290, 291, 292, 293, 333, 230, -310, 485, + 336, 358, 78, 78, 78, 78, 78, 78, 78, 334, + 345, 78, 335, 346, 362, 78, 360, 346, 378, 379, + 380, 381, 382, 383, 374, 347, -310, 375, 439, 440, + 565, 268, 81, 377, -314, 546, 82, 364, -213, -311, + 558, 365, 426, 431, 78, 459, 69, 333, 514, 259, + 260, 78, 630, 468, 486, 562, -57, -214, -39, 78, + 576, 455, -314, 580, 579, -314, -213, -311, -313, -213, + 78, -56, -312, 78, 369, 507, -53, 78, 508, 78, + 510, 473, 476, 78, 78, -214, 69, 370, -214, 373, + 207, -52, -304, 431, 78, 392, -313, -307, 314, 478, + -312, 371, 207, 268, 207, 423, 424, 608, 78, 425, + 476, 610, 69, 461, 495, 589, 354, 69, 281, 282, + -304, 465, 476, 78, 470, -307, 315, 355, 356, 428, + 429, -40, -47, 430, 481, 286, 287, 288, 289, 290, + 291, 292, 293, 492, 69, 69, 69, 69, 69, 69, + 69, 474, 429, 69, 389, 475, 493, 207, 487, 429, + 502, 429, 430, 499, 475, 572, 429, 500, 515, 475, + -47, 505, 536, 628, 78, 506, 518, 529, 638, 78, + 330, 255, 256, 257, 258, 525, 207, 530, 531, 78, + 78, 537, 532, 207, 533, 540, 549, 78, 513, 542, + 330, 69, 268, 517, 527, 547, 557, 559, 560, 78, + 198, 512, 69, 544, 545, 69, 516, 281, 282, 69, + 561, 69, 566, 75, 75, 207, 69, 160, 564, 75, + 75, 75, 75, 75, 75, 193, 207, 289, 290, 291, + 292, 293, 569, 570, 78, 587, 590, 75, 447, 586, + 69, 601, 603, 604, 613, 476, 78, 617, 189, 568, + 78, 614, 615, 618, 78, 207, 619, 620, 622, 78, + 621, 78, 75, 633, 78, 241, 640, 643, 644, 239, + 641, 523, 240, 631, 627, 582, 395, 241, 268, 161, + 626, 534, 592, 0, 78, 0, 0, 78, 0, 0, + 78, 0, 0, 281, 282, 75, 78, 0, 0, 0, + 78, 0, 0, 0, 0, 602, 207, 0, 0, 0, + 0, 207, 288, 289, 290, 291, 292, 293, 0, 0, + 0, 69, 69, 0, 0, 0, 0, 0, 57, 69, + 0, 0, 0, 0, 173, 0, 0, 182, 67, 67, + 0, 69, 0, 0, 67, 0, 0, 67, 0, 0, + 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 78, 0, 78, 0, 75, 0, + 0, 77, 77, 0, 0, 0, 69, 77, 77, 77, + 77, 77, 77, 194, 0, 0, 0, 67, 207, 389, + 0, 0, 207, 0, 0, 77, 207, 0, 0, 0, + 191, 69, 0, 69, 0, 0, 69, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 505, 73, 0, 0, 219, 221, 0, 512, 227, - 198, 189, 0, 239, 240, 0, 0, 0, 0, 524, - 0, 0, 0, 0, 189, 73, 73, 0, 0, 0, - 73, 0, 75, 75, 198, 0, 0, 0, 0, 0, - 75, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 0, 75, 73, 0, 73, 0, 0, 0, 0, 0, - 73, 0, 0, 0, 73, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 558, 559, 0, 0, - 0, 560, 0, 0, 0, 75, 258, 259, 260, 261, - 262, 263, 264, 265, 190, 267, 268, 0, 0, 0, - 574, 271, 272, 575, 0, 0, 0, 190, 75, 75, - 0, 581, 0, 75, 0, 582, 274, 275, 276, 277, - 278, 279, 280, 281, 282, 283, 0, 0, 73, 0, - 73, 0, 75, 0, 0, 75, 0, 75, 0, 0, - 0, 0, 0, 75, 0, 0, 0, 75, 0, 0, - 0, 327, 328, 239, 198, 258,-32768,-32768,-32768,-32768, - 263, 264, 0, 0,-32768,-32768, 198, 0, 198, 0, - 271, 272, 0, 0, 0, 0, 0, 0, 0, 611, - 0, 612, 0, 0, 0, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 0, 0, 0, 0, 0, + 77, 0, 0, 242, 72, 72, 69, 0, 0, 69, + 72, 0, 69, 72, 75, 242, 0, 0, 69, 75, + 0, 0, 69, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 77, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 75, 75, 75, 75, + 75, 75, 75, 72, 0, 75, 390, 0, 0, 0, + 0, 268, 269, 270, 271, 272, 273, 274, 275, 276, + 277, 278, 279, 280, 0, 0, 281, 282, 0, 0, + 0, 0, 0, 0, 0, 0, 69, 0, 69, 283, + 0, 284, 285, 286, 287, 288, 289, 290, 291, 292, + 293, 0, 0, 75, 0, 0, 77, 0, 479, 0, + 0, 0, 0, 67, 75, 0, 0, 75, 0, 0, + 0, 75, 0, 75, 0, 0, 0, 0, 75, 361, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, + 0, 0, 0, 0, 67, 0, 77, 0, 0, 0, + 0, 0, 75, 0, 0, 0, 0, 0, 268, 269, + 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, + 280, 67, 77, 281, 282, 0, 0, 77, 341, 0, + 67, 388, 0, 0, 241, 0, 283, 0, 284, 285, + 286, 287, 288, 289, 290, 291, 292, 293, 0, 72, + 0, 0, 0, 0, 77, 77, 77, 77, 77, 77, + 77, 0, 0, 77, 391, 0, 0, 0, 443, 0, + 0, 0, 0, 0, 0, 72, 0, 0, 67, 464, + 72, 0, 466, 75, 75, 0, 471, 0, 472, 67, + 0, 75, 67, 0, 0, 0, 67, 0, 67, 0, + 0, 0, 0, 75, 0, 0, 0, 72, 0, 0, + 0, 77, 0, 0, 0, 0, 72, 498, 0, 0, + 72, 0, 77, 0, 0, 77, 0, 67, 0, 77, + 0, 77, 0, 0, 0, 0, 77, 0, 75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 227, 75, 0, 75, 0, 0, 376, 377, 378, 379, - 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, - 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, - 400, 401, 0, 0, 198, 0, 0, 0, 0, 0, - 0, 417, 418, 198, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 227, 0, - 0, 0, 0, 0, 227, 0, 0, 0, 0, 0, - 0, 0, 0, 198, 0, 0, 0, 0, 0, 461, - 463, 0, 0, 198, 469, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 476, 0, 0, 0, 0, - 0, 0, 480, 0, 0, 0, 0, 0, 469, 175, - 175, 0, 175, 175, 0, 0, 0, 0, 481, 197, - 197, 197, 0, 0, 0, 0, 175, 0, 0, 0, - 0, 0, 0, 0, 0, 258, 259, 260, 261, 262, - 263, 264, 265, 266, 267, 268,-32768,-32768, 0, 0, - 271, 272, 0, 198, 0, 0, 238, 0, 198, 0, - 0, 0, 0, 500, 501, 274, 275, 276, 277, 278, - 279, 280, 281, 282, 283, 0, 0, 197, 0, 0, - 0, 175, 0, 0, 0, 0, 0, 258, 259, 260, - 261, 262, 263, 264, 531, 0, 267, 268, 0, 0, - 0, 0, 271, 272, 0, 0, 0, 0, 0, 0, - 538, 0, 0, 0, 0, 0, 542, 274, 275, 276, - 277, 278, 279, 280, 281, 282, 283, 0, 0, 0, - 480, 0, 0, 0, 547, 198, 0, 549, 550, 551, - 552, 198, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 175, 0, 563, 0, 0, 0, + 0, 390, 0, 0, 0, 0, 0, 0, 0, 0, + 77, 0, 193, 75, 72, 75, 0, 0, 75, 0, + 0, 0, 0, 0, 0, 72, 0, 0, 72, 0, + 0, 0, 72, 0, 72, 0, 0, 0, 75, 0, + 0, 75, 242, 0, 75, 0, 0, 0, 0, 528, + 75, 0, 0, 0, 75, 0, 535, 0, 0, 67, + 0, 0, 0, 72, 0, 0, 67, 0, 548, 0, + 268, 269, 270, 271, 272, 273, 274, 275, 67, 277, + 278, 0, 0, 0, 0, 281, 282, 0, 0, 0, + 0, 77, 77, 0, 0, 0, 0, 0, 0, 77, + 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, + 0, 77, 0, 0, 0, 0, 0, 0, 75, 0, + 75, 0, 0, 0, 0, 0, 574, 0, 583, 0, + 584, 0, 0, 585, 0, 0, 0, 190, 67, 0, + 67, 0, 0, 67, 0, 72, 77, 0, 0, 0, + 0, 0, 72, 599, 0, 0, 600, 0, 0, 391, + 202, 202, 202, 67, 72, 606, 67, 0, 0, 607, + 194, 77, 0, 77, 0, 67, 77, 0, 0, 67, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 223, + 225, 0, 0, 231, 202, 0, 77, 248, 249, 77, + 0, 0, 77, 0, 0, 0, 0, 0, 77, 0, + 0, 0, 77, 0, 0, 0, 0, 0, 0, 0, + 202, 0, 0, 0, 72, 0, 72, 234, 238, 72, + 0, 0, 0, 636, 0, 637, 0, 0, 0, 0, + 0, 0, 0, 67, 0, 67, 0, 0, 0, 72, + 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, + 0, 72, 0, 0, 0, 72, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 77, 0, 77, 268, + 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, + 279, 280, 0, 0, 281, 282, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 283, 511, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, + 0, 72, 0, 0, 0, 0, 0, 0, 0, 337, + 338, 248, 202, 0, 0, 0, 0, 0, 0, 320, + 0, 0, 0, 0, 202, 0, 202, 0, 0, 0, + 0, 268, 269, 270, 271, 272, 273, 274, 275, 276, + 277, 278, 279, 280, 0, 0, 281, 282, 0, 0, + 0, 344, 0, 0, 0, 0, 344, 0, 0, 283, + 353, 284, 285, 286, 287, 288, 289, 290, 291, 292, + 293, 0, 0, 231, 0, 0, 0, 0, 0, 394, + 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, + 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, + 417, 418, 419, 420, 421, 422, 0, 0, 202, 0, + 0, 0, 0, 0, 437, 202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 480, 0, 0, 0, 0, 0, 0, 0, 0, - 480, 0, 0, 0, 0, 0, 0, 469, 0, 0, - 0, 0, 0, 587, 0, 0, 0, 197, 0, 0, - 0, 0, 590, 591, 0, 0, 0, 0, 0, 197, - 0, 197, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 604, 0, - 0, 0, 609, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 175, 175, 175, - 175, 175, 175, 0, 0, 0, 0, 0, 0, 0, - 0, -4, 2, 0, 3, 4, 5, 6, 7, 0, + 231, 0, 0, 0, 0, 0, 394, 0, 231, 0, + 0, 0, 353, 0, 0, 0, 0, 202, 0, 353, + 0, 0, 0, 482, 484, 0, 0, 0, 202, 490, + 0, 0, 0, 0, 460, 463, 0, 0, 0, 0, + 0, 497, 0, 0, 0, 0, 0, 0, 501, 0, + 0, 353, 0, 344, 490, 0, 0, 202, 0, 0, + 0, 0, 353, 0, 0, 0, 504, 0, 0, 178, + 178, 0, 178, 178, 0, 0, 0, 0, 0, 201, + 201, 201, 0, 0, 0, 0, 178, 0, 0, 0, + 0, 353, 0, 0, 268, 269, 270, 271, 272, 273, + 274, 275, 276, 277, 278,-32768,-32768, 0, 202, 281, + 282, 0, 0, 202, 0, 0, 247, 0, 524, 0, + 0, 0, 0, 0, 284, 285, 286, 287, 288, 289, + 290, 291, 292, 293, 0, 0, 0, 0, 0, 201, + 0, 0, 0, 0, 178, 0, 0, 0, 0, 556, + 522, 522, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 563, 0, 539, 0, 539, + 539, 567, 0, 0, 0, 0, 0, 0, 551, 0, + 463, 0, 463, 0, 0, 0, 0, 501, 0, 0, + 202, 0, 0, 575, 202, 0, 577, 578, 202, 0, + 0, 0, 344, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 588, 0, 0, 0, 178, 0, 0, + 0, 0, 0, 0, 353, 0, 0, 0, 353, 501, + 0, 0, 353, 0, 0, 0, 0, 0, 0, 501, + 0, 0, 0, 0, 0, 0, 490, 0, 0, 0, + 0, 0, 0, 612, 0, 0, 0, 0, 0, 0, + 0, 201, 616, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 201, 0, 201, 0, 0, 0, 344, + 0, 0, 0, 344, 0, 0, 0, 629, 0, 0, + 0, 634, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 539, 539, + 0, 0, 0, 539, 0, 320, 178, 178, 178, 178, + 178, 178, 463, 0, 0, 0, 0, 0, 393, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 268, +-32768,-32768,-32768,-32768, 273, 274, 0, 0,-32768,-32768, + 344, 539, 0, 463, 281, 282, 0, 201, 0, 0, + 0, 0, 0, 0, 201, 0, 0, 0, 0, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 201, 178, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 201, 0, 0, + 0, -367, 2, 0, 3, 4, 5, 6, 7, 0, 0, 0, 8, 9, 0, 0, 0, 10, 0, 11, - 12, 13, 14, 15, 16, 17, 0, 197, 18, 19, - 20, 21, 22, 23, 24, 0, 197, 25, 0, 0, + 12, 13, 14, 15, 16, 17, 201, 0, 18, 19, + 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 0, 197, 175, 0, 0, - 0, 0, 0, 0, 0, 0, 197, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, - 0, 54, 258, 259, 260, 261, 262, 263, 264, 265, - 266, 267, 268, 269, 270, 55, 56, 271, 272, 0, - 0, 0, 0, 0, 0, 0, 0, -4, -4, 0, - 273, 0, 274, 275, 276, 277, 278, 279, 280, 281, - 282, 283, 0, 0, 0, 0, 0, 0, 0, 458, - 0, 0, 0, 0, 0, 0, 197, 0, 0, 0, - 0, 197, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 175, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -301, 0, 0, 0, 0, - 0, 0, 0, -301, -301, -301, 0, 0, 0, -301, - -301, 0, -301, 0, 0, 0, 0, 0, 0, 0, - 0, -271, 0, 0, 0, 0, 0, 0, 0, -301, - -301, 0, -301, -301, -301, -301, 175, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 197, 0, - 0, 0, 0, 0, 197, 0, 0, 0, 0, -301, - -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, - -301, -301, 0, 0, -301, -301, -301, 0, -301, 0, - 0, 0, 0, 0, 0, 0, -301, -301, 175, -301, - -301, -301, -301, -301, -301, -301, -301, -301, -301, 0, - -304, 0, 0, -301, -301, -301, -301, -301, -304, -304, - -304, -301, -301, 0, -304, -304, 0, -304, 0, 0, - 0, 0, 0, 0, 0, 0, -272, 0, 0, 0, - 0, 0, 0, 0, -304, -304, 0, -304, -304, -304, - -304, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 201, 0, 0, + 0, 0, 201, 49, 0, 0, 50, 51, 52, 53, + 0, 54, 178, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 55, 56, 0, 0, 0, + 0, 0, 0, 0, -304, 0, 0, -367, -367, 0, + 0, 0, -304, -304, -304, 0, 0, 0, -304, -304, + 0, -304, 0, 0, 0, 0, 0, 0, 0, 0, + -271, 0, 0, 0, 0, 0, 0, 178, -304, -304, + 0, -304, -304, -304, -304, 0, 0, 0, 0, 201, + 0, 0, 0, 201, 0, 0, 0, 201, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -304, -304, + -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, + -304, 0, 0, -304, -304, -304, 0, -304, 0, 0, + 0, 0, 0, 178, 0, -304, -304, 0, -304, -304, + -304, -304, -304, -304, -304, -304, -304, -304, 0, -307, + 0, 0, -304, -304, -304, -304, -304, -307, -307, -307, + -304, -304, 0, -307, -307, 0, -307, 0, 0, 0, + 0, 0, 0, 0, 0, -272, 0, 0, 0, 0, + 0, 0, 0, -307, -307, 0, -307, -307, -307, -307, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, -304, -304, -304, -304, -304, -304, - -304, -304, -304, -304, -304, -304, -304, 0, 0, -304, - -304, -304, 0, -304, 0, 0, 0, 0, 0, 0, - 0, -304, -304, 0, -304, -304, -304, -304, -304, -304, - -304, -304, -304, -304, 0, -225, 0, 0, -304, -304, - -304, -304, -304, -225, -225, -225, -304, -304, 0, -225, - -225, 0, -225, 0, 0, 0, 0, 0, 0, 0, - 0, -273, 0, 0, 0, 0, 0, 0, 0, -225, - -225, 0, -225, -225, -225, -225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, -225, + 0, 0, 0, -307, -307, -307, -307, -307, -307, -307, + -307, -307, -307, -307, -307, -307, 0, 0, -307, -307, + -307, 0, -307, 0, 0, 0, 0, 0, 0, 0, + -307, -307, 0, -307, -307, -307, -307, -307, -307, -307, + -307, -307, -307, 0, -225, 0, 0, -307, -307, -307, + -307, -307, -225, -225, -225, -307, -307, 0, -225, -225, + 0, -225, 0, 0, 0, 0, 0, 0, 0, 0, + -273, 0, 0, 0, 0, 0, 0, 0, -225, -225, + 0, -225, -225, -225, -225, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, -225, -225, -225, -225, -225, -225, -225, -225, -225, -225, -225, -225, - -225, -225, 0, 0, -225, -225, -225, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, -225, 0, -225, - -225, -225, -225, -225, -225, -225, -225, -225, -225, 0, - 0, 0, 0, -225, -225, -225, 0, -225, 0, 0, - 0, -225, -225, 2, 0, 3, 4, 5, 6, 7, - -4, -4, -4, 8, 9, 0, 0, -4, 10, 0, + -225, 0, 0, -225, -225, -225, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, -225, 0, -225, -225, + -225, -225, -225, -225, -225, -225, -225, -225, 0, 0, + 0, 0, -225, -225, -225, 0, -225, 0, 0, 0, + -225, -225, 2, 0, 3, 4, 5, 6, 7, -367, + -367, -367, 8, 9, 0, 0, -367, 10, 0, 11, + 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, + 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, + 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, + 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 55, 56, 0, 0, 0, + 2, 0, 3, 4, 5, 6, 7, -367, -367, -367, + 8, 9, 0, -367, -367, 10, 0, 11, 12, 13, + 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, + 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, + 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, + 0, 2, 0, 3, 4, 5, 6, 7, 0, 0, + -367, 8, 9, 55, 56, -367, 10, -367, 11, 12, + 13, 14, 15, 16, 17, -367, -367, 18, 19, 20, + 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, + 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, + 54, 0, 2, 0, 3, 4, 5, 6, 7, 0, + 0, -367, 8, 9, 55, 56, -367, 10, 0, 11, + 12, 13, 14, 15, 16, 17, -367, -367, 18, 19, + 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, + 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, + 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, + 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, + 0, -367, -367, 8, 9, 55, 56, 0, 10, 0, + 11, 12, 13, 14, 15, 16, 17, -367, -367, 18, + 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, + 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, + 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, + 7, 0, 0, 0, 8, 9, 55, 56, 0, 10, + -367, 11, 12, 13, 14, 15, 16, 17, -367, -367, + 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, + 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, + 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, + 6, 7, 0, 0, 0, 8, 9, 55, 56, 0, + 10, 0, 11, 12, 13, 14, 15, 16, 17, -367, + -367, 18, 19, 20, 21, 22, 23, 24, 0, 0, + 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, + 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 49, 0, 0, 227, + 51, 52, 53, 0, 54, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 55, 56, + 0, 0, 0, 2, -367, 3, 4, 5, 6, 7, + -367, -367, 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, @@ -936,8 +1043,8 @@ static const short yytable[] = { 68, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, 0, - 0, 2, 0, 3, 4, 5, 6, 7, -4, -4, - -4, 8, 9, 0, -4, -4, 10, 0, 11, 12, + 0, 2, -367, 3, 4, 5, 6, 7, -367, -367, + 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, @@ -946,629 +1053,658 @@ static const short yytable[] = { 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, 0, - 0, -4, 8, 9, 55, 56, -4, 10, -4, 11, - 12, 13, 14, 15, 16, 17, -4, -4, 18, 19, + 0, -367, 8, 9, 55, 56, 0, 10, -367, 11, + 12, 13, 14, 15, 16, 17, -367, -367, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, - 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, - 0, 0, -4, 8, 9, 55, 56, -4, 10, 0, - 11, 12, 13, 14, 15, 16, 17, -4, -4, 18, + 0, 54, 0, 0, 0, 3, 4, 5, 6, 7, + 0, 0, 0, 8, 9, 55, 56, 0, 10, 0, + 11, 12, 13, 14, 15, 16, 17, -367, -367, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, - 53, 0, 54, 0, 2, 0, 3, 4, 5, 6, - 7, 0, -4, -4, 8, 9, 55, 56, 0, 10, - 0, 11, 12, 13, 14, 15, 16, 17, -4, -4, - 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, - 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, + 53, 0, 54, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 55, 56, 0, 0, + 86, 87, 88, 89, 90, 91, 92, 93, 0, 376, + 94, 95, 96, 97, 98, 0, 0, 99, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, + 122, 123, 124, 125, 126, 127, 34, 35, 128, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 129, + 130, 131, 132, 133, 134, 0, 135, 136, 0, 0, + 137, 0, 138, 0, 139, 140, 141, 142, 0, 0, + 0, 0, 0, 0, 0, 143, 0, 0, 0, 0, + 0, 144, 145, 146, 147, 148, 149, 150, 151, 152, + 153, 0, 154, 0, 0, 3, 4, 5, 0, 7, + 0, 155, 156, 8, 9, 0, 0, 0, 10, 0, + 11, 12, 13, 14, 15, 16, 17, 0, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, - 52, 53, 0, 54, 0, 2, 0, 3, 4, 5, - 6, 7, 0, 0, 0, 8, 9, 55, 56, 0, - 10, -4, 11, 12, 13, 14, 15, 16, 17, -4, - -4, 18, 19, 20, 21, 22, 23, 24, 0, 0, - 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, -349, -349, -349, 0, -349, + 0, 0, 0, -349, -349, 0, 199, 56, -349, 299, + -349, -349, -349, -349, -349, -349, -349, 303, 0, -349, + -349, -349, -349, -349, -349, -349, 0, 0, 0, 0, + 0, 0, 0, 0, -349, 0, 0, -349, -349, -349, + -349, -349, -349, -349, -349, -349, -349, -349, -349, -349, + -349, -349, -349, -349, -349, -349, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, - 51, 52, 53, 0, 54, 0, 2, 0, 3, 4, - 5, 6, 7, 0, 0, 0, 8, 9, 55, 56, + 0, 0, 0, 0, -349, 0, 0, -349, -349, -349, + -349, -349, -349, 0, 0, -351, -351, -351, 0, -351, + 0, 0, 0, -351, -351, 0, -349, -349, -351, -349, + -351, -351, -351, -351, -351, -351, -351, -349, 0, -351, + -351, -351, -351, -351, -351, -351, 0, 0, 0, 0, + 0, 0, 0, 0, -351, 0, 0, -351, -351, -351, + -351, -351, -351, -351, -351, -351, -351, -351, -351, -351, + -351, -351, -351, -351, -351, -351, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -351, 0, 0, -351, -351, -351, + -351, -351, -351, 0, 0, -350, -350, -350, 0, -350, + 0, 0, 0, -350, -350, 0, -351, -351, -350, -351, + -350, -350, -350, -350, -350, -350, -350, -351, 0, -350, + -350, -350, -350, -350, -350, -350, 0, 0, 0, 0, + 0, 0, 0, 0, -350, 0, 0, -350, -350, -350, + -350, -350, -350, -350, -350, -350, -350, -350, -350, -350, + -350, -350, -350, -350, -350, -350, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -350, 0, 0, -350, -350, -350, + -350, -350, -350, 0, 0, 3, 4, 5, 0, 7, + 0, 0, 0, 8, 9, 0, -350, -350, 10, -350, + 11, 12, 13, 14, 15, 16, 17, -350, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, 3, 4, 5, 0, 7, + 0, 0, 0, 8, 9, 0, 199, 56, 10, 0, + 11, 12, 13, 14, 15, 16, 17, 200, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, 3, 4, 5, 0, 7, + 0, 0, 0, 8, 9, 0, 199, 56, 10, 0, + 11, 12, 13, 14, 15, 16, 17, 212, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, -349, -349, -349, 0, -349, + 0, 0, 0, -349, -349, 0, 199, 56, -349, 0, + -349, -349, -349, -349, -349, -349, -349, 214, 0, -349, + -349, -349, -349, -349, -349, -349, 0, 0, 0, 0, + 0, 0, 0, 0, -349, 0, 0, -349, -349, -349, + -349, -349, -349, -349, -349, -349, -349, -349, -349, -349, + -349, -349, -349, -349, -349, -349, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -349, 0, 0, -349, -349, -349, + -349, -349, -349, 0, 0, -351, -351, -351, 0, -351, + 0, 0, 0, -351, -351, 0, -349, -349, -351, 0, + -351, -351, -351, -351, -351, -351, -351, -349, 0, -351, + -351, -351, -351, -351, -351, -351, 0, 0, 0, 0, + 0, 0, 0, 0, -351, 0, 0, -351, -351, -351, + -351, -351, -351, -351, -351, -351, -351, -351, -351, -351, + -351, -351, -351, -351, -351, -351, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -351, 0, 0, -351, -351, -351, + -351, -351, -351, 0, 0, -350, -350, -350, 0, -350, + 0, 0, 0, -350, -350, 0, -351, -351, -350, 0, + -350, -350, -350, -350, -350, -350, -350, -351, 0, -350, + -350, -350, -350, -350, -350, -350, 0, 0, 0, 0, + 0, 0, 0, 0, -350, 0, 0, -350, -350, -350, + -350, -350, -350, -350, -350, -350, -350, -350, -350, -350, + -350, -350, -350, -350, -350, -350, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, -350, 0, 0, -350, -350, -350, + -350, -350, -350, 0, 0, 3, 4, 5, 0, 7, + 0, 0, 0, 8, 9, 0, -350, -350, 10, 0, + 11, 12, 13, 14, 15, 16, 17, -350, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, 3, 4, 5, 0, 7, + 0, 0, 0, 8, 9, 0, 199, 56, 10, 0, + 11, 12, 13, 14, 15, 16, 17, 512, 0, 185, + 186, 20, 21, 22, 23, 24, 0, 0, 0, 0, + 0, 0, 0, 0, 27, 0, 0, 30, 31, 174, + 175, 34, 35, 176, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 0, 196, 51, 52, + 197, 198, 54, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 199, 56, 86, 87, + 88, 89, 90, 91, 92, 93, 0, 516, 94, 95, + 96, 97, 98, 0, 0, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 163, 164, 165, 166, 113, + 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, + 167, 168, 169, 127, 243, 244, 170, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 129, 130, 131, + 132, 133, 134, 0, 135, 136, 0, 0, 137, 0, + 138, 0, 139, 140, 141, 142, 0, 0, 0, 0, + 0, 0, 0, 143, 0, 0, 0, 0, 0, 144, + 145, 146, 147, 148, 149, 150, 151, 152, 153, 0, + 154, 86, 87, 88, 89, 90, 91, 92, 93, 155, + 0, 94, 95, 96, 97, 98, 0, 0, 99, 100, + 101, 102, 103, 104, 105, 106, 107, 108, 163, 164, + 165, 166, 113, 114, 115, 116, 117, 118, 119, 120, + 121, 122, 123, 167, 168, 169, 127, 217, 0, 170, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 129, 130, 131, 132, 133, 134, 0, 135, 136, 0, + 0, 137, 0, 138, 0, 139, 140, 141, 142, 0, + 0, 0, 0, 0, 0, 0, 143, 0, 0, 0, + 0, 0, 144, 145, 146, 147, 148, 149, 150, 151, + 152, 153, 0, 154, 86, 87, 88, 89, 90, 91, + 92, 93, 155, 0, 94, 95, 96, 97, 98, 0, + 0, 99, 100, 101, 102, 103, 104, 105, 106, 107, + 108, 163, 164, 165, 166, 113, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 167, 168, 169, 127, + 0, 0, 170, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 129, 130, 131, 132, 133, 134, 0, + 135, 136, 0, 0, 137, 0, 138, 0, 139, 140, + 141, 142, 0, 0, 0, 0, 0, 0, 0, 143, + 0, 0, 0, 0, 0, 144, 145, 146, 147, 148, + 149, 150, 151, 152, 153, 0, 154, 0, 3, 4, + 5, 0, 7, 0, 0, 155, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, - -4, -4, 18, 19, 20, 21, 22, 23, 24, 0, + 0, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 197, 198, 54, 0, 0, 0, 0, + 0, 0, 0, 3, 4, 5, 0, 7, 0, 199, + 56, 8, 9, 0, 0, 339, 10, 0, 11, 12, + 13, 14, 15, 16, 17, 0, 0, 185, 186, 20, + 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, + 0, 0, 27, 0, 0, 30, 31, 174, 175, 34, + 35, 176, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 49, 0, 0, 196, 51, 52, 197, 198, + 54, 0, 0, 0, 0, 0, 0, 0, 3, 4, + 5, 6, 7, 0, 199, 56, 8, 9, 0, 0, + 349, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, - 223, 51, 52, 53, 0, 54, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 55, - 56, 0, 0, 0, 2, -4, 3, 4, 5, 6, - 7, -4, -4, 0, 8, 9, 0, 0, 0, 10, + 50, 51, 52, 53, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 55, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 18, 19, 20, 21, 22, 23, 24, 0, + 0, 25, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 50, 51, 52, 53, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 55, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 197, 198, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 483, 198, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 489, 198, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 609, 198, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 384, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 467, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 571, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 605, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 0, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 0, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 20, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 27, 0, 0, + 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 47, 48, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 196, 51, 52, 0, 0, 54, 0, 0, 3, 4, + 5, 0, 7, 0, 0, 0, 8, 9, 0, 199, + 56, 10, 0, 11, 12, 13, 14, 15, 16, 17, + 0, 0, 185, 186, 187, 21, 22, 23, 24, 0, + 0, 0, 0, 0, 0, 0, 0, 188, 0, 0, + 30, 31, 174, 175, 34, 35, 176, 37, 38, 39, + 40, 41, 42, 43, 44, 45, 46, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, + 50, 51, 52, 53, 0, 54, 3, 4, 5, 0, + 7, 581, 0, 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, - 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, - 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, + 185, 186, 187, 21, 22, 23, 24, 0, 0, 0, + 0, 0, 0, 0, 0, 188, 0, 0, 30, 31, + 174, 175, 34, 35, 176, 37, 38, 39, 40, 41, + 42, 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, - 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, - 0, 0, 2, -4, 3, 4, 5, 6, 7, -4, - -4, 0, 8, 9, 0, 0, 0, 10, 0, 11, - 12, 13, 14, 15, 16, 17, 0, 0, 18, 19, - 20, 21, 22, 23, 24, 0, 0, 25, 0, 0, - 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, + 52, 53, 0, 54, 3, 4, 5, 0, 7, 0, + 0, 0, 8, 9, 0, 0, 0, 10, 0, 11, + 12, 13, 14, 15, 16, 17, 0, 0, 185, 186, + 187, 21, 22, 23, 24, 0, 0, 0, 0, 0, + 0, 0, 0, 188, 0, 0, 30, 31, 174, 175, + 34, 35, 176, 37, 38, 39, 40, 41, 42, 43, + 44, 45, 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 50, 51, 52, 53, - 0, 54, 0, 2, 0, 3, 4, 5, 6, 7, - 0, 0, -4, 8, 9, 55, 56, 0, 10, -4, - 11, 12, 13, 14, 15, 16, 17, -4, -4, 18, - 19, 20, 21, 22, 23, 24, 0, 0, 25, 0, - 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 47, 48, 0, 0, 0, 0, + 0, 0, 0, 49, 0, 0, 263, 51, 52, 264, + 0, 54, 3, 4, 5, 0, 7, 0, 0, 0, + 8, 9, 0, 0, 0, 10, 0, 11, 12, 13, + 14, 15, 16, 17, 0, 0, 185, 186, 187, 21, + 22, 23, 24, 0, 0, 0, 0, 0, 0, 0, + 0, 188, 0, 0, 30, 31, 174, 175, 34, 35, + 176, 37, 38, 39, 40, 41, 42, 43, 44, 45, + 46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 0, 0, 50, 51, 52, - 53, 0, 54, 0, 0, 0, 3, 4, 5, 6, - 7, 0, 0, 0, 8, 9, 55, 56, 0, 10, - 0, 11, 12, 13, 14, 15, 16, 17, -4, -4, - 18, 19, 20, 21, 22, 23, 24, 0, 0, 25, - 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 50, 51, - 52, 53, 0, 54, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 55, 56, 0, - 0, 83, 84, 85, 86, 87, 88, 89, 90, 0, - 362, 91, 92, 93, 94, 95, 0, 0, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - 118, 119, 120, 121, 122, 123, 124, 34, 35, 125, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 126, 127, 128, 129, 130, 131, 0, 132, 133, 0, - 0, 134, 0, 135, 0, 136, 137, 138, 139, 0, - 0, 0, 0, 0, 0, 0, 140, 0, 0, 0, - 0, 0, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 0, 151, 0, 0, 3, 4, 5, 0, - 7, 0, 152, 153, 8, 9, 0, 0, 0, 10, - 0, 11, 12, 13, 14, 15, 16, 17, 0, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, -346, -346, -346, 0, - -346, 0, 0, 0, -346, -346, 0, 195, 56, -346, - 289, -346, -346, -346, -346, -346, -346, -346, 295, 0, - -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, - 0, 0, 0, 0, 0, -346, 0, 0, -346, -346, - -346, -346, -346, -346, -346, -346, -346, -346, -346, -346, - -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -346, 0, 0, -346, -346, - -346, -346, -346, -346, 0, 0, -348, -348, -348, 0, - -348, 0, 0, 0, -348, -348, 0, -346, -346, -348, - -346, -348, -348, -348, -348, -348, -348, -348, -346, 0, - -348, -348, -348, -348, -348, -348, -348, 0, 0, 0, - 0, 0, 0, 0, 0, -348, 0, 0, -348, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - -348, -348, -348, -348, -348, -348, -348, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -348, 0, 0, -348, -348, - -348, -348, -348, -348, 0, 0, -347, -347, -347, 0, - -347, 0, 0, 0, -347, -347, 0, -348, -348, -347, - -348, -347, -347, -347, -347, -347, -347, -347, -348, 0, - -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, - 0, 0, 0, 0, 0, -347, 0, 0, -347, -347, - -347, -347, -347, -347, -347, -347, -347, -347, -347, -347, - -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -347, 0, 0, -347, -347, - -347, -347, -347, -347, 0, 0, 3, 4, 5, 0, - 7, 0, 0, 0, 8, 9, 0, -347, -347, 10, - -347, 11, 12, 13, 14, 15, 16, 17, -347, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, 3, 4, 5, 0, - 7, 0, 0, 0, 8, 9, 0, 195, 56, 10, - 0, 11, 12, 13, 14, 15, 16, 17, 196, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, 3, 4, 5, 0, - 7, 0, 0, 0, 8, 9, 0, 195, 56, 10, - 0, 11, 12, 13, 14, 15, 16, 17, 208, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, -346, -346, -346, 0, - -346, 0, 0, 0, -346, -346, 0, 195, 56, -346, - 0, -346, -346, -346, -346, -346, -346, -346, 210, 0, - -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, - 0, 0, 0, 0, 0, -346, 0, 0, -346, -346, - -346, -346, -346, -346, -346, -346, -346, -346, -346, -346, - -346, -346, -346, -346, -346, -346, -346, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -346, 0, 0, -346, -346, - -346, -346, -346, -346, 0, 0, -348, -348, -348, 0, - -348, 0, 0, 0, -348, -348, 0, -346, -346, -348, - 0, -348, -348, -348, -348, -348, -348, -348, -346, 0, - -348, -348, -348, -348, -348, -348, -348, 0, 0, 0, - 0, 0, 0, 0, 0, -348, 0, 0, -348, -348, - -348, -348, -348, -348, -348, -348, -348, -348, -348, -348, - -348, -348, -348, -348, -348, -348, -348, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -348, 0, 0, -348, -348, - -348, -348, -348, -348, 0, 0, -347, -347, -347, 0, - -347, 0, 0, 0, -347, -347, 0, -348, -348, -347, - 0, -347, -347, -347, -347, -347, -347, -347, -348, 0, - -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, - 0, 0, 0, 0, 0, -347, 0, 0, -347, -347, - -347, -347, -347, -347, -347, -347, -347, -347, -347, -347, - -347, -347, -347, -347, -347, -347, -347, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, -347, 0, 0, -347, -347, - -347, -347, -347, -347, 0, 0, 3, 4, 5, 0, - 7, 0, 0, 0, 8, 9, 0, -347, -347, 10, - 0, 11, 12, 13, 14, 15, 16, 17, -347, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, 3, 4, 5, 0, - 7, 0, 0, 0, 8, 9, 0, 195, 56, 10, - 0, 11, 12, 13, 14, 15, 16, 17, 487, 0, - 181, 182, 20, 21, 22, 23, 24, 0, 0, 0, - 0, 0, 0, 0, 0, 27, 0, 0, 30, 31, - 171, 172, 34, 35, 173, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 0, 192, 51, - 52, 193, 194, 54, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 195, 56, 83, - 84, 85, 86, 87, 88, 89, 90, 0, 493, 91, - 92, 93, 94, 95, 0, 0, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 160, 161, 162, 163, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 164, 165, 166, 124, 234, 235, 167, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 126, 127, - 128, 129, 130, 131, 0, 132, 133, 0, 0, 134, - 0, 135, 0, 136, 137, 138, 139, 0, 0, 0, - 0, 0, 0, 0, 140, 0, 0, 0, 0, 0, - 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, - 0, 151, 83, 84, 85, 86, 87, 88, 89, 90, - 152, 0, 91, 92, 93, 94, 95, 0, 0, 96, - 97, 98, 99, 100, 101, 102, 103, 104, 105, 160, - 161, 162, 163, 110, 111, 112, 113, 114, 115, 116, - 117, 118, 119, 120, 164, 165, 166, 124, 213, 0, - 167, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 126, 127, 128, 129, 130, 131, 0, 132, 133, - 0, 0, 134, 0, 135, 0, 136, 137, 138, 139, - 0, 0, 0, 0, 0, 0, 0, 140, 0, 0, - 0, 0, 0, 141, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 0, 151, 83, 84, 85, 86, 87, - 88, 89, 90, 152, 0, 91, 92, 93, 94, 95, - 0, 0, 96, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 160, 161, 162, 163, 110, 111, 112, 113, - 114, 115, 116, 117, 118, 119, 120, 164, 165, 166, - 124, 0, 0, 167, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 126, 127, 128, 129, 130, 131, - 0, 132, 133, 0, 0, 134, 0, 135, 0, 136, - 137, 138, 139, 0, 0, 0, 0, 0, 0, 0, - 140, 0, 0, 0, 0, 0, 141, 142, 143, 144, - 145, 146, 147, 148, 149, 150, 0, 151, 0, 3, - 4, 5, 0, 7, 0, 0, 152, 8, 9, 0, - 0, 0, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 20, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 193, 194, 54, 0, 0, 0, - 0, 0, 0, 0, 3, 4, 5, 0, 7, 0, - 195, 56, 8, 9, 0, 0, 329, 10, 0, 11, - 12, 13, 14, 15, 16, 17, 0, 0, 181, 182, - 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, - 0, 0, 0, 27, 0, 0, 30, 31, 171, 172, - 34, 35, 173, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 0, 192, 51, 52, 193, - 194, 54, 0, 0, 0, 0, 0, 0, 0, 3, - 4, 5, 6, 7, 0, 195, 56, 8, 9, 0, - 0, 338, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, - 0, 0, 25, 0, 0, 0, 0, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 50, 51, 52, 53, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 55, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 18, 19, 20, 21, 22, 23, 24, - 0, 0, 25, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 50, 51, 52, 53, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 55, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 20, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 193, 194, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 462, 194, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 468, 194, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 584, 194, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 370, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 446, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 545, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 580, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 0, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 20, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 27, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 192, 51, 52, 0, 0, 54, 0, 0, 3, - 4, 5, 0, 7, 0, 0, 0, 8, 9, 0, - 195, 56, 10, 0, 11, 12, 13, 14, 15, 16, - 17, 0, 0, 181, 182, 183, 21, 22, 23, 24, - 0, 0, 0, 0, 0, 0, 0, 0, 184, 0, - 0, 30, 31, 171, 172, 34, 35, 173, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, - 0, 50, 51, 52, 53, 0, 54, 3, 4, 5, - 0, 7, 556, 0, 0, 8, 9, 0, 0, 0, - 10, 0, 11, 12, 13, 14, 15, 16, 17, 0, - 0, 181, 182, 183, 21, 22, 23, 24, 0, 0, - 0, 0, 0, 0, 0, 0, 184, 0, 0, 30, - 31, 171, 172, 34, 35, 173, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 49, 0, 0, 50, - 51, 52, 53, 0, 54, 3, 4, 5, 0, 7, - 0, 0, 0, 8, 9, 0, 0, 0, 10, 0, - 11, 12, 13, 14, 15, 16, 17, 0, 0, 181, - 182, 183, 21, 22, 23, 24, 0, 0, 0, 0, - 0, 0, 0, 0, 184, 0, 0, 30, 31, 171, - 172, 34, 35, 173, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 46, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 0, 0, 254, 51, 52, - 255, 0, 54, 3, 4, 5, 0, 7, 0, 0, - 0, 8, 9, 0, 0, 0, 10, 0, 11, 12, - 13, 14, 15, 16, 17, 0, 0, 181, 182, 183, - 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, - 0, 0, 184, 0, 0, 30, 31, 171, 172, 34, - 35, 173, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 0, 0, 254, 51, 52, 484, 0, - 54, 3, 4, 5, 0, 7, 0, 0, 0, 8, - 9, 0, 0, 0, 10, 0, 11, 12, 13, 14, - 15, 16, 17, 0, 0, 181, 182, 183, 21, 22, - 23, 24, 0, 0, 0, 0, 0, 0, 0, 0, - 184, 0, 0, 30, 31, 171, 172, 34, 35, 173, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 0, 258, 259, 260, 261, 262, 263, 264, 265, 266, - 267, 268, 269, 270, 0, 0, 271, 272, 0, 0, - 49, 0, 0, 192, 51, 52, 0, 0, 54, 273, - 486, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283, 258, 259, 260, 261, 262, 263, 264, 265, 266, - 267, 268, 269, 270, 0, 0, 271, 272, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 273, - 0, 274, 275, 276, 277, 278, 279, 280, 281, 282, - 283 + 0, 49, 0, 0, 263, 51, 52, 509, 0, 54, + 3, 4, 5, 0, 7, 0, 0, 0, 8, 9, + 0, 0, 0, 10, 0, 11, 12, 13, 14, 15, + 16, 17, 0, 0, 185, 186, 187, 21, 22, 23, + 24, 0, 0, 0, 0, 0, 0, 0, 0, 188, + 0, 0, 30, 31, 174, 175, 34, 35, 176, 37, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 268, + 269, 270, 271, 272, 273, 274, 0, 0, 277, 278, + 0, 0, 0, 0, 281, 282, 0, 0, 0, 49, + 0, 0, 196, 51, 52, 0, 0, 54, 0, 284, + 285, 286, 287, 288, 289, 290, 291, 292, 293 }; static const short yycheck[] = { 1, - 2, 177, 6, 13, 206, 7, 8, 9, 10, 11, - 12, 13, 65, 18, 19, 20, 18, 19, 20, 13, - 210, 180, 26, 25, 184, 52, 8, 9, 305, 11, - 12, 2, 311, 26, 336, 51, 52, 50, 58, 13, - 19, 1, 4, 25, 34, 35, 76, 516, 50, 47, - 54, 53, 332, 55, 434, 435, 336, 64, 360, 53, - 13, 81, 514, 65, 516, 26, 47, 116, 34, 35, - 47, 76, 47, 223, 76, 81, 72, 26, 80, 34, - 35, 34, 35, 107, 47, 34, 35, 49, 51, 325, - 88, 89, 99, 100, 101, 102, 103, 111, 80, 335, - 96, 107, 116, 109, 254, 295, 112, 88, 89, 115, - 49, 88, 89, 88, 89, 47, 79, 115, 230, 51, - 232, 60, 61, 116, 117, 327, 116, 117, 597, 8, - 1, 2, 15, 26, 17, 95, 7, 8, 9, 10, - 11, 12, 116, 117, 304, 597, 107, 18, 19, 20, - 116, 153, 429, 111, 25, 110, 116, 117, 81, 179, - 180, 191, 64, 116, 117, 83, 445, 116, 117, 107, - 81, 153, 91, 91, 1, 2, 81, 115, 458, 50, - 7, 341, 26, 10, 55, 81, 109, 567, 568, 112, - 192, 196, 572, 111, 196, 111, 64, 81, 109, 101, - 102, 103, 17, 208, 109, 76, 208, 112, 210, 80, - 223, 79, 80, 109, 111, 107, 218, 196, 25, 116, - 115, 223, 81, 50, 115, 109, 81, 81, 112, 208, - 610, 99, 100, 101, 102, 103, 252, 539, 116, 117, - 115, 254, 81, 245, 246, 247, 248, 249, 250, 251, - 109, 111, 254, 255, 109, 109, 107, 112, 112, 539, - 81, 255, 81, 465, 246, 247, 248, 249, 250, 251, - 109, 81, 448, 112, 245, 83, 111, 83, 298, 299, - 439, 83, 153, 91, 286, 91, 81, 83, 109, 91, - 109, 112, 64, 295, 310, 91, 573, 487, 457, 109, - 316, 303, 581, 493, 83, 332, 81, 79, 80, 111, - 81, 313, 91, 315, 109, 111, 115, 319, 111, 321, - 81, 192, 375, 325, 326, 196, 98, 99, 100, 101, - 102, 103, 111, 335, 109, 83, 538, 208, 109, 210, - 542, 345, 83, 91, 326, 83, 348, 218, 109, 64, - 91, 511, 223, 91, 47, 48, 47, 48, 51, 110, - 51, 110, 47, 48, 110, 192, 51, 47, 48, 34, - 35, 51, 108, 375, 245, 246, 247, 248, 249, 250, - 251, 14, 15, 254, 37, 38, 39, 40, 110, 111, - 113, 218, 111, 15, 13, 10, 223, 110, 110, 110, - 405, 577, 108, 405, 111, 410, 110, 609, 410, 111, - 110, 431, 113, 284, 285, 286, 110, 10, 245, 439, - 422, 423, 110, 91, 295, 111, 47, 254, 430, 47, - 111, 9, 303, 437, 438, 111, 111, 457, 111, 441, - 422, 10, 313, 10, 315, 115, 115, 113, 319, 89, - 321, 111, 323, 324, 325, 326, 113, 108, 10, 10, - 89, 10, 10, 334, 335, 10, 110, 110, 96, 10, - 108, 10, 111, 475, 110, 10, 303, 348, 10, 350, - 0, 0, 484, 612, 504, 487, 313, 497, 315, 497, - 484, 493, 319, 475, 321, 497, 498, 499, 1, 2, - 414, 503, 5, 497, 7, 8, 9, 10, 11, 12, - 13, 581, 574, 5, 573, 514, 429, -1, -1, -1, - 522, 348, 25, 525, -1, 527, -1, -1, -1, -1, - -1, 533, -1, -1, 405, 537, -1, -1, -1, 410, - -1, -1, -1, -1, -1, 527, -1, 50, -1, 1, - 53, 422, 423, -1, -1, 7, -1, -1, 10, 430, - -1, -1, 65, -1, -1, -1, -1, -1, -1, -1, - 441, -1, -1, -1, -1, -1, -1, 80, -1, -1, - -1, 1, 2, -1, -1, -1, -1, 7, 8, 9, - 10, 11, 12, 13, -1, -1, 423, -1, -1, 601, - -1, 603, 64, 430, 475, 25, -1, -1, -1, -1, - -1, -1, -1, -1, 441, -1, 487, 79, 80, -1, - -1, -1, 493, -1, -1, -1, -1, 498, 499, -1, - 50, -1, 503, 53, 96, 97, 98, 99, 100, 101, - 102, 103, -1, -1, -1, 65, -1, -1, -1, -1, - 153, 522, -1, -1, 525, -1, 527, -1, -1, -1, - 80, -1, 533, -1, -1, -1, 537, -1, -1, -1, - -1, 498, 499, -1, -1, -1, 503, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 192, - -1, -1, -1, -1, -1, 522, -1, -1, 525, -1, - -1, -1, -1, -1, -1, -1, 533, -1, -1, -1, - 537, -1, -1, -1, -1, 218, -1, -1, -1, -1, - 223, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 601, -1, 603, 153, -1, -1, -1, -1, -1, -1, - -1, -1, 245, 246, 247, 248, 249, 250, 251, -1, - -1, 254, 255, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 218, -1, 79, 80, - -1, -1, 192, 84, 601, -1, 603, -1, -1, -1, - -1, 92, -1, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, -1, -1, -1, -1, -1, 218, -1, - 303, -1, -1, 223, -1, -1, -1, -1, -1, -1, - 313, -1, 315, -1, -1, -1, 319, -1, 321, -1, - -1, -1, -1, 326, -1, 245, 246, 247, 248, 249, - 250, 251, -1, -1, 254, 255, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 348, -1, -1, -1, -1, - -1, 303, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 313, -1, 315, -1, -1, -1, 319, -1, 321, - -1, -1, 375, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 303, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 313, -1, 315, 348, -1, -1, 319, - -1, 321, -1, -1, -1, -1, 326, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 422, - 423, -1, -1, -1, -1, -1, -1, 430, 348, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 441, -1, - -1, -1, -1, -1, -1, -1, 18, 19, 20, -1, - -1, -1, -1, -1, -1, 375, -1, -1, -1, -1, + 2, 13, 181, 65, 210, 7, 8, 9, 10, 11, + 12, 184, 214, 6, 52, 319, 18, 19, 20, 188, + 347, 8, 9, 25, 11, 12, 313, 342, 51, 52, + 58, 2, 347, 26, 50, 19, 13, 26, 25, 25, + 18, 19, 20, 25, 335, 372, 78, 227, 50, 25, + 25, 1, 25, 55, 111, 346, 84, 453, 454, 537, + 64, 54, 540, 116, 34, 35, 47, 13, 4, 111, + 107, 72, 107, 47, 116, 540, 78, 51, 81, 26, + 115, 83, 26, 263, 375, 91, 83, 26, 34, 35, + 34, 35, 34, 35, 91, 96, 83, 101, 102, 103, + 78, 303, 34, 35, 107, 79, 109, 88, 89, 112, + 96, 83, 115, 49, 96, 15, 83, 17, 91, 91, + 96, 96, 83, 96, 91, 111, 91, 116, 117, 111, + 91, 337, 14, 15, 115, 111, 111, 110, 47, 116, + 117, 1, 2, 312, 622, 95, 116, 7, 8, 9, + 10, 11, 12, 13, 156, 183, 184, 622, 18, 19, + 20, 448, 466, 195, 479, 25, 116, 117, 107, 156, + 116, 117, 116, 117, 116, 117, 81, 111, 110, 88, + 89, 83, 116, 352, 26, 47, 81, 81, 47, 91, + 50, 83, 111, 53, 196, 55, 592, 593, 200, 91, + 8, 597, 116, 117, 109, 65, 64, 112, 91, 111, + 212, 227, 214, 17, 109, 109, 200, 508, 78, 111, + 222, 107, 200, 83, 115, 227, 88, 89, 212, 88, + 89, 81, 81, 111, 212, 115, 81, 564, 261, 635, + 115, 99, 100, 101, 102, 103, 81, 263, 81, 564, + 25, 115, 254, 255, 256, 257, 258, 259, 260, 109, + 109, 263, 112, 112, 109, 267, 107, 112, 255, 256, + 257, 258, 259, 260, 109, 111, 109, 112, 306, 307, + 486, 64, 47, 254, 81, 458, 51, 110, 81, 81, + 469, 110, 294, 295, 296, 318, 156, 81, 83, 34, + 35, 303, 606, 326, 342, 478, 91, 81, 110, 311, + 512, 598, 109, 83, 516, 112, 109, 109, 81, 112, + 322, 91, 81, 325, 113, 109, 111, 329, 112, 331, + 392, 333, 334, 335, 336, 109, 196, 235, 112, 237, + 200, 111, 81, 345, 346, 111, 109, 81, 81, 336, + 109, 108, 212, 64, 214, 47, 48, 563, 360, 51, + 362, 567, 222, 15, 357, 534, 49, 227, 79, 80, + 109, 13, 374, 375, 10, 109, 109, 60, 61, 47, + 48, 110, 111, 51, 110, 96, 97, 98, 99, 100, + 101, 102, 103, 110, 254, 255, 256, 257, 258, 259, + 260, 47, 48, 263, 264, 51, 110, 267, 47, 48, + 47, 48, 51, 108, 51, 47, 48, 110, 83, 51, + 111, 111, 450, 602, 426, 110, 113, 10, 634, 431, + 458, 37, 38, 39, 40, 110, 296, 110, 91, 441, + 442, 111, 47, 303, 47, 111, 9, 449, 426, 111, + 478, 311, 64, 431, 441, 111, 111, 10, 10, 461, + 89, 115, 322, 456, 457, 325, 115, 79, 80, 329, + 113, 331, 113, 1, 2, 335, 336, 5, 111, 7, + 8, 9, 10, 11, 12, 13, 346, 99, 100, 101, + 102, 103, 108, 113, 496, 10, 10, 25, 89, 527, + 360, 10, 10, 10, 113, 507, 508, 96, 520, 496, + 512, 110, 110, 10, 516, 375, 108, 10, 111, 521, + 110, 523, 50, 10, 526, 53, 10, 0, 0, 53, + 637, 435, 392, 606, 599, 520, 267, 65, 64, 5, + 598, 448, 537, -1, 546, -1, -1, 549, -1, -1, + 552, -1, -1, 79, 80, 83, 558, -1, -1, -1, + 562, -1, -1, -1, -1, 552, 426, -1, -1, -1, + -1, 431, 98, 99, 100, 101, 102, 103, -1, -1, + -1, 441, 442, -1, -1, -1, -1, -1, 1, 449, + -1, -1, -1, -1, 7, -1, -1, 10, 1, 2, + -1, 461, -1, -1, 7, -1, -1, 10, -1, -1, + 13, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 626, -1, 628, -1, 156, -1, + -1, 1, 2, -1, -1, -1, 496, 7, 8, 9, + 10, 11, 12, 13, -1, -1, -1, 50, 508, 509, + -1, -1, 512, -1, -1, 25, 516, -1, -1, -1, + 520, 521, -1, 523, -1, -1, 526, -1, 196, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 423, 475, -1, -1, 47, 48, -1, 430, 51, - 52, 484, -1, 55, 56, -1, -1, -1, -1, 441, - -1, -1, -1, -1, 497, 498, 499, -1, -1, -1, - 503, -1, 422, 423, 76, -1, -1, -1, -1, -1, - 430, -1, -1, -1, -1, -1, -1, -1, -1, 522, - -1, 441, 525, -1, 527, -1, -1, -1, -1, -1, - 533, -1, -1, -1, 537, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 498, 499, -1, -1, - -1, 503, -1, -1, -1, 475, 64, 65, 66, 67, - 68, 69, 70, 71, 484, 73, 74, -1, -1, -1, - 522, 79, 80, 525, -1, -1, -1, 497, 498, 499, - -1, 533, -1, 503, -1, 537, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, -1, -1, 601, -1, - 603, -1, 522, -1, -1, 525, -1, 527, -1, -1, - -1, -1, -1, 533, -1, -1, -1, 537, -1, -1, - -1, 193, 194, 195, 196, 64, 65, 66, 67, 68, - 69, 70, -1, -1, 73, 74, 208, -1, 210, -1, - 79, 80, -1, -1, -1, -1, -1, -1, -1, 601, - -1, 603, -1, -1, -1, 94, 95, 96, 97, 98, - 99, 100, 101, 102, 103, -1, -1, -1, -1, -1, + 50, -1, -1, 53, 1, 2, 546, -1, -1, 549, + 7, -1, 552, 10, 222, 65, -1, -1, 558, 227, + -1, -1, 562, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 83, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 254, 255, 256, 257, + 258, 259, 260, 50, -1, 263, 264, -1, -1, -1, + -1, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, -1, -1, 79, 80, -1, -1, + -1, -1, -1, -1, -1, -1, 626, -1, 628, 92, + -1, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, -1, -1, 311, -1, -1, 156, -1, 111, -1, + -1, -1, -1, 196, 322, -1, -1, 325, -1, -1, + -1, 329, -1, 331, -1, -1, -1, -1, 336, 222, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 222, + -1, -1, -1, -1, 227, -1, 196, -1, -1, -1, + -1, -1, 360, -1, -1, -1, -1, -1, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 254, 222, 79, 80, -1, -1, 227, 84, -1, + 263, 264, -1, -1, 392, -1, 92, -1, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, -1, 196, + -1, -1, -1, -1, 254, 255, 256, 257, 258, 259, + 260, -1, -1, 263, 264, -1, -1, -1, 311, -1, + -1, -1, -1, -1, -1, 222, -1, -1, 311, 322, + 227, -1, 325, 441, 442, -1, 329, -1, 331, 322, + -1, 449, 325, -1, -1, -1, 329, -1, 331, -1, + -1, -1, -1, 461, -1, -1, -1, 254, -1, -1, + -1, 311, -1, -1, -1, -1, 263, 360, -1, -1, + 267, -1, 322, -1, -1, 325, -1, 360, -1, 329, + -1, 331, -1, -1, -1, -1, 336, -1, 496, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 252, 601, -1, 603, -1, -1, 258, 259, 260, 261, - 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, - 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, - 282, 283, -1, -1, 286, -1, -1, -1, -1, -1, - -1, 293, 294, 295, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 310, -1, - -1, -1, -1, -1, 316, -1, -1, -1, -1, -1, - -1, -1, -1, 325, -1, -1, -1, -1, -1, 331, - 332, -1, -1, 335, 336, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 347, -1, -1, -1, -1, - -1, -1, 354, -1, -1, -1, -1, -1, 360, 8, - 9, -1, 11, 12, -1, -1, -1, -1, 370, 18, + -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, + 360, -1, 520, 521, 311, 523, -1, -1, 526, -1, + -1, -1, -1, -1, -1, 322, -1, -1, 325, -1, + -1, -1, 329, -1, 331, -1, -1, -1, 546, -1, + -1, 549, 392, -1, 552, -1, -1, -1, -1, 442, + 558, -1, -1, -1, 562, -1, 449, -1, -1, 442, + -1, -1, -1, 360, -1, -1, 449, -1, 461, -1, + 64, 65, 66, 67, 68, 69, 70, 71, 461, 73, + 74, -1, -1, -1, -1, 79, 80, -1, -1, -1, + -1, 441, 442, -1, -1, -1, -1, -1, -1, 449, + 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + -1, 461, -1, -1, -1, -1, -1, -1, 626, -1, + 628, -1, -1, -1, -1, -1, 509, -1, 521, -1, + 523, -1, -1, 526, -1, -1, -1, 520, 521, -1, + 523, -1, -1, 526, -1, 442, 496, -1, -1, -1, + -1, -1, 449, 546, -1, -1, 549, -1, -1, 509, + 18, 19, 20, 546, 461, 558, 549, -1, -1, 562, + 520, 521, -1, 523, -1, 558, 526, -1, -1, 562, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 47, + 48, -1, -1, 51, 52, -1, 546, 55, 56, 549, + -1, -1, 552, -1, -1, -1, -1, -1, 558, -1, + -1, -1, 562, -1, -1, -1, -1, -1, -1, -1, + 78, -1, -1, -1, 521, -1, 523, 51, 52, 526, + -1, -1, -1, 626, -1, 628, -1, -1, -1, -1, + -1, -1, -1, 626, -1, 628, -1, -1, -1, 546, + -1, -1, 549, -1, -1, -1, -1, -1, -1, -1, + -1, 558, -1, -1, -1, 562, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 626, -1, 628, 64, + 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, + 75, 76, -1, -1, 79, 80, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 92, 93, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 626, + -1, 628, -1, -1, -1, -1, -1, -1, -1, 197, + 198, 199, 200, -1, -1, -1, -1, -1, -1, 173, + -1, -1, -1, -1, 212, -1, 214, -1, -1, -1, + -1, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, -1, -1, 79, 80, -1, -1, + -1, 205, -1, -1, -1, -1, 210, -1, -1, 92, + 214, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, -1, -1, 261, -1, -1, -1, -1, -1, 267, + 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, + 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, + 288, 289, 290, 291, 292, 293, -1, -1, 296, -1, + -1, -1, -1, -1, 302, 303, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 318, -1, -1, -1, -1, -1, 324, -1, 326, -1, + -1, -1, 296, -1, -1, -1, -1, 335, -1, 303, + -1, -1, -1, 341, 342, -1, -1, -1, 346, 347, + -1, -1, -1, -1, 318, 319, -1, -1, -1, -1, + -1, 359, -1, -1, -1, -1, -1, -1, 366, -1, + -1, 335, -1, 337, 372, -1, -1, 375, -1, -1, + -1, -1, 346, -1, -1, -1, 384, -1, -1, 8, + 9, -1, 11, 12, -1, -1, -1, -1, -1, 18, 19, 20, -1, -1, -1, -1, 25, -1, -1, -1, - -1, -1, -1, -1, -1, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 73, 74, 75, 76, -1, -1, - 79, 80, -1, 405, -1, -1, 55, -1, 410, -1, - -1, -1, -1, 415, 416, 94, 95, 96, 97, 98, - 99, 100, 101, 102, 103, -1, -1, 76, -1, -1, - -1, 80, -1, -1, -1, -1, -1, 64, 65, 66, - 67, 68, 69, 70, 446, -1, 73, 74, -1, -1, - -1, -1, 79, 80, -1, -1, -1, -1, -1, -1, - 462, -1, -1, -1, -1, -1, 468, 94, 95, 96, - 97, 98, 99, 100, 101, 102, 103, -1, -1, -1, - 482, -1, -1, -1, 486, 487, -1, 489, 490, 491, - 492, 493, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 153, -1, 508, -1, -1, -1, + -1, 375, -1, -1, 64, 65, 66, 67, 68, 69, + 70, 71, 72, 73, 74, 75, 76, -1, 426, 79, + 80, -1, -1, 431, -1, -1, 55, -1, 436, -1, + -1, -1, -1, -1, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, -1, -1, -1, -1, -1, 78, + -1, -1, -1, -1, 83, -1, -1, -1, -1, 467, + 434, 435, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 483, -1, 451, -1, 453, + 454, 489, -1, -1, -1, -1, -1, -1, 462, -1, + 464, -1, 466, -1, -1, -1, -1, 505, -1, -1, + 508, -1, -1, 511, 512, -1, 514, 515, 516, -1, + -1, -1, 486, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 531, -1, -1, -1, 156, -1, -1, + -1, -1, -1, -1, 508, -1, -1, -1, 512, 547, + -1, -1, 516, -1, -1, -1, -1, -1, -1, 557, + -1, -1, -1, -1, -1, -1, 564, -1, -1, -1, + -1, -1, -1, 571, -1, -1, -1, -1, -1, -1, + -1, 200, 580, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 212, -1, 214, -1, -1, -1, 563, + -1, -1, -1, 567, -1, -1, -1, 605, -1, -1, + -1, 609, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 592, 593, + -1, -1, -1, 597, -1, 599, 255, 256, 257, 258, + 259, 260, 606, -1, -1, -1, -1, -1, 267, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, + 65, 66, 67, 68, 69, 70, -1, -1, 73, 74, + 634, 635, -1, 637, 79, 80, -1, 296, -1, -1, + -1, -1, -1, -1, 303, -1, -1, -1, -1, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 523, -1, -1, -1, -1, -1, -1, -1, -1, - 532, -1, -1, -1, -1, -1, -1, 539, -1, -1, - -1, -1, -1, 545, -1, -1, -1, 196, -1, -1, - -1, -1, 554, 555, -1, -1, -1, -1, -1, 208, - -1, 210, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 580, -1, - -1, -1, 584, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 246, 247, 248, - 249, 250, 251, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 335, 336, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 346, -1, -1, -1, 0, 1, -1, 3, 4, 5, 6, 7, -1, -1, -1, 11, 12, -1, -1, -1, 16, -1, 18, - 19, 20, 21, 22, 23, 24, -1, 286, 27, 28, - 29, 30, 31, 32, 33, -1, 295, 36, -1, -1, + 19, 20, 21, 22, 23, 24, 375, -1, 27, 28, + 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, -1, 325, 326, -1, -1, - -1, -1, -1, -1, -1, -1, 335, -1, -1, -1, + 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 426, -1, -1, + -1, -1, 431, 82, -1, -1, 85, 86, 87, 88, + -1, 90, 441, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 104, 105, -1, -1, -1, + -1, -1, -1, -1, 0, -1, -1, 116, 117, -1, + -1, -1, 8, 9, 10, -1, -1, -1, 14, 15, + -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, + 26, -1, -1, -1, -1, -1, -1, 496, 34, 35, + -1, 37, 38, 39, 40, -1, -1, -1, -1, 508, + -1, -1, -1, 512, -1, -1, -1, 516, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, -1, -1, 79, 80, 81, -1, 83, -1, -1, + -1, -1, -1, 552, -1, 91, 92, -1, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, -1, 0, + -1, -1, 108, 109, 110, 111, 112, 8, 9, 10, + 116, 117, -1, 14, 15, -1, 17, -1, -1, -1, + -1, -1, -1, -1, -1, 26, -1, -1, -1, -1, + -1, -1, -1, 34, 35, -1, 37, 38, 39, 40, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 74, 75, 76, -1, -1, 79, 80, + 81, -1, 83, -1, -1, -1, -1, -1, -1, -1, + 91, 92, -1, 94, 95, 96, 97, 98, 99, 100, + 101, 102, 103, -1, 0, -1, -1, 108, 109, 110, + 111, 112, 8, 9, 10, 116, 117, -1, 14, 15, + -1, 17, -1, -1, -1, -1, -1, -1, -1, -1, + 26, -1, -1, -1, -1, -1, -1, -1, 34, 35, + -1, 37, 38, 39, 40, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 64, 65, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, -1, -1, 79, 80, 81, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 92, -1, 94, 95, + 96, 97, 98, 99, 100, 101, 102, 103, -1, -1, + -1, -1, 108, 109, 110, -1, 112, -1, -1, -1, + 116, 117, 1, -1, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, -1, -1, 15, 16, -1, 18, + 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, + 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, + -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, - -1, 90, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 75, 76, 104, 105, 79, 80, -1, - -1, -1, -1, -1, -1, -1, -1, 116, 117, -1, - 92, -1, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, -1, -1, -1, -1, -1, -1, -1, 111, - -1, -1, -1, -1, -1, -1, 405, -1, -1, -1, - -1, 410, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 422, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, - -1, -1, -1, 8, 9, 10, -1, -1, -1, 14, - 15, -1, 17, -1, -1, -1, -1, -1, -1, -1, - -1, 26, -1, -1, -1, -1, -1, -1, -1, 34, - 35, -1, 37, 38, 39, 40, 475, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 487, -1, - -1, -1, -1, -1, 493, -1, -1, -1, -1, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, -1, -1, 79, 80, 81, -1, 83, -1, - -1, -1, -1, -1, -1, -1, 91, 92, 527, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, -1, - 0, -1, -1, 108, 109, 110, 111, 112, 8, 9, - 10, 116, 117, -1, 14, 15, -1, 17, -1, -1, - -1, -1, -1, -1, -1, -1, 26, -1, -1, -1, - -1, -1, -1, -1, 34, 35, -1, 37, 38, 39, - 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 90, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 104, 105, -1, -1, -1, + 1, -1, 3, 4, 5, 6, 7, 116, 117, 10, + 11, 12, -1, 14, 15, 16, -1, 18, 19, 20, + 21, 22, 23, 24, -1, -1, 27, 28, 29, 30, + 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 73, 74, 75, 76, -1, -1, 79, - 80, 81, -1, 83, -1, -1, -1, -1, -1, -1, - -1, 91, 92, -1, 94, 95, 96, 97, 98, 99, - 100, 101, 102, 103, -1, 0, -1, -1, 108, 109, - 110, 111, 112, 8, 9, 10, 116, 117, -1, 14, - 15, -1, 17, -1, -1, -1, -1, -1, -1, -1, - -1, 26, -1, -1, -1, -1, -1, -1, -1, 34, - 35, -1, 37, 38, 39, 40, -1, -1, -1, -1, + -1, 82, -1, -1, 85, 86, 87, 88, -1, 90, + -1, 1, -1, 3, 4, 5, 6, 7, -1, -1, + 10, 11, 12, 104, 105, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 116, 117, 27, 28, 29, + 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, + -1, 41, 42, 43, 44, 45, 46, 47, 48, 49, + 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 64, - 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, -1, -1, 79, 80, 81, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 92, -1, 94, - 95, 96, 97, 98, 99, 100, 101, 102, 103, -1, - -1, -1, -1, 108, 109, 110, -1, 112, -1, -1, - -1, 116, 117, 1, -1, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, -1, -1, 15, 16, -1, + -1, -1, 82, -1, -1, 85, 86, 87, 88, -1, + 90, -1, 1, -1, 3, 4, 5, 6, 7, -1, + -1, 10, 11, 12, 104, 105, 15, 16, -1, 18, + 19, 20, 21, 22, 23, 24, 116, 117, 27, 28, + 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, + -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, + -1, 90, -1, 1, -1, 3, 4, 5, 6, 7, + -1, 9, 10, 11, 12, 104, 105, -1, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 116, 117, 27, + 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, + -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, -1, 90, -1, 1, -1, 3, 4, 5, 6, + 7, -1, -1, -1, 11, 12, 104, 105, -1, 16, + 17, 18, 19, 20, 21, 22, 23, 24, 116, 117, + 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, + -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, + 87, 88, -1, 90, -1, 1, -1, 3, 4, 5, + 6, 7, -1, -1, -1, 11, 12, 104, 105, -1, + 16, -1, 18, 19, 20, 21, 22, 23, 24, 116, + 117, 27, 28, 29, 30, 31, 32, 33, -1, -1, + 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, + 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, + 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, + 86, 87, 88, -1, 90, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 104, 105, + -1, -1, -1, 1, 110, 3, 4, 5, 6, 7, + 116, 117, -1, 11, 12, -1, -1, -1, 16, -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, @@ -1578,8 +1714,8 @@ static const short yycheck[] = { 1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, -1, 90, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, 105, -1, -1, - -1, 1, -1, 3, 4, 5, 6, 7, 116, 117, - 10, 11, 12, -1, 14, 15, 16, -1, 18, 19, + -1, 1, 110, 3, 4, 5, 6, 7, 116, 117, + -1, 11, 12, -1, -1, -1, 16, -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, 49, @@ -1588,7 +1724,7 @@ static const short yycheck[] = { 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, -1, 90, -1, 1, -1, 3, 4, 5, 6, 7, -1, - -1, 10, 11, 12, 104, 105, 15, 16, 17, 18, + -1, 10, 11, 12, 104, 105, -1, 16, 108, 18, 19, 20, 21, 22, 23, 24, 116, 117, 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, @@ -1596,8 +1732,8 @@ static const short yycheck[] = { 1, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, - -1, 90, -1, 1, -1, 3, 4, 5, 6, 7, - -1, -1, 10, 11, 12, 104, 105, 15, 16, -1, + -1, 90, -1, -1, -1, 3, 4, 5, 6, 7, + -1, -1, -1, 11, 12, 104, 105, -1, 16, -1, 18, 19, 20, 21, 22, 23, 24, 116, 117, 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, @@ -1605,403 +1741,340 @@ static const short yycheck[] = { 1, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, - 88, -1, 90, -1, 1, -1, 3, 4, 5, 6, - 7, -1, 9, 10, 11, 12, 104, 105, -1, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 116, 117, - 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, - -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, -1, 90, -1, 1, -1, 3, 4, 5, - 6, 7, -1, -1, -1, 11, 12, 104, 105, -1, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 116, - 117, 27, 28, 29, 30, 31, 32, 33, -1, -1, - 36, -1, -1, -1, -1, 41, 42, 43, 44, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, - 86, 87, 88, -1, 90, -1, 1, -1, 3, 4, - 5, 6, 7, -1, -1, -1, 11, 12, 104, 105, - -1, 16, -1, 18, 19, 20, 21, 22, 23, 24, - 116, 117, 27, 28, 29, 30, 31, 32, 33, -1, - -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, - 85, 86, 87, 88, -1, 90, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 104, - 105, -1, -1, -1, 1, 110, 3, 4, 5, 6, - 7, 116, 117, -1, 11, 12, -1, -1, -1, 16, - -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, - -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, -1, 90, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 104, 105, -1, - -1, -1, 1, 110, 3, 4, 5, 6, 7, 116, - 117, -1, 11, 12, -1, -1, -1, 16, -1, 18, - 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, - 29, 30, 31, 32, 33, -1, -1, 36, -1, -1, - -1, -1, 41, 42, 43, 44, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, - -1, 90, -1, 1, -1, 3, 4, 5, 6, 7, - -1, -1, 10, 11, 12, 104, 105, -1, 16, 108, - 18, 19, 20, 21, 22, 23, 24, 116, 117, 27, - 28, 29, 30, 31, 32, 33, -1, -1, 36, -1, - -1, -1, -1, 41, 42, 43, 44, 45, 46, 47, + 88, -1, 90, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 104, 105, -1, -1, + 3, 4, 5, 6, 7, 8, 9, 10, -1, 117, + 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, + 63, 64, 65, 66, 67, -1, 69, 70, -1, -1, + 73, -1, 75, -1, 77, 78, 79, 80, -1, -1, + -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, + -1, 94, 95, 96, 97, 98, 99, 100, 101, 102, + 103, -1, 105, -1, -1, 3, 4, 5, -1, 7, + -1, 114, 115, 11, 12, -1, -1, -1, 16, -1, + 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, - 88, -1, 90, -1, -1, -1, 3, 4, 5, 6, - 7, -1, -1, -1, 11, 12, 104, 105, -1, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 116, 117, - 27, 28, 29, 30, 31, 32, 33, -1, -1, 36, - -1, -1, -1, -1, 41, 42, 43, 44, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, 107, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, -1, 90, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 104, 105, -1, - -1, 3, 4, 5, 6, 7, 8, 9, 10, -1, - 117, 13, 14, 15, 16, 17, -1, -1, 20, 21, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, 107, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, 107, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, 107, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, 3, 4, 5, -1, 7, + -1, -1, -1, 11, 12, -1, 104, 105, 16, -1, + 18, 19, 20, 21, 22, 23, 24, 115, -1, 27, + 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, + -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, + 88, 89, 90, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 104, 105, 3, 4, + 5, 6, 7, 8, 9, 10, -1, 115, 13, 14, + 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 62, 63, 64, + 65, 66, 67, -1, 69, 70, -1, -1, 73, -1, + 75, -1, 77, 78, 79, 80, -1, -1, -1, -1, + -1, -1, -1, 88, -1, -1, -1, -1, -1, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103, -1, + 105, 3, 4, 5, 6, 7, 8, 9, 10, 114, + -1, 13, 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, + 42, 43, 44, 45, 46, 47, 48, 49, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, -1, 69, 70, -1, -1, 73, -1, 75, -1, 77, 78, 79, 80, -1, -1, -1, -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, 94, 95, 96, 97, 98, 99, 100, 101, - 102, 103, -1, 105, -1, -1, 3, 4, 5, -1, - 7, -1, 114, 115, 11, 12, -1, -1, -1, 16, - -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, + 102, 103, -1, 105, 3, 4, 5, 6, 7, 8, + 9, 10, 114, -1, 13, 14, 15, 16, 17, -1, + -1, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, + 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, + -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 62, 63, 64, 65, 66, 67, -1, + 69, 70, -1, -1, 73, -1, 75, -1, 77, 78, + 79, 80, -1, -1, -1, -1, -1, -1, -1, 88, + -1, -1, -1, -1, -1, 94, 95, 96, 97, 98, + 99, 100, 101, 102, 103, -1, 105, -1, 3, 4, + 5, -1, 7, -1, -1, 114, 11, 12, -1, -1, + -1, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - 107, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - 107, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - 107, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - 107, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, 3, 4, 5, -1, - 7, -1, -1, -1, 11, 12, -1, 104, 105, 16, - -1, 18, 19, 20, 21, 22, 23, 24, 115, -1, - 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, - -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, - 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, - 57, 58, 59, 60, 61, 62, 63, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, - 87, 88, 89, 90, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 104, 105, 3, - 4, 5, 6, 7, 8, 9, 10, -1, 115, 13, - 14, 15, 16, 17, -1, -1, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 62, 63, - 64, 65, 66, 67, -1, 69, 70, -1, -1, 73, - -1, 75, -1, 77, 78, 79, 80, -1, -1, -1, - -1, -1, -1, -1, 88, -1, -1, -1, -1, -1, - 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, - -1, 105, 3, 4, 5, 6, 7, 8, 9, 10, - 114, -1, 13, 14, 15, 16, 17, -1, -1, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, -1, - 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 62, 63, 64, 65, 66, 67, -1, 69, 70, - -1, -1, 73, -1, 75, -1, 77, 78, 79, 80, - -1, -1, -1, -1, -1, -1, -1, 88, -1, -1, - -1, -1, -1, 94, 95, 96, 97, 98, 99, 100, - 101, 102, 103, -1, 105, 3, 4, 5, 6, 7, - 8, 9, 10, 114, -1, 13, 14, 15, 16, 17, - -1, -1, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, -1, -1, 51, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 62, 63, 64, 65, 66, 67, - -1, 69, 70, -1, -1, 73, -1, 75, -1, 77, - 78, 79, 80, -1, -1, -1, -1, -1, -1, -1, - 88, -1, -1, -1, -1, -1, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, -1, 105, -1, 3, - 4, 5, -1, 7, -1, -1, 114, 11, 12, -1, - -1, -1, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, 89, 90, -1, -1, -1, - -1, -1, -1, -1, 3, 4, 5, -1, 7, -1, - 104, 105, 11, 12, -1, -1, 110, 16, -1, 18, - 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, - 29, 30, 31, 32, 33, -1, -1, -1, -1, -1, - -1, -1, -1, 42, -1, -1, 45, 46, 47, 48, - 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, - 59, 60, 61, 62, 63, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, - 89, 90, -1, -1, -1, -1, -1, -1, -1, 3, - 4, 5, 6, 7, -1, 104, 105, 11, 12, -1, - -1, 110, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, 36, -1, -1, -1, -1, 41, 42, 43, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, 36, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, 89, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, 89, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, 89, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, 89, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, -1, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, -1, -1, 90, -1, -1, 3, - 4, 5, -1, 7, -1, -1, -1, 11, 12, -1, - 104, 105, 16, -1, 18, 19, 20, 21, 22, 23, - 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, - -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, - -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 82, -1, - -1, 85, 86, 87, 88, -1, 90, 3, 4, 5, - -1, 7, 96, -1, -1, 11, 12, -1, -1, -1, - 16, -1, 18, 19, 20, 21, 22, 23, 24, -1, - -1, 27, 28, 29, 30, 31, 32, 33, -1, -1, - -1, -1, -1, -1, -1, -1, 42, -1, -1, 45, - 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 82, -1, -1, 85, - 86, 87, 88, -1, 90, 3, 4, 5, -1, 7, - -1, -1, -1, 11, 12, -1, -1, -1, 16, -1, - 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, - 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, - -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 82, -1, -1, 85, 86, 87, - 88, -1, 90, 3, 4, 5, -1, 7, -1, -1, - -1, 11, 12, -1, -1, -1, 16, -1, 18, 19, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, 89, 90, -1, -1, -1, -1, + -1, -1, -1, 3, 4, 5, -1, 7, -1, 104, + 105, 11, 12, -1, -1, 110, 16, -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, -1, -1, -1, -1, -1, -1, -1, -1, + 60, 61, 62, 63, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 82, -1, -1, 85, 86, 87, 88, -1, - 90, 3, 4, 5, -1, 7, -1, -1, -1, 11, - 12, -1, -1, -1, 16, -1, 18, 19, 20, 21, - 22, 23, 24, -1, -1, 27, 28, 29, 30, 31, - 32, 33, -1, -1, -1, -1, -1, -1, -1, -1, - 42, -1, -1, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - -1, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, -1, -1, 79, 80, -1, -1, - 82, -1, -1, 85, 86, 87, -1, -1, 90, 92, - 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, -1, -1, 79, 80, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 92, - -1, 94, 95, 96, 97, 98, 99, 100, 101, 102, - 103 + -1, -1, 82, -1, -1, 85, 86, 87, 88, 89, + 90, -1, -1, -1, -1, -1, -1, -1, 3, 4, + 5, 6, 7, -1, 104, 105, 11, 12, -1, -1, + 110, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, 36, -1, -1, -1, -1, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, 36, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, 89, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, 89, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, 89, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, 89, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, -1, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, -1, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, 63, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, -1, -1, 90, -1, -1, 3, 4, + 5, -1, 7, -1, -1, -1, 11, 12, -1, 104, + 105, 16, -1, 18, 19, 20, 21, 22, 23, 24, + -1, -1, 27, 28, 29, 30, 31, 32, 33, -1, + -1, -1, -1, -1, -1, -1, -1, 42, -1, -1, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 59, 60, 61, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 82, -1, -1, + 85, 86, 87, 88, -1, 90, 3, 4, 5, -1, + 7, 96, -1, -1, 11, 12, -1, -1, -1, 16, + -1, 18, 19, 20, 21, 22, 23, 24, -1, -1, + 27, 28, 29, 30, 31, 32, 33, -1, -1, -1, + -1, -1, -1, -1, -1, 42, -1, -1, 45, 46, + 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, + 57, 58, 59, 60, 61, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 82, -1, -1, 85, 86, + 87, 88, -1, 90, 3, 4, 5, -1, 7, -1, + -1, -1, 11, 12, -1, -1, -1, 16, -1, 18, + 19, 20, 21, 22, 23, 24, -1, -1, 27, 28, + 29, 30, 31, 32, 33, -1, -1, -1, -1, -1, + -1, -1, -1, 42, -1, -1, 45, 46, 47, 48, + 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 61, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 82, -1, -1, 85, 86, 87, 88, + -1, 90, 3, 4, 5, -1, 7, -1, -1, -1, + 11, 12, -1, -1, -1, 16, -1, 18, 19, 20, + 21, 22, 23, 24, -1, -1, 27, 28, 29, 30, + 31, 32, 33, -1, -1, -1, -1, -1, -1, -1, + -1, 42, -1, -1, 45, 46, 47, 48, 49, 50, + 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 82, -1, -1, 85, 86, 87, 88, -1, 90, + 3, 4, 5, -1, 7, -1, -1, -1, 11, 12, + -1, -1, -1, 16, -1, 18, 19, 20, 21, 22, + 23, 24, -1, -1, 27, 28, 29, 30, 31, 32, + 33, -1, -1, -1, -1, -1, -1, -1, -1, 42, + -1, -1, 45, 46, 47, 48, 49, 50, 51, 52, + 53, 54, 55, 56, 57, 58, 59, 60, 61, 64, + 65, 66, 67, 68, 69, 70, -1, -1, 73, 74, + -1, -1, -1, -1, 79, 80, -1, -1, -1, 82, + -1, -1, 85, 86, 87, -1, -1, 90, -1, 94, + 95, 96, 97, 98, 99, 100, 101, 102, 103 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/share/misc/bison.simple" @@ -2546,7 +2619,7 @@ yyreduce: switch (yyn) { case 1: -#line 233 "parse.y" +#line 238 "parse.y" { yyval.vars = ruby_dyna_vars; lex_state = EXPR_BEG; @@ -2557,8 +2630,18 @@ case 1: ; break;} case 2: -#line 242 "parse.y" +#line 247 "parse.y" { + if (yyvsp[0].node) { /* last expression is void */ + if (nd_type(yyvsp[0].node) != NODE_BLOCK) void_expr(yyvsp[0].node); + else { + NODE *node = yyvsp[0].node; + while (node->nd_next) { + node = node->nd_next; + } + void_expr(node->nd_head); + } + } ruby_eval_tree = block_append(ruby_eval_tree, yyvsp[0].node); top_local_setup(); cur_cref = 0; @@ -2566,47 +2649,37 @@ case 2: ruby_dyna_vars = yyvsp[-1].vars; ; break;} -case 4: -#line 253 "parse.y" +case 3: +#line 266 "parse.y" { - yyval.node = 0; + void_stmts(yyvsp[-1].node); + yyval.node = yyvsp[-1].node; ; break;} case 5: -#line 257 "parse.y" +#line 273 "parse.y" { yyval.node = newline_node(yyvsp[0].node); ; break;} case 6: -#line 261 "parse.y" +#line 277 "parse.y" { yyval.node = block_append(yyvsp[-2].node, newline_node(yyvsp[0].node)); ; break;} case 7: -#line 265 "parse.y" +#line 281 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 8: -#line 270 "parse.y" -{ - if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { - rb_compile_error("both block arg and actual block given"); - } - yyvsp[0].node->nd_iter = yyvsp[-1].node; - yyval.node = yyvsp[0].node; - fixpos(yyval.node, yyvsp[0].node); - ; - break;} case 9: -#line 278 "parse.y" +#line 286 "parse.y" {lex_state = EXPR_FNAME;; break;} case 10: -#line 279 "parse.y" +#line 287 "parse.y" { if (cur_mid || in_single) yyerror("alias within method"); @@ -2614,7 +2687,7 @@ case 10: ; break;} case 11: -#line 285 "parse.y" +#line 293 "parse.y" { if (cur_mid || in_single) yyerror("alias within method"); @@ -2622,7 +2695,7 @@ case 11: ; break;} case 12: -#line 291 "parse.y" +#line 299 "parse.y" { char buf[3]; @@ -2633,14 +2706,14 @@ case 12: ; break;} case 13: -#line 300 "parse.y" +#line 308 "parse.y" { yyerror("can't make alias for the number variables"); yyval.node = 0; ; break;} case 14: -#line 305 "parse.y" +#line 313 "parse.y" { if (cur_mid || in_single) yyerror("undef within method"); @@ -2648,7 +2721,7 @@ case 14: ; break;} case 15: -#line 311 "parse.y" +#line 319 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_IF(cond(yyvsp[0].node), yyvsp[-2].node, 0); @@ -2656,7 +2729,7 @@ case 15: ; break;} case 16: -#line 317 "parse.y" +#line 325 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_UNLESS(cond(yyvsp[0].node), yyvsp[-2].node, 0); @@ -2664,7 +2737,7 @@ case 16: ; break;} case 17: -#line 323 "parse.y" +#line 331 "parse.y" { value_expr(yyvsp[0].node); if (nd_type(yyvsp[-2].node) == NODE_BEGIN) { @@ -2676,7 +2749,7 @@ case 17: ; break;} case 18: -#line 333 "parse.y" +#line 341 "parse.y" { value_expr(yyvsp[0].node); if (nd_type(yyvsp[-2].node) == NODE_BEGIN) { @@ -2688,101 +2761,99 @@ case 18: ; break;} case 19: -#line 343 "parse.y" +#line 351 "parse.y" { if (cur_mid || in_single) { yyerror("BEGIN in method"); } - local_push(); ; break;} case 20: -#line 351 "parse.y" +#line 358 "parse.y" { ruby_eval_tree_begin = block_append(ruby_eval_tree_begin, - NEW_PREEXE(yyvsp[-1].node)); + NEW_PREEXE(yyvsp[-1].node)); local_pop(); yyval.node = 0; ; break;} case 21: -#line 358 "parse.y" +#line 365 "parse.y" { - if (cur_mid || in_single) { + if (compile_for_eval && (cur_mid || in_single)) { yyerror("END in method; use at_exit"); } yyval.node = NEW_ITER(0, NEW_POSTEXE(), yyvsp[-1].node); ; break;} -case 23: -#line 368 "parse.y" +case 22: +#line 373 "parse.y" +{ + value_expr(yyvsp[0].node); + yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node); + ; + break;} +case 24: +#line 380 "parse.y" { value_expr(yyvsp[0].node); yyvsp[-2].node->nd_value = yyvsp[0].node; yyval.node = yyvsp[-2].node; ; break;} -case 24: -#line 374 "parse.y" +case 25: +#line 386 "parse.y" { value_expr(yyvsp[0].node); - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(yyvsp[0].node); ; break;} -case 25: -#line 381 "parse.y" +case 26: +#line 393 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_YIELD(yyvsp[0].node); ; break;} -case 27: -#line 387 "parse.y" +case 28: +#line 399 "parse.y" { yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); ; break;} -case 28: -#line 391 "parse.y" +case 29: +#line 403 "parse.y" { yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); ; break;} -case 29: -#line 395 "parse.y" -{ - value_expr(yyvsp[0].node); - yyval.node = NEW_NOT(cond(yyvsp[0].node)); - ; - break;} case 30: -#line 400 "parse.y" +#line 407 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} -case 32: -#line 407 "parse.y" +case 31: +#line 412 "parse.y" +{ + value_expr(yyvsp[0].node); + yyval.node = NEW_NOT(cond(yyvsp[0].node)); + ; + break;} +case 33: +#line 419 "parse.y" { yyval.node = new_fcall(yyvsp[-1].id, yyvsp[0].node); fixpos(yyval.node, yyvsp[0].node); ; break;} -case 33: -#line 412 "parse.y" -{ - value_expr(yyvsp[-3].node); - yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node); - fixpos(yyval.node, yyvsp[-3].node); - ; - break;} case 34: -#line 418 "parse.y" +#line 424 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node); @@ -2790,298 +2861,295 @@ case 34: ; break;} case 35: -#line 424 "parse.y" +#line 430 "parse.y" { - if (!cur_mid && !in_single && !in_defined) + value_expr(yyvsp[-3].node); + yyval.node = new_call(yyvsp[-3].node, yyvsp[-1].id, yyvsp[0].node); + fixpos(yyval.node, yyvsp[-3].node); + ; + break;} +case 36: +#line 436 "parse.y" +{ + if (!compile_for_eval && !cur_mid && !in_single) yyerror("super called outside of method"); yyval.node = NEW_SUPER(yyvsp[0].node); fixpos(yyval.node, yyvsp[0].node); ; break;} -case 37: -#line 433 "parse.y" +case 38: +#line 445 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 39: -#line 439 "parse.y" +case 40: +#line 451 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-1].node), 0); ; break;} -case 40: -#line 444 "parse.y" +case 41: +#line 456 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[0].node), 0); ; break;} -case 41: -#line 448 "parse.y" +case 42: +#line 460 "parse.y" { yyval.node = NEW_MASGN(NEW_LIST(yyvsp[-2].node), yyvsp[0].node); ; break;} -case 42: -#line 452 "parse.y" +case 43: +#line 464 "parse.y" { yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-1].node),yyvsp[0].node), 0); ; break;} -case 43: -#line 456 "parse.y" +case 44: +#line 468 "parse.y" { yyval.node = NEW_MASGN(list_concat(NEW_LIST(yyvsp[-4].node),yyvsp[-3].node),yyvsp[0].node); ; break;} -case 44: -#line 460 "parse.y" +case 45: +#line 472 "parse.y" { yyval.node = NEW_MASGN(0, yyvsp[0].node); ; break;} -case 46: -#line 466 "parse.y" -{ - yyval.node = yyvsp[-1].node; - ; - break;} case 47: -#line 471 "parse.y" +#line 478 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 48: -#line 476 "parse.y" +#line 483 "parse.y" +{ + yyval.node = yyvsp[-1].node; + ; + break;} +case 49: +#line 488 "parse.y" { yyval.node = NEW_LIST(yyvsp[0].node); ; break;} -case 49: -#line 480 "parse.y" +case 50: +#line 492 "parse.y" { yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 50: -#line 485 "parse.y" +case 51: +#line 497 "parse.y" { yyval.node = assignable(yyvsp[0].id, 0); ; break;} -case 51: -#line 489 "parse.y" -{ - yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node, 0); - ; - break;} case 52: -#line 493 "parse.y" +#line 501 "parse.y" { - yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id, 0); + yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node); ; break;} case 53: -#line 497 "parse.y" +#line 505 "parse.y" +{ + yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id); + ; + break;} +case 54: +#line 509 "parse.y" { rb_backref_error(yyvsp[0].node); yyval.node = 0; ; break;} -case 54: -#line 503 "parse.y" +case 55: +#line 515 "parse.y" +{ + yyval.node = assignable(yyvsp[0].id, 0); + ; + break;} +case 56: +#line 519 "parse.y" +{ + yyval.node = aryset(yyvsp[-3].node, yyvsp[-1].node); + ; + break;} +case 57: +#line 523 "parse.y" +{ + yyval.node = attrset(yyvsp[-2].node, yyvsp[0].id); + ; + break;} +case 58: +#line 527 "parse.y" +{ + rb_backref_error(yyvsp[0].node); + yyval.node = 0; + ; + break;} +case 59: +#line 533 "parse.y" { yyerror("class/module name must be CONSTANT"); ; break;} -case 59: -#line 512 "parse.y" +case 64: +#line 542 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} -case 60: -#line 517 "parse.y" +case 65: +#line 547 "parse.y" { lex_state = EXPR_END; yyval.id = yyvsp[0].id; ; break;} -case 61: -#line 523 "parse.y" +case 66: +#line 553 "parse.y" { yyval.node = NEW_UNDEF(yyvsp[0].id); ; break;} -case 62: -#line 526 "parse.y" +case 67: +#line 556 "parse.y" {lex_state = EXPR_FNAME;; break;} -case 63: -#line 527 "parse.y" +case 68: +#line 557 "parse.y" { yyval.node = block_append(yyvsp[-3].node, NEW_UNDEF(yyvsp[0].id)); ; break;} -case 64: -#line 531 "parse.y" +case 69: +#line 561 "parse.y" { yyval.id = tDOT2; ; break;} -case 65: -#line 532 "parse.y" +case 70: +#line 562 "parse.y" { yyval.id = '|'; ; break;} -case 66: -#line 533 "parse.y" +case 71: +#line 563 "parse.y" { yyval.id = '^'; ; break;} -case 67: -#line 534 "parse.y" +case 72: +#line 564 "parse.y" { yyval.id = '&'; ; break;} -case 68: -#line 535 "parse.y" +case 73: +#line 565 "parse.y" { yyval.id = tCMP; ; break;} -case 69: -#line 536 "parse.y" +case 74: +#line 566 "parse.y" { yyval.id = tEQ; ; break;} -case 70: -#line 537 "parse.y" +case 75: +#line 567 "parse.y" { yyval.id = tEQQ; ; break;} -case 71: -#line 538 "parse.y" +case 76: +#line 568 "parse.y" { yyval.id = tMATCH; ; break;} -case 72: -#line 539 "parse.y" +case 77: +#line 569 "parse.y" { yyval.id = '>'; ; break;} -case 73: -#line 540 "parse.y" +case 78: +#line 570 "parse.y" { yyval.id = tGEQ; ; break;} -case 74: -#line 541 "parse.y" +case 79: +#line 571 "parse.y" { yyval.id = '<'; ; break;} -case 75: -#line 542 "parse.y" +case 80: +#line 572 "parse.y" { yyval.id = tLEQ; ; break;} -case 76: -#line 543 "parse.y" +case 81: +#line 573 "parse.y" { yyval.id = tLSHFT; ; break;} -case 77: -#line 544 "parse.y" +case 82: +#line 574 "parse.y" { yyval.id = tRSHFT; ; break;} -case 78: -#line 545 "parse.y" +case 83: +#line 575 "parse.y" { yyval.id = '+'; ; break;} -case 79: -#line 546 "parse.y" +case 84: +#line 576 "parse.y" { yyval.id = '-'; ; break;} -case 80: -#line 547 "parse.y" -{ yyval.id = '*'; ; - break;} -case 81: -#line 548 "parse.y" -{ yyval.id = '*'; ; - break;} -case 82: -#line 549 "parse.y" -{ yyval.id = '/'; ; - break;} -case 83: -#line 550 "parse.y" -{ yyval.id = '%'; ; - break;} -case 84: -#line 551 "parse.y" -{ yyval.id = tPOW; ; - break;} case 85: -#line 552 "parse.y" -{ yyval.id = '~'; ; +#line 577 "parse.y" +{ yyval.id = '*'; ; break;} case 86: -#line 553 "parse.y" -{ yyval.id = tUPLUS; ; +#line 578 "parse.y" +{ yyval.id = '*'; ; break;} case 87: -#line 554 "parse.y" -{ yyval.id = tUMINUS; ; +#line 579 "parse.y" +{ yyval.id = '/'; ; break;} case 88: -#line 555 "parse.y" -{ yyval.id = tAREF; ; +#line 580 "parse.y" +{ yyval.id = '%'; ; break;} case 89: -#line 556 "parse.y" -{ yyval.id = tASET; ; +#line 581 "parse.y" +{ yyval.id = tPOW; ; break;} case 90: -#line 557 "parse.y" +#line 582 "parse.y" +{ yyval.id = '~'; ; + break;} +case 91: +#line 583 "parse.y" +{ yyval.id = tUPLUS; ; + break;} +case 92: +#line 584 "parse.y" +{ yyval.id = tUMINUS; ; + break;} +case 93: +#line 585 "parse.y" +{ yyval.id = tAREF; ; + break;} +case 94: +#line 586 "parse.y" +{ yyval.id = tASET; ; + break;} +case 95: +#line 587 "parse.y" { yyval.id = '`'; ; break;} -case 131: -#line 567 "parse.y" -{yyval.node = assignable(yyvsp[-1].id, 0);; - break;} -case 132: -#line 568 "parse.y" -{ - yyval.node = yyvsp[-1].node; - if (yyval.node) { - yyval.node->nd_value = yyvsp[0].node; - fixpos(yyval.node, yyvsp[0].node); - } - ; - break;} -case 133: -#line 576 "parse.y" -{ - yyval.node = aryset(yyvsp[-5].node, yyvsp[-3].node, yyvsp[0].node); - fixpos(yyval.node, yyvsp[-5].node); - ; - break;} -case 134: -#line 581 "parse.y" -{ - yyval.node = attrset(yyvsp[-4].node, yyvsp[-2].id, yyvsp[0].node); - fixpos(yyval.node, yyvsp[0].node); - ; - break;} -case 135: -#line 586 "parse.y" -{ - yyval.node = attrset(yyvsp[-4].node, yyvsp[-2].id, yyvsp[0].node); - fixpos(yyval.node, yyvsp[0].node); - ; - break;} case 136: -#line 591 "parse.y" +#line 598 "parse.y" { value_expr(yyvsp[0].node); - rb_backref_error(yyvsp[-2].node); - yyval.node = 0; + yyval.node = node_assign(yyvsp[-2].node, yyvsp[0].node); ; break;} case 137: -#line 596 "parse.y" +#line 602 "parse.y" {yyval.node = assignable(yyvsp[-1].id, 0);; break;} case 138: -#line 597 "parse.y" +#line 603 "parse.y" { if (yyvsp[-2].id == tOROP) { yyvsp[-1].node->nd_value = yyvsp[0].node; @@ -3099,7 +3167,7 @@ case 138: ; break;} case 139: -#line 613 "parse.y" +#line 619 "parse.y" { NODE *args = NEW_LIST(yyvsp[0].node); @@ -3116,7 +3184,7 @@ case 139: ; break;} case 140: -#line 628 "parse.y" +#line 634 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3129,7 +3197,7 @@ case 140: ; break;} case 141: -#line 639 "parse.y" +#line 645 "parse.y" { if (yyvsp[-1].id == tOROP) { yyvsp[-1].id = 0; @@ -3142,200 +3210,200 @@ case 141: ; break;} case 142: -#line 650 "parse.y" +#line 656 "parse.y" { rb_backref_error(yyvsp[-2].node); yyval.node = 0; ; break;} case 143: -#line 655 "parse.y" +#line 661 "parse.y" { yyval.node = NEW_DOT2(yyvsp[-2].node, yyvsp[0].node); ; break;} case 144: -#line 659 "parse.y" +#line 665 "parse.y" { yyval.node = NEW_DOT3(yyvsp[-2].node, yyvsp[0].node); ; break;} case 145: -#line 663 "parse.y" +#line 669 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '+', 1, yyvsp[0].node); ; break;} case 146: -#line 667 "parse.y" +#line 673 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '-', 1, yyvsp[0].node); ; break;} case 147: -#line 671 "parse.y" +#line 677 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '*', 1, yyvsp[0].node); ; break;} case 148: -#line 675 "parse.y" +#line 681 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '/', 1, yyvsp[0].node); ; break;} case 149: -#line 679 "parse.y" +#line 685 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '%', 1, yyvsp[0].node); ; break;} case 150: -#line 683 "parse.y" +#line 689 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tPOW, 1, yyvsp[0].node); ; break;} case 151: -#line 687 "parse.y" +#line 693 "parse.y" { yyval.node = call_op(yyvsp[0].node, tUPLUS, 0); ; break;} case 152: -#line 691 "parse.y" +#line 697 "parse.y" { yyval.node = call_op(yyvsp[0].node, tUMINUS, 0); ; break;} case 153: -#line 695 "parse.y" +#line 701 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '|', 1, yyvsp[0].node); ; break;} case 154: -#line 699 "parse.y" +#line 705 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '^', 1, yyvsp[0].node); ; break;} case 155: -#line 703 "parse.y" +#line 709 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '&', 1, yyvsp[0].node); ; break;} case 156: -#line 707 "parse.y" +#line 713 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tCMP, 1, yyvsp[0].node); ; break;} case 157: -#line 711 "parse.y" +#line 717 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '>', 1, yyvsp[0].node); ; break;} case 158: -#line 715 "parse.y" +#line 721 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tGEQ, 1, yyvsp[0].node); ; break;} case 159: -#line 719 "parse.y" +#line 725 "parse.y" { yyval.node = call_op(yyvsp[-2].node, '<', 1, yyvsp[0].node); ; break;} case 160: -#line 723 "parse.y" +#line 729 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tLEQ, 1, yyvsp[0].node); ; break;} case 161: -#line 727 "parse.y" +#line 733 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node); ; break;} case 162: -#line 731 "parse.y" +#line 737 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tEQQ, 1, yyvsp[0].node); ; break;} case 163: -#line 735 "parse.y" +#line 741 "parse.y" { yyval.node = NEW_NOT(call_op(yyvsp[-2].node, tEQ, 1, yyvsp[0].node)); ; break;} case 164: -#line 739 "parse.y" +#line 745 "parse.y" { yyval.node = match_gen(yyvsp[-2].node, yyvsp[0].node); ; break;} case 165: -#line 743 "parse.y" +#line 749 "parse.y" { yyval.node = NEW_NOT(match_gen(yyvsp[-2].node, yyvsp[0].node)); ; break;} case 166: -#line 747 "parse.y" +#line 753 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_NOT(cond(yyvsp[0].node)); ; break;} case 167: -#line 752 "parse.y" +#line 758 "parse.y" { yyval.node = call_op(yyvsp[0].node, '~', 0); ; break;} case 168: -#line 756 "parse.y" +#line 762 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tLSHFT, 1, yyvsp[0].node); ; break;} case 169: -#line 760 "parse.y" +#line 766 "parse.y" { yyval.node = call_op(yyvsp[-2].node, tRSHFT, 1, yyvsp[0].node); ; break;} case 170: -#line 764 "parse.y" +#line 770 "parse.y" { yyval.node = logop(NODE_AND, yyvsp[-2].node, yyvsp[0].node); ; break;} case 171: -#line 768 "parse.y" +#line 774 "parse.y" { yyval.node = logop(NODE_OR, yyvsp[-2].node, yyvsp[0].node); ; break;} case 172: -#line 771 "parse.y" +#line 777 "parse.y" {in_defined = 1;; break;} case 173: -#line 772 "parse.y" +#line 778 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[0].node); ; break;} case 174: -#line 777 "parse.y" +#line 783 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[0].node); @@ -3343,13 +3411,13 @@ case 174: ; break;} case 175: -#line 783 "parse.y" +#line 789 "parse.y" { yyval.node = yyvsp[0].node; ; break;} case 176: -#line 788 "parse.y" +#line 794 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_BLOCK_PASS) { rb_compile_error("block argument should not be given"); @@ -3357,126 +3425,108 @@ case 176: yyval.node = yyvsp[0].node; ; break;} -case 177: -#line 796 "parse.y" -{ - yyval.node = 0; - ; - break;} case 179: -#line 802 "parse.y" +#line 805 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} case 180: -#line 807 "parse.y" +#line 810 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 181: -#line 811 "parse.y" +#line 814 "parse.y" { yyval.node = arg_blk_pass(yyvsp[-1].node, yyvsp[0].node); ; break;} case 182: -#line 815 "parse.y" +#line 818 "parse.y" { - yyval.node = arg_add(yyvsp[-4].node, yyvsp[-1].node); + yyval.node = arg_concat(yyvsp[-4].node, yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 183: -#line 820 "parse.y" +#line 823 "parse.y" { yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); ; break;} case 184: -#line 824 "parse.y" +#line 827 "parse.y" { yyval.node = NEW_LIST(NEW_HASH(yyvsp[-1].node)); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 185: -#line 829 "parse.y" +#line 832 "parse.y" { - yyval.node = arg_add(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); + yyval.node = arg_concat(NEW_LIST(NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 186: -#line 834 "parse.y" +#line 837 "parse.y" { yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 187: -#line 839 "parse.y" +#line 842 "parse.y" { yyval.node = list_append(yyvsp[-3].node, NEW_HASH(yyvsp[-1].node)); ; break;} case 188: -#line 843 "parse.y" +#line 846 "parse.y" { - yyval.node = arg_add(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); + yyval.node = arg_concat(list_append(yyvsp[-6].node, NEW_HASH(yyvsp[-4].node)), yyvsp[-1].node); yyval.node = arg_blk_pass(yyval.node, yyvsp[0].node); ; break;} case 189: -#line 848 "parse.y" +#line 851 "parse.y" { value_expr(yyvsp[-1].node); yyval.node = arg_blk_pass(NEW_RESTARGS(yyvsp[-1].node), yyvsp[0].node); ; break;} case 191: -#line 855 "parse.y" +#line 858 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_BLOCK_PASS(yyvsp[0].node); ; break;} case 192: -#line 861 "parse.y" +#line 864 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 193: -#line 865 "parse.y" -{ - yyval.node = 0; - ; - break;} -case 195: -#line 871 "parse.y" -{ - yyval.node = 0; - ; - break;} case 196: -#line 876 "parse.y" +#line 873 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(yyvsp[0].node); ; break;} case 197: -#line 881 "parse.y" +#line 878 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-2].node, yyvsp[0].node); ; break;} case 198: -#line 887 "parse.y" +#line 884 "parse.y" { if (yyvsp[0].node && nd_type(yyvsp[0].node) == NODE_ARRAY && @@ -3490,21 +3540,21 @@ case 198: ; break;} case 199: -#line 899 "parse.y" +#line 896 "parse.y" { value_expr(yyvsp[0].node); - yyval.node = arg_add(yyvsp[-3].node, yyvsp[0].node); + yyval.node = arg_concat(yyvsp[-3].node, yyvsp[0].node); ; break;} case 200: -#line 904 "parse.y" +#line 901 "parse.y" { value_expr(yyvsp[0].node); yyval.node = yyvsp[0].node; ; break;} case 201: -#line 910 "parse.y" +#line 907 "parse.y" { yyval.node = yyvsp[0].node; if (yyvsp[0].node) { @@ -3518,52 +3568,46 @@ case 201: } ; break;} -case 202: -#line 924 "parse.y" -{ - yyval.node = 0; - ; - break;} case 204: -#line 930 "parse.y" +#line 924 "parse.y" { yyval.node = NEW_LIT(yyvsp[0].val); ; break;} case 205: -#line 934 "parse.y" +#line 928 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = NEW_COLON2(yyvsp[-2].node, yyvsp[0].id); ; break;} case 206: -#line 939 "parse.y" +#line 933 "parse.y" { yyval.node = NEW_COLON3(yyvsp[0].id); ; break;} case 207: -#line 943 "parse.y" +#line 937 "parse.y" { yyval.node = NEW_STR(yyvsp[0].val); ; break;} case 209: -#line 948 "parse.y" +#line 942 "parse.y" { yyval.node = NEW_XSTR(yyvsp[0].val); ; break;} case 214: -#line 956 "parse.y" +#line 950 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_CALL(yyvsp[-3].node, tAREF, yyvsp[-1].node); ; break;} case 215: -#line 961 "parse.y" +#line 955 "parse.y" { if (yyvsp[-1].node == 0) yyval.node = NEW_ZARRAY(); /* zero length array*/ @@ -3573,81 +3617,81 @@ case 215: ; break;} case 216: -#line 969 "parse.y" +#line 963 "parse.y" { yyval.node = NEW_HASH(yyvsp[-1].node); ; break;} case 217: -#line 973 "parse.y" +#line 967 "parse.y" { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); value_expr(yyvsp[-1].node); yyval.node = NEW_RETURN(yyvsp[-1].node); ; break;} case 218: -#line 980 "parse.y" +#line 974 "parse.y" { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} case 219: -#line 986 "parse.y" +#line 980 "parse.y" { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); yyval.node = NEW_RETURN(0); ; break;} case 220: -#line 992 "parse.y" +#line 986 "parse.y" { value_expr(yyvsp[-1].node); yyval.node = NEW_YIELD(yyvsp[-1].node); ; break;} case 221: -#line 997 "parse.y" +#line 991 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} case 222: -#line 1001 "parse.y" +#line 995 "parse.y" { yyval.node = NEW_YIELD(0); ; break;} case 223: -#line 1004 "parse.y" +#line 998 "parse.y" {in_defined = 1;; break;} case 224: -#line 1005 "parse.y" +#line 999 "parse.y" { in_defined = 0; yyval.node = NEW_DEFINED(yyvsp[-1].node); ; break;} case 225: -#line 1010 "parse.y" +#line 1004 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} case 226: -#line 1014 "parse.y" +#line 1008 "parse.y" { yyvsp[0].node->nd_iter = NEW_FCALL(yyvsp[-1].id, 0); yyval.node = yyvsp[0].node; ; break;} case 228: -#line 1020 "parse.y" +#line 1014 "parse.y" { if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -3658,7 +3702,7 @@ case 228: ; break;} case 229: -#line 1032 "parse.y" +#line 1026 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_IF(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node); @@ -3666,7 +3710,7 @@ case 229: ; break;} case 230: -#line 1041 "parse.y" +#line 1035 "parse.y" { value_expr(yyvsp[-4].node); yyval.node = NEW_UNLESS(cond(yyvsp[-4].node), yyvsp[-2].node, yyvsp[-1].node); @@ -3674,7 +3718,7 @@ case 230: ; break;} case 231: -#line 1049 "parse.y" +#line 1043 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_WHILE(cond(yyvsp[-3].node), yyvsp[-1].node, 1); @@ -3682,7 +3726,7 @@ case 231: ; break;} case 232: -#line 1057 "parse.y" +#line 1051 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_UNTIL(cond(yyvsp[-3].node), yyvsp[-1].node, 1); @@ -3690,7 +3734,7 @@ case 232: ; break;} case 233: -#line 1065 "parse.y" +#line 1059 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = NEW_CASE(yyvsp[-2].node, yyvsp[-1].node); @@ -3698,7 +3742,7 @@ case 233: ; break;} case 234: -#line 1073 "parse.y" +#line 1067 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = NEW_FOR(yyvsp[-5].node, yyvsp[-3].node, yyvsp[-1].node); @@ -3706,7 +3750,7 @@ case 234: ; break;} case 235: -#line 1084 "parse.y" +#line 1078 "parse.y" { if (!yyvsp[-3].node && !yyvsp[-2].node && !yyvsp[-1].node) yyval.node = NEW_BEGIN(yyvsp[-4].node); @@ -3723,13 +3767,13 @@ case 235: ; break;} case 236: -#line 1099 "parse.y" +#line 1093 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 237: -#line 1103 "parse.y" +#line 1097 "parse.y" { if (cur_mid || in_single) yyerror("class definition in method body"); @@ -3740,7 +3784,7 @@ case 237: ; break;} case 238: -#line 1113 "parse.y" +#line 1107 "parse.y" { yyval.node = NEW_CLASS(yyvsp[-4].id, yyvsp[-1].node, yyvsp[-3].node); fixpos(yyval.node, yyvsp[-3].node); @@ -3750,7 +3794,7 @@ case 238: ; break;} case 239: -#line 1121 "parse.y" +#line 1115 "parse.y" { class_nest++; cref_push(); @@ -3758,7 +3802,7 @@ case 239: ; break;} case 240: -#line 1128 "parse.y" +#line 1122 "parse.y" { yyval.node = NEW_SCLASS(yyvsp[-4].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-4].node); @@ -3768,7 +3812,7 @@ case 240: ; break;} case 241: -#line 1136 "parse.y" +#line 1130 "parse.y" { if (cur_mid || in_single) yyerror("module definition in method body"); @@ -3778,7 +3822,7 @@ case 241: ; break;} case 242: -#line 1145 "parse.y" +#line 1139 "parse.y" { yyval.node = NEW_MODULE(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); @@ -3788,7 +3832,7 @@ case 242: ; break;} case 243: -#line 1153 "parse.y" +#line 1147 "parse.y" { if (cur_mid || in_single) yyerror("nested method definition"); @@ -3797,7 +3841,7 @@ case 243: ; break;} case 244: -#line 1162 "parse.y" +#line 1156 "parse.y" { /* NOEX_PRIVATE for toplevel */ yyval.node = NEW_DEFN(yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node, class_nest?0:1); @@ -3807,11 +3851,11 @@ case 244: ; break;} case 245: -#line 1169 "parse.y" +#line 1163 "parse.y" {lex_state = EXPR_FNAME;; break;} case 246: -#line 1170 "parse.y" +#line 1164 "parse.y" { value_expr(yyvsp[-3].node); in_single++; @@ -3820,7 +3864,7 @@ case 246: ; break;} case 247: -#line 1179 "parse.y" +#line 1173 "parse.y" { yyval.node = NEW_DEFS(yyvsp[-7].node, yyvsp[-4].id, yyvsp[-2].node, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-7].node); @@ -3829,81 +3873,69 @@ case 247: ; break;} case 248: -#line 1186 "parse.y" +#line 1180 "parse.y" { yyval.node = NEW_BREAK(); ; break;} case 249: -#line 1190 "parse.y" +#line 1184 "parse.y" { yyval.node = NEW_NEXT(); ; break;} case 250: -#line 1194 "parse.y" +#line 1188 "parse.y" { yyval.node = NEW_REDO(); ; break;} case 251: -#line 1198 "parse.y" +#line 1192 "parse.y" { yyval.node = NEW_RETRY(); ; break;} case 258: -#line 1213 "parse.y" +#line 1207 "parse.y" { value_expr(yyvsp[-3].node); yyval.node = NEW_IF(cond(yyvsp[-3].node), yyvsp[-1].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-3].node); ; break;} -case 259: -#line 1220 "parse.y" -{ - yyval.node = 0; - ; - break;} case 260: -#line 1224 "parse.y" +#line 1215 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 263: -#line 1232 "parse.y" -{ - yyval.node = 0; - ; - break;} case 264: -#line 1236 "parse.y" +#line 1224 "parse.y" { yyval.node = 0; ; break;} case 265: -#line 1240 "parse.y" +#line 1228 "parse.y" { yyval.node = 0; ; break;} case 266: -#line 1244 "parse.y" +#line 1232 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 267: -#line 1249 "parse.y" +#line 1237 "parse.y" { yyval.vars = dyna_push(); ; break;} case 268: -#line 1255 "parse.y" +#line 1243 "parse.y" { yyval.node = NEW_ITER(yyvsp[-2].node, 0, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-2].node?yyvsp[-2].node:yyvsp[-1].node); @@ -3911,13 +3943,13 @@ case 268: ; break;} case 269: -#line 1262 "parse.y" +#line 1250 "parse.y" { yyval.vars = dyna_push(); ; break;} case 270: -#line 1267 "parse.y" +#line 1255 "parse.y" { yyval.node = NEW_ITER(yyvsp[-2].node, 0, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-2].node?yyvsp[-2].node:yyvsp[-1].node); @@ -3925,249 +3957,250 @@ case 270: ; break;} case 271: -#line 1274 "parse.y" +#line 1262 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} case 272: -#line 1278 "parse.y" +#line 1266 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} case 273: -#line 1282 "parse.y" +#line 1270 "parse.y" { yyval.node = NEW_VCALL(yyvsp[0].id); ; break;} case 276: -#line 1289 "parse.y" +#line 1277 "parse.y" +{ + if (yyvsp[-1].node && nd_type(yyvsp[-1].node) == NODE_BLOCK_PASS) { + rb_compile_error("both block arg and actual block given"); + } + yyvsp[0].node->nd_iter = yyvsp[-1].node; + yyval.node = yyvsp[0].node; + fixpos(yyval.node, yyvsp[0].node); + ; + break;} +case 277: +#line 1287 "parse.y" { yyval.node = new_fcall(yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-1].node); ; break;} -case 277: -#line 1294 "parse.y" +case 278: +#line 1292 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = new_call(yyvsp[-5].node, yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 278: -#line 1300 "parse.y" +case 279: +#line 1298 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0); fixpos(yyval.node, yyvsp[-2].node); ; break;} -case 279: -#line 1306 "parse.y" +case 280: +#line 1304 "parse.y" { value_expr(yyvsp[-5].node); yyval.node = new_call(yyvsp[-5].node, yyvsp[-3].id, yyvsp[-1].node); fixpos(yyval.node, yyvsp[-5].node); ; break;} -case 280: -#line 1312 "parse.y" +case 281: +#line 1310 "parse.y" { value_expr(yyvsp[-2].node); yyval.node = new_call(yyvsp[-2].node, yyvsp[0].id, 0); ; break;} -case 281: -#line 1317 "parse.y" +case 282: +#line 1315 "parse.y" { - if (!cur_mid && !in_single && !in_defined) + if (!compile_for_eval && !cur_mid && + !in_single && !in_defined) yyerror("super called outside of method"); yyval.node = NEW_SUPER(yyvsp[-1].node); ; break;} -case 282: -#line 1323 "parse.y" +case 283: +#line 1322 "parse.y" { - if (!cur_mid && !in_single && !in_defined) + if (!compile_for_eval && !cur_mid && + !in_single && !in_defined) yyerror("super called outside of method"); yyval.node = NEW_ZSUPER(); ; break;} -case 283: -#line 1333 "parse.y" +case 286: +#line 1336 "parse.y" { yyval.node = NEW_WHEN(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node); ; break;} -case 285: -#line 1339 "parse.y" +case 288: +#line 1342 "parse.y" { value_expr(yyvsp[0].node); yyval.node = list_append(yyvsp[-3].node, NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 286: -#line 1344 "parse.y" +case 289: +#line 1347 "parse.y" { value_expr(yyvsp[0].node); yyval.node = NEW_LIST(NEW_WHEN(yyvsp[0].node, 0, 0)); ; break;} -case 289: -#line 1355 "parse.y" +case 292: +#line 1358 "parse.y" { yyval.node = NEW_RESBODY(yyvsp[-3].node, yyvsp[-1].node, yyvsp[0].node); fixpos(yyval.node, yyvsp[-3].node?yyvsp[-3].node:yyvsp[-1].node); ; break;} -case 290: -#line 1360 "parse.y" -{ - yyval.node = 0; - ; - break;} -case 291: -#line 1365 "parse.y" -{ - yyval.node = 0; - ; - break;} -case 292: -#line 1369 "parse.y" +case 295: +#line 1366 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 294: -#line 1375 "parse.y" +case 297: +#line 1372 "parse.y" { yyval.val = INT2FIX(yyvsp[0].id); ; break;} -case 305: -#line 1391 "parse.y" +case 308: +#line 1388 "parse.y" {yyval.id = kNIL;; break;} -case 306: -#line 1392 "parse.y" +case 309: +#line 1389 "parse.y" {yyval.id = kSELF;; break;} -case 307: -#line 1393 "parse.y" +case 310: +#line 1390 "parse.y" {yyval.id = kTRUE;; break;} -case 308: -#line 1394 "parse.y" +case 311: +#line 1391 "parse.y" {yyval.id = kFALSE;; break;} -case 309: -#line 1395 "parse.y" +case 312: +#line 1392 "parse.y" {yyval.id = k__FILE__;; break;} -case 310: -#line 1396 "parse.y" +case 313: +#line 1393 "parse.y" {yyval.id = k__LINE__;; break;} -case 311: -#line 1399 "parse.y" +case 314: +#line 1396 "parse.y" { yyval.node = gettable(yyvsp[0].id); ; break;} -case 314: -#line 1407 "parse.y" +case 317: +#line 1404 "parse.y" { yyval.node = 0; ; break;} -case 315: -#line 1411 "parse.y" -{ - lex_state = EXPR_BEG; - ; - break;} -case 316: -#line 1415 "parse.y" -{ - yyval.node = yyvsp[-1].node; - ; - break;} -case 317: -#line 1418 "parse.y" -{yyerrok; yyval.node = 0;; - break;} case 318: -#line 1421 "parse.y" +#line 1408 "parse.y" { - yyval.node = yyvsp[-2].node; lex_state = EXPR_BEG; ; break;} case 319: -#line 1426 "parse.y" +#line 1412 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} case 320: -#line 1431 "parse.y" +#line 1415 "parse.y" +{yyerrok; yyval.node = 0;; + break;} +case 321: +#line 1418 "parse.y" +{ + yyval.node = yyvsp[-2].node; + lex_state = EXPR_BEG; + ; + break;} +case 322: +#line 1423 "parse.y" +{ + yyval.node = yyvsp[-1].node; + ; + break;} +case 323: +#line 1428 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-5].num, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 321: -#line 1435 "parse.y" +case 324: +#line 1432 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 322: -#line 1439 "parse.y" +case 325: +#line 1436 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-3].num, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 323: -#line 1443 "parse.y" +case 326: +#line 1440 "parse.y" { yyval.node = block_append(NEW_ARGS(yyvsp[-1].num, 0, -1), yyvsp[0].node); ; break;} -case 324: -#line 1447 "parse.y" +case 327: +#line 1444 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-3].node, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 325: -#line 1451 "parse.y" +case 328: +#line 1448 "parse.y" { yyval.node = block_append(NEW_ARGS(0, yyvsp[-1].node, -1), yyvsp[0].node); ; break;} -case 326: -#line 1455 "parse.y" +case 329: +#line 1452 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, yyvsp[-1].id), yyvsp[0].node); ; break;} -case 327: -#line 1459 "parse.y" +case 330: +#line 1456 "parse.y" { yyval.node = block_append(NEW_ARGS(0, 0, -1), yyvsp[0].node); ; break;} -case 328: -#line 1463 "parse.y" +case 331: +#line 1460 "parse.y" { yyval.node = NEW_ARGS(0, 0, -1); ; break;} -case 329: -#line 1468 "parse.y" +case 332: +#line 1465 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4175,8 +4208,8 @@ case 329: yyval.num = 1; ; break;} -case 330: -#line 1475 "parse.y" +case 333: +#line 1472 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("formal argument must be local variable"); @@ -4184,55 +4217,49 @@ case 330: yyval.num += 1; ; break;} -case 331: -#line 1483 "parse.y" +case 334: +#line 1480 "parse.y" { if (!is_local_id(yyvsp[-2].id)) yyerror("formal argument must be local variable"); yyval.node = assignable(yyvsp[-2].id, yyvsp[0].node); ; break;} -case 332: -#line 1490 "parse.y" +case 335: +#line 1487 "parse.y" { yyval.node = NEW_BLOCK(yyvsp[0].node); yyval.node->nd_end = yyval.node; ; break;} -case 333: -#line 1495 "parse.y" +case 336: +#line 1492 "parse.y" { yyval.node = block_append(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 334: -#line 1500 "parse.y" +case 337: +#line 1497 "parse.y" { if (!is_local_id(yyvsp[0].id)) yyerror("rest argument must be local variable"); yyval.id = local_cnt(yyvsp[0].id); ; break;} -case 335: -#line 1507 "parse.y" +case 338: +#line 1504 "parse.y" { yyval.node = NEW_BLOCK_ARG(yyvsp[0].id); ; break;} -case 336: -#line 1512 "parse.y" +case 339: +#line 1509 "parse.y" { yyval.node = yyvsp[0].node; ; break;} -case 337: -#line 1516 "parse.y" -{ - yyval.node = 0; - ; - break;} -case 338: -#line 1521 "parse.y" +case 341: +#line 1515 "parse.y" { if (nd_type(yyvsp[0].node) == NODE_SELF) { yyval.node = NEW_SELF(); @@ -4246,8 +4273,8 @@ case 338: } ; break;} -case 339: -#line 1534 "parse.y" +case 342: +#line 1528 "parse.y" { switch (nd_type(yyvsp[-2].node)) { case NODE_STR: @@ -4265,20 +4292,14 @@ case 339: yyval.node = yyvsp[-2].node; ; break;} -case 340: -#line 1552 "parse.y" -{ - yyval.node = 0; - ; - break;} -case 341: -#line 1556 "parse.y" +case 344: +#line 1547 "parse.y" { yyval.node = yyvsp[-1].node; ; break;} -case 342: -#line 1560 "parse.y" +case 345: +#line 1551 "parse.y" { if (yyvsp[-1].node->nd_alen%2 != 0) { yyerror("odd number list for Hash"); @@ -4286,26 +4307,32 @@ case 342: yyval.node = yyvsp[-1].node; ; break;} -case 344: -#line 1569 "parse.y" +case 347: +#line 1560 "parse.y" { yyval.node = list_concat(yyvsp[-2].node, yyvsp[0].node); ; break;} -case 345: -#line 1574 "parse.y" +case 348: +#line 1565 "parse.y" { yyval.node = list_append(NEW_LIST(yyvsp[-2].node), yyvsp[0].node); ; break;} -case 360: -#line 1598 "parse.y" +case 363: +#line 1589 "parse.y" {yyerrok;; break;} -case 363: -#line 1602 "parse.y" +case 366: +#line 1593 "parse.y" {yyerrok;; break;} +case 367: +#line 1596 "parse.y" +{ + yyval.node = 0; + ; + break;} } /* the action file gets copied in in place of this dollarsign */ #line 542 "/usr/share/misc/bison.simple" @@ -4528,7 +4555,7 @@ yyerrhandle: } return 1; } -#line 1603 "parse.y" +#line 1599 "parse.y" #include #include @@ -4615,6 +4642,7 @@ yycompile(f) ruby_sourcefile = f; ruby_in_compile = 1; n = yyparse(); + compile_for_eval = 0; ruby_in_compile = 0; if (n == 0) return ruby_eval_tree; @@ -4654,8 +4682,8 @@ rb_compile_string(f, s) lex_pbeg = lex_p = lex_pend = 0; if (!ruby_sourcefile || strcmp(f, ruby_sourcefile)) /* not in eval() */ ruby_sourceline = 0; - else if (ruby_frame) /* in eval() */ - cur_mid = ruby_frame->last_func; + else /* in eval() */ + compile_for_eval = 1; return yycompile(f); } @@ -4683,23 +4711,6 @@ rb_compile_file(f, file, start) } -static void -normalize_newline(line) - VALUE line; -{ - if (RSTRING(line)->len >= 2 && - RSTRING(line)->ptr[RSTRING(line)->len-1] == '\n' && - RSTRING(line)->ptr[RSTRING(line)->len-2] == '\r') - { - RSTRING(line)->ptr[RSTRING(line)->len-2] = '\n'; - RSTRING(line)->len--; - } -#ifdef __MACOS__ - else if (RSTRING(line)->ptr[RSTRING(line)->len-1] == '\r') - RSTRING(line)->ptr[RSTRING(line)->len-1] = '\n'; -#endif -} - static int nextc() { @@ -4714,7 +4725,6 @@ nextc() ruby_sourceline = heredoc_end; heredoc_end = 0; } - normalize_newline(v); ruby_sourceline++; lex_pbeg = lex_p = RSTRING(v)->ptr; lex_pend = lex_p + RSTRING(v)->len; @@ -5229,7 +5239,7 @@ here_document(term, indent) c = term; term = '"'; if (!is_identchar(c)) { - rb_warn("Use of bare << to mean <<\"\" is deprecated"); + rb_warn("use of bare << to mean <<\"\" is deprecated"); break; } while (is_identchar(c)) { @@ -5255,7 +5265,6 @@ here_document(term, indent) free(eos); return 0; } - normalize_newline(line); ruby_sourceline++; p = RSTRING(line)->ptr; if (indent) { @@ -5401,7 +5410,6 @@ yylex() } pushback(c); if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)){ - arg_ambiguous(); lex_state = EXPR_BEG; return tSTAR; } @@ -5529,7 +5537,6 @@ yylex() c = nextc(); if (lex_state == EXPR_ARG && ISSPACE(c)){ pushback(c); - arg_ambiguous(); lex_state = EXPR_BEG; return '?'; } @@ -5558,7 +5565,6 @@ yylex() } pushback(c); if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)){ - arg_ambiguous(); lex_state = EXPR_BEG; return tAMPER; } @@ -5605,7 +5611,6 @@ yylex() if (ISDIGIT(c)) { goto start_num; } - if (lex_state == EXPR_ARG) arg_ambiguous(); pushback(c); lex_state = EXPR_BEG; return tUPLUS; @@ -5635,7 +5640,6 @@ yylex() c = '-'; goto start_num; } - if (lex_state == EXPR_ARG) arg_ambiguous(); lex_state = EXPR_BEG; pushback(c); return tUMINUS; @@ -5811,7 +5815,6 @@ yylex() return tCOLON3; } if (lex_state == EXPR_ARG && space_seen) { - arg_ambiguous(); lex_state = EXPR_BEG; return tCOLON3; } @@ -5895,7 +5898,6 @@ yylex() c = tLBRACK; } else if (lex_state == EXPR_ARG && space_seen) { - arg_ambiguous(); c = tLBRACK; } lex_state = EXPR_BEG; @@ -5909,6 +5911,10 @@ yylex() case '\\': c = nextc(); + if (c == '\r') { + c = nextc(); + if (c != '\n') pushback(c); + } if (c == '\n') { space_seen = 1; goto retry; /* skip \\n */ @@ -5965,11 +5971,8 @@ yylex() yylval.id = '%'; return tOP_ASGN; } - if (lex_state == EXPR_ARG) { - if (space_seen && !ISSPACE(c)) { - arg_ambiguous(); - goto quotation; - } + if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)) { + goto quotation; } lex_state = EXPR_BEG; pushback(c); @@ -6588,30 +6591,11 @@ assignable(id, val) } static NODE * -arg_add(node1, node2) - NODE *node1; - NODE *node2; -{ - return NEW_ARGSCAT(node1, node2); -} - -static NODE * -aryset(recv, idx, val) - NODE *recv, *idx, *val; +aryset(recv, idx) + NODE *recv, *idx; { value_expr(recv); - value_expr(val); - if (idx) { - if (nd_type(idx) == NODE_ARRAY) { - idx = list_append(idx, val); - } - else { - idx = arg_add(idx, val); - } - } - else { - idx = val; - } + return NEW_CALL(recv, tASET, idx); } @@ -6625,14 +6609,13 @@ rb_id_attrset(id) } static NODE * -attrset(recv, id, val) - NODE *recv, *val; +attrset(recv, id) + NODE *recv; ID id; { value_expr(recv); - value_expr(val); - return NEW_CALL(recv, rb_id_attrset(id), NEW_LIST(val)); + return NEW_CALL(recv, rb_id_attrset(id), 0); } static void @@ -6649,6 +6632,59 @@ rb_backref_error(node) } } +static NODE * +arg_concat(node1, node2) + NODE *node1; + NODE *node2; +{ + return NEW_ARGSCAT(node1, node2); +} + +static NODE * +arg_add(node1, node2) + NODE *node1; + NODE *node2; +{ + if (!node1) return NEW_LIST(node2); + if (nd_type(node1) == NODE_ARRAY) { + return list_append(node1, node2); + } + else { + return NEW_ARGSCAT(node1, node2); + } +} + +static NODE* +node_assign(lhs, rhs) + NODE *lhs, *rhs; +{ + if (!lhs) return 0; + + value_expr(rhs); + switch (nd_type(lhs)) { + case NODE_GASGN: + case NODE_IASGN: + case NODE_LASGN: + case NODE_DASGN: + case NODE_DASGN_PUSH: + case NODE_CASGN: + case NODE_MASGN: + lhs->nd_value = rhs; + break; + + case NODE_CALL: + lhs->nd_args = arg_add(lhs->nd_args, rhs); + break; + + default: + /* should not happen */ + break; + } + + if (rhs) fixpos(lhs, rhs); + return lhs; +} + static int value_expr(node) NODE *node; @@ -6688,6 +6724,123 @@ value_expr(node) } } +static void +void_expr(node) + NODE *node; +{ + char *useless = 0; + + if (!ruby_verbose) return; + if (!node) return; + + again: + switch (nd_type(node)) { + case NODE_NEWLINE: + node = node->nd_next; + goto again; + + case NODE_CALL: + switch (node->nd_mid) { + case '+': + case '-': + case '*': + case '/': + case '%': + case tPOW: + case tUPLUS: + case tUMINUS: + case '|': + case '^': + case '&': + case tCMP: + case '>': + case tGEQ: + case '<': + case tLEQ: + case tEQ: + case tEQQ: + case tNEQ: + case tMATCH: + case tNMATCH: + case tAREF: + case tRSHFT: + case tCOLON2: + case tCOLON3: + useless = rb_id2name(node->nd_mid); + break; + } + break; + + case NODE_LVAR: + case NODE_DVAR: + case NODE_GVAR: + case NODE_IVAR: + case NODE_NTH_REF: + case NODE_BACK_REF: + useless = "a variable"; + break; + case NODE_CVAR: + case NODE_CREF: + useless = "a constant"; + break; + case NODE_LIT: + case NODE_STR: + case NODE_DSTR: + case NODE_DREGX: + case NODE_DREGX_ONCE: + useless = "a literal"; + break; + case NODE_COLON2: + case NODE_COLON3: + useless = "::"; + break; + case NODE_DOT2: + useless = ".."; + break; + case NODE_DOT3: + useless = "..."; + break; + case NODE_SELF: + useless = "self"; + break; + case NODE_NIL: + useless = "nil"; + break; + case NODE_TRUE: + useless = "true"; + break; + case NODE_FALSE: + useless = "false"; + break; + case NODE_DEFINED: + useless = "defined?"; + break; + } + + if (useless) { + int line = ruby_sourceline; + + ruby_sourceline = nd_line(node); + rb_warn("useless use of %s in void context", useless); + ruby_sourceline = line; + } +} + +static void +void_stmts(node) + NODE *node; +{ + if (!ruby_verbose) return; + if (!node) return; + if (nd_type(node) != NODE_BLOCK) return; + + for (;;) { + if (!node->nd_next) return; + void_expr(node->nd_head); + node = node->nd_next; + } +} + static NODE *cond2(); static int @@ -7055,6 +7208,7 @@ static struct { char *name; } op_tbl[] = { tDOT2, "..", + tDOT3, "...", '+', "+", '-', "-", '+', "+(binary)", diff --git a/parse.y b/parse.y index 7779e7918a..8ec3489633 100644 --- a/parse.y +++ b/parse.y @@ -62,19 +62,23 @@ static enum lex_state { static int class_nest = 0; static int in_single = 0; +static int compile_for_eval = 0; static ID cur_mid = 0; -static int value_expr(); static NODE *cond(); static NODE *logop(); static NODE *newline_node(); static void fixpos(); +static int value_expr(); +static void void_expr(); +static void void_stmts(); + static NODE *block_append(); static NODE *list_append(); static NODE *list_concat(); -static NODE *arg_add(); +static NODE *arg_concat(); static NODE *call_op(); static int in_defined = 0; @@ -87,6 +91,7 @@ static NODE *assignable(); static NODE *aryset(); static NODE *attrset(); static void rb_backref_error(); +static NODE *node_assign(); static NODE *match_gen(); static void local_push(); @@ -170,12 +175,12 @@ static void top_local_setup(); %type compstmt stmts stmt expr arg primary command_call method_call %type if_tail opt_else case_body cases rescue ensure %type opt_call_args call_args ret_args args when_args -%type aref_args opt_block_arg block_arg -%type mrhs opt_list superclass iterator var_ref +%type aref_args opt_block_arg block_arg stmt_rhs +%type mrhs opt_list superclass generic_call block_call var_ref %type f_arglist f_args f_optarg f_opt f_block_arg opt_f_block_arg %type array assoc_list assocs assoc undef_list backref -%type iter_var opt_iter_var iter_block iter_do_block -%type mlhs mlhs_head mlhs_tail mlhs_basic mlhs_entry mlhs_item lhs +%type block_var opt_block_var brace_block do_block lhs none +%type mlhs mlhs_head mlhs_tail mlhs_basic mlhs_entry mlhs_item mlhs_node %type variable symbol operation operation2 %type cname fname op f_rest_arg %type f_arg @@ -240,6 +245,16 @@ program : { } compstmt { + if ($2) { /* last expression is void */ + if (nd_type($2) != NODE_BLOCK) void_expr($2); + else { + NODE *node = $2; + while (node->nd_next) { + node = node->nd_next; + } + void_expr(node->nd_head); + } + } ruby_eval_tree = block_append(ruby_eval_tree, $2); top_local_setup(); cur_cref = 0; @@ -248,11 +263,12 @@ program : { } compstmt : stmts opt_terms - -stmts : /* none */ { - $$ = 0; + void_stmts($1); + $$ = $1; } + +stmts : none | stmt { $$ = newline_node($1); @@ -266,15 +282,7 @@ stmts : /* none */ $$ = $2; } -stmt : iterator iter_do_block - { - if ($1 && nd_type($1) == NODE_BLOCK_PASS) { - rb_compile_error("both block arg and actual block given"); - } - $2->nd_iter = $1; - $$ = $2; - fixpos($$, $2); - } +stmt : block_call | kALIAS fname {lex_state = EXPR_FNAME;} fname { if (cur_mid || in_single) @@ -344,24 +352,28 @@ stmt : iterator iter_do_block if (cur_mid || in_single) { yyerror("BEGIN in method"); } - local_push(); } '{' compstmt '}' { ruby_eval_tree_begin = block_append(ruby_eval_tree_begin, - NEW_PREEXE($4)); + NEW_PREEXE($4)); local_pop(); $$ = 0; } | klEND '{' compstmt '}' { - if (cur_mid || in_single) { + if (compile_for_eval && (cur_mid || in_single)) { yyerror("END in method; use at_exit"); } $$ = NEW_ITER(0, NEW_POSTEXE(), $3); } + | lhs '=' stmt_rhs + { + value_expr($3); + $$ = node_assign($1, $3); + } | expr expr : mlhs '=' mrhs @@ -373,7 +385,7 @@ expr : mlhs '=' mrhs | kRETURN ret_args { value_expr($2); - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); $$ = NEW_RETURN($2); } @@ -422,7 +434,7 @@ command_call : operation call_args } | kSUPER call_args { - if (!cur_mid && !in_single && !in_defined) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("super called outside of method"); $$ = NEW_SUPER($2); fixpos($$, $2); @@ -456,12 +468,12 @@ mlhs_basic : mlhs_head { $$ = NEW_MASGN(list_concat(NEW_LIST($1),$2),$5); } - | tSTAR lhs + | tSTAR mlhs_node { $$ = NEW_MASGN(0, $2); } -mlhs_item : lhs +mlhs_item : mlhs_node | tLPAREN mlhs_entry ')' { $$ = $2; @@ -481,17 +493,35 @@ mlhs_tail : mlhs_item $$ = list_append($1, $3); } +mlhs_node : variable + { + $$ = assignable($1, 0); + } + | primary '[' aref_args ']' + { + $$ = aryset($1, $3); + } + | primary '.' tIDENTIFIER + { + $$ = attrset($1, $3); + } + | backref + { + rb_backref_error($1); + $$ = 0; + } + lhs : variable { $$ = assignable($1, 0); } | primary '[' aref_args ']' { - $$ = aryset($1, $3, 0); + $$ = aryset($1, $3); } | primary '.' tIDENTIFIER { - $$ = attrset($1, $3, 0); + $$ = attrset($1, $3); } | backref { @@ -564,34 +594,10 @@ reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND | kTHEN | kTRUE | kUNDEF | kUNLESS_MOD | kUNTIL_MOD | kWHEN | kWHILE_MOD | kYIELD -arg : variable '=' {$$ = assignable($1, 0);} arg - { - $$ = $3; - if ($$) { - $$->nd_value = $4; - fixpos($$, $4); - } - } - | primary '[' aref_args ']' '=' arg - { - $$ = aryset($1, $3, $6); - fixpos($$, $1); - } - | primary '.' tIDENTIFIER '=' arg - { - $$ = attrset($1, $3, $5); - fixpos($$, $5); - } - | primary '.' tCONSTANT '=' arg - { - $$ = attrset($1, $3, $5); - fixpos($$, $5); - } - | backref '=' arg +arg : lhs '=' arg { value_expr($3); - rb_backref_error($1); - $$ = 0; + $$ = node_assign($1, $3); } | variable tOP_ASGN {$$ = assignable($1, 0);} arg { @@ -792,10 +798,7 @@ aref_args : opt_call_args $$ = $1; } -opt_call_args : /* none */ - { - $$ = 0; - } +opt_call_args : none | call_args opt_nl call_args : command_call @@ -813,7 +816,7 @@ call_args : command_call } | args ',' tSTAR arg opt_block_arg { - $$ = arg_add($1, $4); + $$ = arg_concat($1, $4); $$ = arg_blk_pass($$, $5); } | assocs ',' @@ -827,7 +830,7 @@ call_args : command_call } | assocs ',' tSTAR arg opt_block_arg { - $$ = arg_add(NEW_LIST(NEW_HASH($1)), $4); + $$ = arg_concat(NEW_LIST(NEW_HASH($1)), $4); $$ = arg_blk_pass($$, $5); } | args ',' assocs opt_block_arg @@ -841,7 +844,7 @@ call_args : command_call } | args ',' assocs ',' tSTAR arg opt_block_arg { - $$ = arg_add(list_append($1, NEW_HASH($3)), $6); + $$ = arg_concat(list_append($1, NEW_HASH($3)), $6); $$ = arg_blk_pass($$, $7); } | tSTAR arg opt_block_arg @@ -861,16 +864,10 @@ opt_block_arg : ',' block_arg { $$ = $2; } - | /* none */ - { - $$ = 0; - } + | none opt_list : args - | /* none */ - { - $$ = 0; - } + | none args : arg { @@ -898,7 +895,7 @@ mrhs : args | args ',' tSTAR arg { value_expr($4); - $$ = arg_add($1, $4); + $$ = arg_concat($1, $4); } | tSTAR arg { @@ -920,10 +917,7 @@ ret_args : call_args } } -array : /* none */ - { - $$ = 0; - } +array : none | args trailer primary : literal @@ -971,20 +965,20 @@ primary : literal } | kRETURN '(' ret_args ')' { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); value_expr($3); $$ = NEW_RETURN($3); } | kRETURN '(' ')' { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); $$ = NEW_RETURN(0); } | kRETURN { - if (!cur_mid && !in_single) + if (!compile_for_eval && !cur_mid && !in_single) yyerror("return appeared outside of method"); $$ = NEW_RETURN(0); } @@ -1010,13 +1004,13 @@ primary : literal { $$ = NEW_VCALL($1); } - | operation iter_block + | operation brace_block { $2->nd_iter = NEW_FCALL($1, 0); $$ = $2; } | method_call - | method_call iter_block + | method_call brace_block { if ($1 && nd_type($1) == NODE_BLOCK_PASS) { rb_compile_error("both block arg and actual block given"); @@ -1067,7 +1061,7 @@ primary : literal $$ = NEW_CASE($2, $3); fixpos($$, $2); } - | kFOR iter_var kIN expr do + | kFOR block_var kIN expr do compstmt kEND { @@ -1216,22 +1210,16 @@ if_tail : opt_else fixpos($$, $2); } -opt_else : /* none */ - { - $$ = 0; - } +opt_else : none | kELSE compstmt { $$ = $2; } -iter_var : lhs +block_var : lhs | mlhs -opt_iter_var : /* node */ - { - $$ = 0; - } +opt_block_var : none | '|' /* none */ '|' { $$ = 0; @@ -1240,16 +1228,16 @@ opt_iter_var : /* node */ { $$ = 0; } - | '|' iter_var '|' + | '|' block_var '|' { $$ = $2; } -iter_do_block : kDO +do_block : kDO { $$ = dyna_push(); } - opt_iter_var + opt_block_var compstmt kEND { @@ -1258,11 +1246,11 @@ iter_do_block : kDO dyna_pop($2); } -iter_block : '{' +brace_block : '{' { $$ = dyna_push(); } - opt_iter_var + opt_block_var compstmt '}' { $$ = NEW_ITER($3, 0, $4); @@ -1270,7 +1258,7 @@ iter_block : '{' dyna_pop($2); } -iterator : tIDENTIFIER +generic_call : tIDENTIFIER { $$ = NEW_VCALL($1); } @@ -1285,6 +1273,16 @@ iterator : tIDENTIFIER | method_call | command_call +block_call : generic_call do_block + { + if ($1 && nd_type($1) == NODE_BLOCK_PASS) { + rb_compile_error("both block arg and actual block given"); + } + $2->nd_iter = $1; + $$ = $2; + fixpos($$, $2); + } + method_call : operation '(' opt_call_args ')' { $$ = new_fcall($1, $3); @@ -1315,18 +1313,23 @@ method_call : operation '(' opt_call_args ')' } | kSUPER '(' opt_call_args ')' { - if (!cur_mid && !in_single && !in_defined) + if (!compile_for_eval && !cur_mid && + !in_single && !in_defined) yyerror("super called outside of method"); $$ = NEW_SUPER($3); } | kSUPER { - if (!cur_mid && !in_single && !in_defined) + if (!compile_for_eval && !cur_mid && + !in_single && !in_defined) yyerror("super called outside of method"); $$ = NEW_ZSUPER(); } +stmt_rhs : block_call + | command_call + case_body : kWHEN when_args then compstmt cases @@ -1356,15 +1359,9 @@ rescue : kRESCUE opt_list do $$ = NEW_RESBODY($2, $4, $5); fixpos($$, $2?$2:$4); } - | /* none */ - { - $$ = 0; - } + | none -ensure : /* none */ - { - $$ = 0; - } +ensure : none | kENSURE compstmt { $$ = $2; @@ -1512,10 +1509,7 @@ opt_f_block_arg : ',' f_block_arg { $$ = $2; } - | /* none */ - { - $$ = 0; - } + | none singleton : var_ref { @@ -1548,10 +1542,7 @@ singleton : var_ref $$ = $2; } -assoc_list : /* none */ - { - $$ = 0; - } +assoc_list : none | assocs trailer { $$ = $1; @@ -1600,6 +1591,11 @@ term : ';' {yyerrok;} terms : term | terms ';' {yyerrok;} + +none : /* none */ + { + $$ = 0; + } %% #include #include @@ -1686,6 +1682,7 @@ yycompile(f) ruby_sourcefile = f; ruby_in_compile = 1; n = yyparse(); + compile_for_eval = 0; ruby_in_compile = 0; if (n == 0) return ruby_eval_tree; @@ -1725,8 +1722,8 @@ rb_compile_string(f, s) lex_pbeg = lex_p = lex_pend = 0; if (!ruby_sourcefile || strcmp(f, ruby_sourcefile)) /* not in eval() */ ruby_sourceline = 0; - else if (ruby_frame) /* in eval() */ - cur_mid = ruby_frame->last_func; + else /* in eval() */ + compile_for_eval = 1; return yycompile(f); } @@ -1754,23 +1751,6 @@ rb_compile_file(f, file, start) } -static void -normalize_newline(line) - VALUE line; -{ - if (RSTRING(line)->len >= 2 && - RSTRING(line)->ptr[RSTRING(line)->len-1] == '\n' && - RSTRING(line)->ptr[RSTRING(line)->len-2] == '\r') - { - RSTRING(line)->ptr[RSTRING(line)->len-2] = '\n'; - RSTRING(line)->len--; - } -#ifdef __MACOS__ - else if (RSTRING(line)->ptr[RSTRING(line)->len-1] == '\r') - RSTRING(line)->ptr[RSTRING(line)->len-1] = '\n'; -#endif -} - static int nextc() { @@ -1785,7 +1765,6 @@ nextc() ruby_sourceline = heredoc_end; heredoc_end = 0; } - normalize_newline(v); ruby_sourceline++; lex_pbeg = lex_p = RSTRING(v)->ptr; lex_pend = lex_p + RSTRING(v)->len; @@ -2300,7 +2279,7 @@ here_document(term, indent) c = term; term = '"'; if (!is_identchar(c)) { - rb_warn("Use of bare << to mean <<\"\" is deprecated"); + rb_warn("use of bare << to mean <<\"\" is deprecated"); break; } while (is_identchar(c)) { @@ -2326,7 +2305,6 @@ here_document(term, indent) free(eos); return 0; } - normalize_newline(line); ruby_sourceline++; p = RSTRING(line)->ptr; if (indent) { @@ -2472,7 +2450,6 @@ yylex() } pushback(c); if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)){ - arg_ambiguous(); lex_state = EXPR_BEG; return tSTAR; } @@ -2600,7 +2577,6 @@ yylex() c = nextc(); if (lex_state == EXPR_ARG && ISSPACE(c)){ pushback(c); - arg_ambiguous(); lex_state = EXPR_BEG; return '?'; } @@ -2629,7 +2605,6 @@ yylex() } pushback(c); if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)){ - arg_ambiguous(); lex_state = EXPR_BEG; return tAMPER; } @@ -2676,7 +2651,6 @@ yylex() if (ISDIGIT(c)) { goto start_num; } - if (lex_state == EXPR_ARG) arg_ambiguous(); pushback(c); lex_state = EXPR_BEG; return tUPLUS; @@ -2706,7 +2680,6 @@ yylex() c = '-'; goto start_num; } - if (lex_state == EXPR_ARG) arg_ambiguous(); lex_state = EXPR_BEG; pushback(c); return tUMINUS; @@ -2882,7 +2855,6 @@ yylex() return tCOLON3; } if (lex_state == EXPR_ARG && space_seen) { - arg_ambiguous(); lex_state = EXPR_BEG; return tCOLON3; } @@ -2966,7 +2938,6 @@ yylex() c = tLBRACK; } else if (lex_state == EXPR_ARG && space_seen) { - arg_ambiguous(); c = tLBRACK; } lex_state = EXPR_BEG; @@ -2980,6 +2951,10 @@ yylex() case '\\': c = nextc(); + if (c == '\r') { + c = nextc(); + if (c != '\n') pushback(c); + } if (c == '\n') { space_seen = 1; goto retry; /* skip \\n */ @@ -3036,11 +3011,8 @@ yylex() yylval.id = '%'; return tOP_ASGN; } - if (lex_state == EXPR_ARG) { - if (space_seen && !ISSPACE(c)) { - arg_ambiguous(); - goto quotation; - } + if (lex_state == EXPR_ARG && space_seen && !ISSPACE(c)) { + goto quotation; } lex_state = EXPR_BEG; pushback(c); @@ -3659,30 +3631,11 @@ assignable(id, val) } static NODE * -arg_add(node1, node2) - NODE *node1; - NODE *node2; -{ - return NEW_ARGSCAT(node1, node2); -} - -static NODE * -aryset(recv, idx, val) - NODE *recv, *idx, *val; +aryset(recv, idx) + NODE *recv, *idx; { value_expr(recv); - value_expr(val); - if (idx) { - if (nd_type(idx) == NODE_ARRAY) { - idx = list_append(idx, val); - } - else { - idx = arg_add(idx, val); - } - } - else { - idx = val; - } + return NEW_CALL(recv, tASET, idx); } @@ -3696,14 +3649,13 @@ rb_id_attrset(id) } static NODE * -attrset(recv, id, val) - NODE *recv, *val; +attrset(recv, id) + NODE *recv; ID id; { value_expr(recv); - value_expr(val); - return NEW_CALL(recv, rb_id_attrset(id), NEW_LIST(val)); + return NEW_CALL(recv, rb_id_attrset(id), 0); } static void @@ -3720,6 +3672,59 @@ rb_backref_error(node) } } +static NODE * +arg_concat(node1, node2) + NODE *node1; + NODE *node2; +{ + return NEW_ARGSCAT(node1, node2); +} + +static NODE * +arg_add(node1, node2) + NODE *node1; + NODE *node2; +{ + if (!node1) return NEW_LIST(node2); + if (nd_type(node1) == NODE_ARRAY) { + return list_append(node1, node2); + } + else { + return NEW_ARGSCAT(node1, node2); + } +} + +static NODE* +node_assign(lhs, rhs) + NODE *lhs, *rhs; +{ + if (!lhs) return 0; + + value_expr(rhs); + switch (nd_type(lhs)) { + case NODE_GASGN: + case NODE_IASGN: + case NODE_LASGN: + case NODE_DASGN: + case NODE_DASGN_PUSH: + case NODE_CASGN: + case NODE_MASGN: + lhs->nd_value = rhs; + break; + + case NODE_CALL: + lhs->nd_args = arg_add(lhs->nd_args, rhs); + break; + + default: + /* should not happen */ + break; + } + + if (rhs) fixpos(lhs, rhs); + return lhs; +} + static int value_expr(node) NODE *node; @@ -3759,6 +3764,123 @@ value_expr(node) } } +static void +void_expr(node) + NODE *node; +{ + char *useless = 0; + + if (!ruby_verbose) return; + if (!node) return; + + again: + switch (nd_type(node)) { + case NODE_NEWLINE: + node = node->nd_next; + goto again; + + case NODE_CALL: + switch (node->nd_mid) { + case '+': + case '-': + case '*': + case '/': + case '%': + case tPOW: + case tUPLUS: + case tUMINUS: + case '|': + case '^': + case '&': + case tCMP: + case '>': + case tGEQ: + case '<': + case tLEQ: + case tEQ: + case tEQQ: + case tNEQ: + case tMATCH: + case tNMATCH: + case tAREF: + case tRSHFT: + case tCOLON2: + case tCOLON3: + useless = rb_id2name(node->nd_mid); + break; + } + break; + + case NODE_LVAR: + case NODE_DVAR: + case NODE_GVAR: + case NODE_IVAR: + case NODE_NTH_REF: + case NODE_BACK_REF: + useless = "a variable"; + break; + case NODE_CVAR: + case NODE_CREF: + useless = "a constant"; + break; + case NODE_LIT: + case NODE_STR: + case NODE_DSTR: + case NODE_DREGX: + case NODE_DREGX_ONCE: + useless = "a literal"; + break; + case NODE_COLON2: + case NODE_COLON3: + useless = "::"; + break; + case NODE_DOT2: + useless = ".."; + break; + case NODE_DOT3: + useless = "..."; + break; + case NODE_SELF: + useless = "self"; + break; + case NODE_NIL: + useless = "nil"; + break; + case NODE_TRUE: + useless = "true"; + break; + case NODE_FALSE: + useless = "false"; + break; + case NODE_DEFINED: + useless = "defined?"; + break; + } + + if (useless) { + int line = ruby_sourceline; + + ruby_sourceline = nd_line(node); + rb_warn("useless use of %s in void context", useless); + ruby_sourceline = line; + } +} + +static void +void_stmts(node) + NODE *node; +{ + if (!ruby_verbose) return; + if (!node) return; + if (nd_type(node) != NODE_BLOCK) return; + + for (;;) { + if (!node->nd_next) return; + void_expr(node->nd_head); + node = node->nd_next; + } +} + static NODE *cond2(); static int @@ -4126,6 +4248,7 @@ static struct { char *name; } op_tbl[] = { tDOT2, "..", + tDOT3, "...", '+', "+", '-', "-", '+', "+(binary)", diff --git a/process.c b/process.c index a235009149..e7e165a251 100644 --- a/process.c +++ b/process.c @@ -240,11 +240,15 @@ proc_exec_v(argv, prog) return -1; } } -#if (defined(MSDOS) && !defined(DJGPP)) || defined(__human68k__) +#if (defined(MSDOS) && !defined(DJGPP)) || defined(__human68k__) || defined(__EMX__) || defined(OS2) { #if defined(__human68k__) #define COMMAND "command.x" -#else +#endif +#if defined(__EMX__) || defined(OS2) /* OS/2 emx */ +#define COMMAND "cmd.exe" +#endif +#if (defined(MSDOS) && !defined(DJGPP)) #define COMMAND "command.com" #endif char *extension; @@ -272,7 +276,7 @@ proc_exec_v(argv, prog) } } } -#endif /* MSDOS or __human68k__ */ +#endif /* MSDOS or __human68k__ or __EMX__ */ before_exec(); execv(prog, argv); after_exec(); @@ -326,7 +330,7 @@ rb_proc_exec(str) if (state != -1) exit(state); #else -#if defined(__human68k__) || defined(__CYGWIN32__) +#if defined(__human68k__) || defined(__CYGWIN32__) || defined(__EMX__) char *shell = dln_find_exe("sh", 0); int state = -1; before_exec(); @@ -510,7 +514,7 @@ static VALUE rb_f_fork(obj) VALUE obj; { -#if !defined(__human68k__) && !defined(__MACOS__) +#if !defined(__human68k__) && !defined(NT) && !defined(__MACOS__) && !defined(__EMX__) int pid; rb_secure(2); @@ -1005,9 +1009,7 @@ Init_process() #ifndef USE_CWGUSI rb_define_global_function("exec", rb_f_exec, -1); #endif -#if !defined(NT) rb_define_global_function("fork", rb_f_fork, 0); -#endif rb_define_global_function("exit!", rb_f_exit_bang, 1); rb_define_global_function("system", rb_f_system, -1); rb_define_global_function("sleep", rb_f_sleep, -1); diff --git a/range.c b/range.c index 74bbdcdceb..7f0e0c581f 100644 --- a/range.c +++ b/range.c @@ -191,7 +191,11 @@ rb_range_beg_len(range, begp, lenp, len, err) beg += len; if (beg < 0) goto out_of_range; } - if (err == 2 && beg > len) goto out_of_range; + if (err == 2) { + if (beg > len) goto out_of_range; + if (end > len || (!EXCL(range) && end == len)) + goto out_of_range; + } if (end < 0) { end += len; if (end < 0) { diff --git a/regex.c b/regex.c index 685e767c10..27f1b56878 100644 --- a/regex.c +++ b/regex.c @@ -3396,7 +3396,7 @@ re_match(bufp, string_arg, size, pos, regs) #ifdef SWITCH_ENUM_BUG switch ((int)((enum regexpcode)*p++)) #else - switch ((enum regexpcode)*p++) + switch ((enum regexpcode)*p++) #endif { @@ -4019,7 +4019,7 @@ re_match(bufp, string_arg, size, pos, regs) /* If this failure point is from a dummy_failure_point, just skip it. */ - if (stackp[-3] == 0) { + if (stackp[-3] == 0 || (best_regs_set && stackp[-1] == 1)) { POP_FAILURE_POINT(); goto fail; } diff --git a/ruby.c b/ruby.c index 493aafd1eb..f382af06ba 100644 --- a/ruby.c +++ b/ruby.c @@ -548,6 +548,12 @@ load_file(fname, script) xflag = Qfalse; while (!NIL_P(line = rb_io_gets(f))) { line_start++; +#if defined(__EMX__) || defined(OS2) +/* + if (p = strstr(RSTRING(line)->ptr, "extproc")) + line = io_gets(f); +*/ +#endif /* __EMX__ */ if (RSTRING(line)->len > 2 && RSTRING(line)->ptr[0] == '#' && RSTRING(line)->ptr[1] == '!') { diff --git a/sample/list.rb b/sample/list.rb index 17eefae85a..221f7edb16 100644 --- a/sample/list.rb +++ b/sample/list.rb @@ -64,7 +64,7 @@ class Point end end -# global variables are start with `$'. +# global variable name starts with `$'. $list1 = MyList.new $list1.add_to_list(10) $list1.add_to_list(20) diff --git a/sample/test.rb b/sample/test.rb index ad4cf20269..57641448ff 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -417,7 +417,7 @@ ok(i == 5) done = true loop{ break - done = false + done = false # should not reach here } ok(done) @@ -427,7 +427,7 @@ loop { break if done done = true next - $bad = true + $bad = true # should not reach here } ok(!$bad) @@ -437,7 +437,7 @@ loop { break if done done = true redo - $bad = true + $bad = true # should not reach here } ok(!$bad) diff --git a/sample/trojan.rb b/sample/trojan.rb index edf8ee63ce..6e9b18f502 100644 --- a/sample/trojan.rb +++ b/sample/trojan.rb @@ -1,5 +1,6 @@ #! /usr/local/bin/ruby -path = ENV['PATH'].split(/:/) + +path = ENV['PATH'].split(File::PATH_SEPARATOR) for dir in path if File.directory?(dir) diff --git a/signal.c b/signal.c index 8978ac0f77..3e5bed4799 100644 --- a/signal.c +++ b/signal.c @@ -310,8 +310,10 @@ signal_exec(sig) case SIGINT: rb_thread_interrupt(); break; +#ifndef NT case SIGHUP: case SIGTERM: +#endif #ifdef SIGPIPE case SIGPIPE: #endif @@ -493,8 +495,10 @@ trap(arg) if (func == SIG_DFL) { switch (sig) { case SIGINT: +#ifndef NT case SIGHUP: case SIGTERM: +#endif #ifdef SIGQUIT case SIGQUIT: #endif @@ -609,8 +613,10 @@ Init_signal() #ifndef MACOS_UNUSE_SIGNAL rb_define_global_function("trap", rb_f_trap, -1); ruby_signal(SIGINT, sighandle); +#ifndef NT ruby_signal(SIGHUP, sighandle); ruby_signal(SIGTERM, sighandle); +#endif #ifdef SIGPIPE ruby_signal(SIGPIPE, sighandle); #endif diff --git a/st.c b/st.c index 8c0a3861f5..9a3353a76e 100644 --- a/st.c +++ b/st.c @@ -186,7 +186,7 @@ st_free_table(table) } #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \ -((ptr) != 0 && ptr->hash != (hash_val) && !EQUAL((table), (key), (ptr)->key)) +((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key))) #define FIND_ENTRY(table, ptr, hash_val, bin_pos) \ bin_pos = hash_val%(table)->num_bins;\ diff --git a/time.c b/time.c index 8cdeb55317..c8658d9785 100644 --- a/time.c +++ b/time.c @@ -147,9 +147,18 @@ time_s_at(klass, time) VALUE klass, time; { struct timeval tv; + VALUE t; tv = rb_time_timeval(time); - return time_new_internal(klass, tv.tv_sec, tv.tv_usec); + t = time_new_internal(klass, tv.tv_sec, tv.tv_usec); + if (TYPE(time) == T_DATA) { + struct time_object *tobj, *tobj2; + + GetTimeval(time, tobj); + GetTimeval(t, tobj2); + tobj2->gmt = tobj->gmt; + } + return t; } static char *months [12] = { diff --git a/util.h b/util.h index fcd4a7cc59..41ce2a5a19 100644 --- a/util.h +++ b/util.h @@ -13,11 +13,16 @@ #define UTIL_H #ifndef _ -# ifdef __STDC__ -# define _(args) args -# else -# define _(args) () -# endif +#ifdef HAVE_PROTOTYPES +# define _(args) args +#else +# define _(args) () +#endif +#ifdef HAVE_STDARG_PROTOTYPES +# define __(args) args +#else +# define __(args) () +#endif #endif #define scan_oct ruby_scan_oct @@ -35,8 +40,8 @@ char *ruby_mktemp _((void)); void ruby_qsort _((void*, int, int, int (*)())); #define qsort(b,n,s,c) ruby_qsort(b,n,s,c) -void ruby_setenv _((char*, char*)); -void ruby_unsetenv _((char*)); +void ruby_setenv _((const char*, const char*)); +void ruby_unsetenv _((const char*)); #undef setenv #undef unsetenv #define setenv(name,val) ruby_setenv((name),(val)) diff --git a/version.h b/version.h index 1f44e4caa8..606d7ea462 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define RUBY_VERSION "1.3.1" -#define RUBY_RELEASE_DATE "1999-03-24" +#define RUBY_VERSION "1.3.2" +#define RUBY_RELEASE_DATE "1999-04-08" diff --git a/win32/config.h b/win32/config.h index 9486750ff9..e723753d74 100644 --- a/win32/config.h +++ b/win32/config.h @@ -1,6 +1,3 @@ -#define SIZEOF_INT 4 -#define SIZEOF_LONG 4 -#define SIZEOF_VOIDP 4 #define HAVE_PROTOTYPES 1 #define HAVE_STDARG_PROTOTYPES 1 /* #define HAVE_ATTR_NORETURN 1 */