Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge from master. Fix a conflict in IMCC with handling of automagic …

…'self'. Add some comments too, to explain the code after the merge
  • Loading branch information...
commit d7856f8b7f9224db48a0d9e4931d305e184abcb0 2 parents de203dd + 6c302cf
@Whiteknight Whiteknight authored
Showing with 6,969 additions and 5,472 deletions.
  1. +35 −23 .travis.yml
  2. +2 −1  CREDITS
  3. +65 −4 ChangeLog
  4. +7 −6 MANIFEST
  5. +3 −3 MANIFEST.generated
  6. +8 −4 README
  7. +3 −2 RESPONSIBLE_PARTIES
  8. +1 −1  VERSION
  9. +3 −3 compilers/imcc/cfg.c
  10. +3 −1 compilers/imcc/imcc.l
  11. +1 −1  compilers/imcc/imcc.y
  12. +3 −1 compilers/imcc/imclexer.c
  13. +546 −497 compilers/imcc/imcparser.c
  14. +6 −8 compilers/imcc/imcparser.h
  15. +0 −25 compilers/imcc/main.c
  16. +7 −5 compilers/imcc/optimizer.c
  17. +66 −37 compilers/imcc/pbc.c
  18. +4 −90 compilers/imcc/pcc.c
  19. +1 −1  compilers/imcc/reg_alloc.c
  20. +2 −1  compilers/opsc/src/Ops/Emitter.pm
  21. +7 −6 compilers/opsc/src/Ops/Trans/C.pm
  22. +1 −1  compilers/pct/src/PAST/Compiler.pir
  23. +11 −16 compilers/pct/src/PCT/HLLCompiler.pir
  24. +1 −1  config/auto/byteorder.pm
  25. +4 −0 config/auto/gcc.pm
  26. +1 −1  config/auto/headers.pm
  27. +4 −8 config/auto/icu.pm
  28. +33 −27 config/auto/warnings.pm
  29. +185 −158 config/gen/makefiles/root.in
  30. +2 −2 config/init/hints/cygwin.pm
  31. +2 −2 config/init/hints/darwin.pm
  32. +13 −5 config/init/hints/mswin32.pm
  33. +2 −2 docs/book/draft/ch10_opcode_reference.pod
  34. +2 −2 docs/book/pir/ch04_variables.pod
  35. +2 −2 docs/configuration.pod
  36. +8 −8 docs/gettingstarted.pod
  37. +0 −15 docs/glossary.pod
  38. +6 −2 docs/parrothist.pod
  39. +4 −0 docs/project/cage_cleaners_guide.pod
  40. +17 −0 docs/project/hacking_tips.pod
  41. +60 −33 docs/project/release_manager_guide.pod
  42. +321 −0 docs/project/release_parrot_github_guide.pod
  43. +3 −3 examples/benchmarks/oo1.pir
  44. +3 −3 examples/benchmarks/oo2.pir
  45. +3 −3 examples/benchmarks/oo3.pir
  46. +0 −43 examples/benchmarks/oo4.pasm
  47. +0 −29 examples/benchmarks/oo4.pl
  48. +0 −14 examples/benchmarks/oo4.py
  49. +0 −19 examples/benchmarks/oo4.rb
  50. +1 −1  examples/sdl/tetris/block.pir
  51. +18 −18 examples/sdl/tetris/board.pir
  52. +1 −1  ext/nqp-rx/src/stage0/HLL-s0.pir
  53. +2 −2 ext/nqp-rx/src/stage0/Regex-s0.pir
  54. +1 −1  ext/winxed/Rules.mak
  55. +470 −236 ext/winxed/compiler.pir
  56. +149 −97 ext/winxed/driver.pir
  57. +0 −1  frontend/parrot/main.c
  58. +3 −2 frontend/parrot2/build.pir
  59. +2 −4 frontend/parrot2/main.c
  60. +37 −13 frontend/parrot_debugger/main.c
  61. +9 −1 frontend/pbc_disassemble/main.c
  62. +89 −28 frontend/pbc_dump/main.c
  63. +2 −2 frontend/pbc_dump/packdump.c
  64. +2 −2 frontend/pbc_merge/main.c
  65. +23 −8 include/parrot/api.h
  66. +10 −0 include/parrot/call.h
  67. +8 −0 include/parrot/compiler.h
  68. +0 −23 include/parrot/context.h
  69. +8 −0 include/parrot/exceptions.h
  70. +0 −1  include/parrot/gc_api.h
  71. +3 −4 include/parrot/hash.h
  72. +7 −5 include/parrot/interpreter.h
  73. +1 −1  include/parrot/memory.h
  74. +3 −3 include/parrot/oplib/core_ops.h
  75. +206 −206 include/parrot/oplib/ops.h
  76. +206 −206 include/parrot/opsenum.h
  77. +7 −19 include/parrot/packfile.h
  78. +5 −0 include/parrot/parrot.h
  79. +45 −0 include/parrot/pmc.h
  80. +35 −57 include/parrot/pointer_array.h
  81. +1 −1  include/parrot/scheduler.h
  82. +0 −8 include/parrot/sub.h
  83. +4 −4 lib/Parrot/Configure/Compiler.pm
  84. +19 −5 lib/Parrot/Distribution.pm
  85. +8 −8 lib/Parrot/Docs/File.pm
  86. +3 −3 lib/Parrot/Docs/POD2HTML.pm
  87. +3 −2 lib/Parrot/Headerizer.pm
  88. +4 −4 lib/Parrot/IO/File.pm
  89. +2 −2 lib/Parrot/IO/Path.pm
  90. +7 −7 lib/Parrot/Manifest.pm
  91. +4 −4 lib/Parrot/Pmc2c/PMC.pm
  92. +1 −1  lib/Parrot/Pmc2c/PMC/default.pm
  93. +2 −2 runtime/parrot/library/P6object.pir
  94. +1 −1  runtime/parrot/library/SDL/Surface.pir
  95. +1 −2  runtime/parrot/library/Stream/Writer.pir
  96. +3 −3 runtime/parrot/library/osutils.pir
  97. +1 −1  runtime/parrot/library/parrotlib.pir
  98. +4 −3 src/alarm.c
  99. +0 −3  src/call/args.c
  100. +36 −1 src/call/context.c
  101. +0 −32 src/call/context_accessors.c
  102. +5 −4 src/call/ops.c
  103. +20 −18 src/debug.c
  104. +7 −7 src/dynext.c
  105. +3 −3 src/dynpmc/gziphandle.pmc
  106. +29 −0 src/dynpmc/os.pmc
  107. +21 −5 src/dynpmc/rational.pmc
  108. +2 −1  src/dynpmc/subproxy.pmc
  109. +9 −10 src/embed/api.c
  110. +5 −12 src/embed/strings.c
  111. +0 −1  src/events.c
  112. +39 −6 src/exceptions.c
  113. +2 −2 src/gc/alloc_resources.c
  114. +2 −1  src/gc/fixed_allocator.h
  115. +14 −14 src/gc/gc_gms.c
  116. +1 −1  src/gc/gc_ms.c
  117. +6 −6 src/gc/gc_ms2.c
  118. +2 −8 src/gc/mark_sweep.c
  119. +2 −1  src/gc/string_gc.c
  120. +2 −0  src/gc/system.c
  121. +7 −3 src/global_setup.c
  122. +10 −7 src/hash.c
  123. +6 −10 src/interp/api.c
  124. +19 −15 src/interp/inter_cb.c
  125. +8 −0 src/nci/libffi.c
  126. +7 −29 src/ops/core.ops
  127. +1,633 −1,742 src/ops/core_ops.c
  128. +2 −3 src/ops/experimental.ops
  129. +2 −15 src/ops/object.ops
  130. +16 −5 src/ops/pmc.ops
  131. +2 −2 src/ops/set.ops
  132. +1 −10 src/ops/string.ops
  133. +7 −5 src/packfile/api.c
  134. +0 −571 src/packfile/byteorder.h
  135. +4 −4 src/packfile/output.c
  136. +668 −12 src/packfile/pf_items.c
  137. +1 −100 src/packfile/pf_private.h
  138. +9 −5 src/packfile/segments.c
  139. +124 −9 src/platform/generic/dl.c
  140. +2 −1  src/platform/generic/socket.c
  141. +297 −0 src/pmc.c
  142. +6 −10 src/pmc/callcontext.pmc
  143. +1 −0  src/pmc/continuation.pmc
  144. +1 −6 src/pmc/coroutine.pmc
  145. +0 −277 src/pmc/default.pmc
  146. +1 −1  src/pmc/fixedbooleanarray.pmc
  147. +1 −1  src/pmc/fixedstringarray.pmc
  148. +15 −0 src/pmc/hashiterator.pmc
  149. +1 −1  src/pmc/imageiofreeze.pmc
  150. +1 −1  src/pmc/imccompiler.pmc
  151. +36 −1 src/pmc/lexpad.pmc
  152. +5 −2 src/pmc/managedstruct.pmc
  153. +1 −1  src/pmc/namespace.pmc
  154. +1 −1  src/pmc/nativepccmethod.pmc
  155. +1 −1  src/pmc/nci.pmc
  156. +9 −2 src/pmc/null.pmc
  157. +6 −1 src/pmc/orderedhashiterator.pmc
  158. +0 −2  src/pmc/parrotinterpreter.pmc
  159. +1 −1  src/pmc/parrotlibrary.pmc
  160. +6 −10 src/pmc/pmclist.pmc
  161. +4 −4 src/pmc/resizablebooleanarray.pmc
  162. +2 −2 src/pmc/resizablefloatarray.pmc
  163. +3 −3 src/pmc/resizableintegerarray.pmc
  164. +6 −6 src/pmc/resizablepmcarray.pmc
  165. +80 −22 src/pmc/stringbuilder.pmc
  166. +5 −3 src/pmc/structview.pmc
  167. +0 −9 src/pmc/sub.pmc
  168. +1 −1  src/pmc/undef.pmc
  169. +12 −14 src/pmc/unmanagedstruct.pmc
  170. +7 −6 src/pointer_array.c
  171. +0 −4 src/runcore/cores.c
  172. +0 −4 src/runcore/profiling.c
  173. +11 −14 src/runcore/subprof.c
  174. +4 −4 src/scheduler.c
  175. +2 −2 src/spf_render.c
  176. +29 −23 src/string/api.c
  177. +33 −6 src/string/encoding/shared.c
  178. +3 −1 src/string/encoding/utf8.c
  179. +0 −20 src/sub.c
  180. +0 −6 src/vtable.tbl
  181. +0 −1  t/benchmark/benchmarks.t
  182. +56 −0 t/codingstd/case_sensitive_files.t
  183. +1 −1  t/codingstd/cuddled_else.t
  184. +49 −1 t/compilers/imcc/syn/const.t
  185. +15 −1 t/compilers/imcc/syn/pcc.t
  186. +2 −2 t/compilers/opsc/03-past.t
  187. +2 −2 t/compilers/opsc/08-emitter.t
  188. +1 −1  t/dynpmc/foo-02.t
  189. BIN  t/native_pbc/annotations.pbc
  190. BIN  t/native_pbc/integer.pbc
  191. BIN  t/native_pbc/number.pbc
  192. BIN  t/native_pbc/number_4.pbc
  193. BIN  t/native_pbc/number_5.pbc
  194. BIN  t/native_pbc/string.pbc
  195. BIN  t/native_pbc/string_4.pbc
  196. BIN  t/native_pbc/string_5.pbc
  197. +25 −32 t/oo/objects.t
  198. +2 −2 t/op/gc.t
  199. +0 −3  t/op/stringu.t
  200. +1 −5 t/pmc/context.t
  201. +2 −2 t/pmc/freeze.t
  202. +28 −1 t/pmc/lexpad.t
  203. +1 −1  t/pmc/namespace.t
  204. +2 −26 t/pmc/object-meths.t
  205. +10 −10 t/pmc/prop.t
  206. +1 −1  t/pmc/timer.t
  207. +1 −0  t/src/checkdepend.t
  208. +1 −28 t/src/extend_vtable.t
  209. +14 −14 t/src/pointer_array.t
  210. +17 −39 t/steps/auto/icu-01.t
  211. +3 −1 tools/build/parrot_config_c.pl
  212. +3 −3 tools/dev/faces.pl
  213. +77 −0 tools/dev/new_changelog_skeleton.pl
  214. +8 −8 tools/dev/pbc_to_exe.pir
  215. +430 −0 tools/release/parrot_github_release.pl
  216. +7 −7 tools/release/release.json
  217. +1 −1  tools/release/update_version.pl
View
58 .travis.yml
@@ -1,33 +1,45 @@
+language: "perl"
+perl:
+# - "5.10"
+ - "5.14"
+install: "echo"
before_script:
- - sudo apt-get install libffi-dev libicu-dev libgmp3-dev clang llvm-dev liblocal-lib-perl zlib1g-dev gcc-multilib
- - curl -L http://cpanmin.us | sudo perl - --self-upgrade
- - export CI_USER=$USER
-# - env
- - mkdir ~/perl5 && perl -Mlocal::lib >> /tmp/local_lib_junk.sh && source /tmp/local_lib_junk.sh
- - sudo chown -R $CI_USER ~/.cpanm
- - sudo chown -R $CI_USER ~/perl5
+ - sudo apt-get install libffi-dev libicu-dev libgmp3-dev clang llvm-dev zlib1g-dev gcc-multilib
# No, we are not going to run the tests for all these dependencies on every commit
- - cpanm -n TAP::Harness::Archive TAP::Harness::ReportByDescription
-script: "perl Configure.pl --test=build $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
-# branches:
-# only:
-# - master
+ - cpanm -n LWP::UserAgent TAP::Harness::Archive TAP::Harness::ReportByDescription
+# This stuff used to be required, but was rolled into the Travis CI perl support.
+# - curl -L http://cpanmin.us | sudo perl - --self-upgrade
+# - export CI_USER=$USER
+# - mkdir ~/perl5 && perl -Mlocal::lib >> /tmp/local_lib_junk.sh && source /tmp/local_lib_junk.sh
+# - sudo chown -R $CI_USER ~/.cpanm
+# - sudo chown -R $CI_USER ~/perl5
+
+# Don't run Configure.pl tests, for now
+#script: "perl Configure.pl --test=build $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+script: "perl Configure.pl $PARROT_CONFIG_ARGS $PARROT_OPTIMIZE --cc=\"$CC\" --link=\"$CC\" --ld=\"$CC\" --ccflags='-g' ; make $PARROT_TEST"
+
+branches:
+ only:
+ - master
notifications:
recipients:
- - duke@leto.net
+ - parrot-ci@lists.parrot.org
email:
on_success: change
on_failure: always
irc:
+ channels:
- "irc.parrot.org#parrot"
-# - "irc.freenode.net#perl6"
+ on_success: change
+ on_failure: change
env:
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smolder_fulltest" CC="clang"
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="clang"
- - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="clang"
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smolder_fulltest" CC="gcc"
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="gcc"
- - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="gcc"
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smolder_fulltest" CC="g++"
- - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="g++"
- - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smolder_fulltest" CC="g++"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="clang"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="gcc"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="--optimize" PARROT_TEST="smoke" CC="g++"
+ - PARROT_CONFIG_ARGS="" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="g++"
+ - PARROT_CONFIG_ARGS="--without-gettext --without-gmp --without-libffi --without-extra-nci-thunks --without-opengl --without-readline --without-pcre --without-zlib --without-threads --without-icu" PARROT_OPTIMIZE="" PARROT_TEST="smoke" CC="g++"
View
3  CREDITS
@@ -78,6 +78,7 @@ U: allison
N: Alvis Yardley
D: Documentation Shepherd (3.9.0 - Present)
+D: Release manger for 4.1.0
E: ac.yardley@gmail.com
U: alvis
S: Ft. Worth, Texas
@@ -600,7 +601,7 @@ S: Ohio, USA
N: Jonathan "Duke" Leto
E: jonathan@leto.net
W: http://dukeleto.pl
-D: Release manager for 1.7.0, 3.9.0, GCI/GSoC Org Admin/Mentor
+D: Release manager for 1.7.0, 3.9.0,4.2.0 GCI/GSoC Org Admin/Mentor
U: dukeleto
A: leto
A: Duke Leto
View
69 ChangeLog
@@ -1,10 +1,71 @@
-2012-01-17 release 4.1.0
+2012-04-17 release 4.3.0
- Core
- + Shared libraries and installable binaries are now stripped if built with
- --optimize on Cygwin, which greatly reduces their size on disk
+ + Winxed snapshot updated to 1.7.0
+ + Add type introspection to lexical variables.
+ + New 'tools/release/parrot_github_release.pl' script to automate
+ updates to the 'parrot.github.com' and 'parrot-docsx' repositories.
+ + Numerous casting and consting fixes thanks to GCC 4.8 .
- Documentation
- + Revised 'docs/project/release_manager_guide.pod'
+ + Updated 'docs/projects/release_manager_guide.pod'
+ + Updated 'docs/projects/release_parrot_github_guide.pod'
+ + Improved function documentation.
- Tests
+ - Community
+ - Platforms
+ + Fixed alignment issues on ia64, sparc and mipsel.
+ + Fixed a platform-specific issue with dlclose().
+
+2012-03-20 release 4.2.0
+ - API Changes
+ + The signature of getprop was changed from (PMC,String,PMC) to
+ (PMC, PMC,String) for consistency
+ - Core
+ + Parrot Calling Conventions (pcc) now reuses Continuation PMCs
+ internally, which reduces GC work by 25% and improves
+ the fib.pir benchmark by 6%
+ + Winxed snapshot updated to 1.6.devel 44a04cfa7b
+ + Improved the detection of Clang-ish compilers during configuration
+ + Fixed a possible segfault bug when reading packfiles with no
+ constants or main_sub
+ + By default, Parrot has now elevated these GCC warnings to errors
+ during compile time:
+ implicit-function-declaration, undef, missing-braces,
+ nested externs, old-style-definition, strict-prototypes,
+ + The OS Dynamic PMC now has separate functions to unlink a file
+ and remove an empty directory (rmdir)
+ + Fix building on Cygwin due to an improperly named DLL file
+ + Various small bug fixes pointed out by static and dynamic analysis
+ tools
+ - Branches
+ + Work on M0 continues now in the m0 branch, which contains both
+ implementations (currently C and Perl) and specification.
+ + Good progress has been made on the threads branch which builds
+ on the green_threads branch. This gets Parrot much closer to
+ being able to utilize multiple CPU cores seemlessly. More details
+ at http://niner.name/Hybrid_Threads_for_the_Parrot_VM.pdf
+ - Documentation
+ + New release manager documentation for parrot.github.com :
+ http://git.io/parrot-github-guide
+ - Community
+ + Parrot was accepted to Google Summer of Code 2012!
+ Ideas Page: http://git.io/parrot-gsoc-2012
+
+2012-02-21 release 4.1.0
+ - Core
+ + Shared libraries and installable binaries are now stripped if
+ built with --optimize on Cygwin, which greatly reduces their
+ size on disk
+ + New experimental PCC-related ops added to core.
+ - Documentation
+ + Revised 'docs/project/release_manager_guide.pod'
+ - Tests
+ + Parrot now uses Travis CI http://travis-ci.org
+ + Parrot Continuous Integration (CI) with Travis CI means
+ every commit of Parrot is now compiled and tested on gcc,
+ g++ and clang with various Configure.pl options.
+ + CI Notifications are sent to parrot-dev, the #parrot
+ IRC channel and Smolder
+ + Cardinal and Rakudo spec tests also on Travis CI
2012-01-17 release 4.0.0
- Core
View
13 MANIFEST
@@ -393,6 +393,7 @@ docs/project/hacking_tips.pod [doc]
docs/project/merge_review_guidelines.pod [doc]
docs/project/metacommitter_guide.pod [doc]
docs/project/release_manager_guide.pod [doc]
+docs/project/release_parrot_github_guide.pod [doc]
docs/project/roles_responsibilities.pod [doc]
docs/project/support_policy.pod [doc]
docs/project/ticket_triaging.pod [doc]
@@ -475,10 +476,6 @@ examples/benchmarks/oo3.pir [examples]
examples/benchmarks/oo3.pl [examples]
examples/benchmarks/oo3.py [examples]
examples/benchmarks/oo3.rb [examples]
-examples/benchmarks/oo4.pasm [examples]
-examples/benchmarks/oo4.pl [examples]
-examples/benchmarks/oo4.py [examples]
-examples/benchmarks/oo4.rb [examples]
examples/benchmarks/oo5.pir [examples]
examples/benchmarks/oo5.pl [examples]
examples/benchmarks/oo5.py [examples]
@@ -1279,7 +1276,6 @@ src/ops/string.ops []
src/ops/sys.ops []
src/ops/var.ops []
src/packfile/api.c []
-src/packfile/byteorder.h []
src/packfile/object_serialization.c []
src/packfile/output.c []
src/packfile/pf_items.c []
@@ -1468,6 +1464,7 @@ t/codingstd/c_parens.t [test]
t/codingstd/c_returns.t [test]
t/codingstd/c_struct.t [test]
t/codingstd/c_todo.t [test]
+t/codingstd/case_sensitive_files.t [test]
t/codingstd/check_isxxx.t [test]
t/codingstd/check_toxxx.t [test]
t/codingstd/copyright.t [test]
@@ -1728,6 +1725,7 @@ t/manifest/03-regenerate_skip.t [test]
t/manifest/04-alt_file.t [test]
t/manifest/05-alt_skip.t [test]
t/manifest/README []doc
+t/native_pbc/annotations.pbc [test]
t/native_pbc/header.t [test]
t/native_pbc/integer.pbc [test]
t/native_pbc/integer.t [test]
@@ -1753,6 +1751,7 @@ t/native_pbc/string_1.pbc [test]
t/native_pbc/string_2.pbc [test]
t/native_pbc/string_3.pbc [test]
t/native_pbc/string_4.pbc [test]
+t/native_pbc/string_5.pbc [test]
t/native_pbc/string_6.pbc [test]
t/native_pbc/string_7.pbc [test]
t/native_pbc/testdata/README []doc
@@ -2160,6 +2159,7 @@ tools/dev/mk_rpm_manifests.pl []
tools/dev/nci_test_gen.pl []
tools/dev/nci_thunk_gen.pir []
tools/dev/ncidef2pir.pl []
+tools/dev/new_changelog_skeleton.pl []
tools/dev/nopaste.pl []
tools/dev/parrot-config.pir []
tools/dev/parrot.supp []
@@ -2188,8 +2188,8 @@ tools/dev/vgp_darwin []
tools/dev/vms-patch []
tools/dev/vtablize.pl []
tools/docs/filename_and_chapter.pl []
-tools/docs/mk_html_docs.pl []
tools/docs/mk_chm.pl []
+tools/docs/mk_html_docs.pl []
tools/docs/ops_summary.pl []
tools/install/smoke.pl []
tools/install/smoke_languages.pl []
@@ -2199,6 +2199,7 @@ tools/release/crow.pir []
tools/release/cut.pl []
tools/release/gen_release_info.pl []
tools/release/inc_ver.pir []
+tools/release/parrot_github_release.pl []
tools/release/release.json []
tools/release/releasecheck.pl []
tools/release/sha256sum.pl []
View
6 MANIFEST.generated
@@ -1,14 +1,14 @@
# See tools/dev/install_files.pl for documentation on the
# format of this file.
# Please re-sort this file after *EVERY* modification
-blib/lib/libparrot.4.0.0.dylib [main]lib
+blib/lib/libparrot.4.3.0.dylib [main]lib
blib/lib/libparrot.a [main]lib
blib/lib/libparrot.dylib [main]lib
blib/lib/libparrot.so [main]lib
-blib/lib/libparrot.so.4.0.0 [main]lib
+blib/lib/libparrot.so.4.3.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
-cygparrot4_0_0.dll [main]bin
+cygparrot-4.3.0.dll [main]bin
docs/ops/bit.pod [doc]
docs/ops/cmp.pod [doc]
docs/ops/core.pod [doc]
View
12 README
@@ -1,7 +1,7 @@
-This is Parrot, version 4.0.0
+This is Parrot, version 4.3.0
------------------------------
-Parrot is Copyright (C) 2001-2011, Parrot Foundation.
+Parrot is Copyright (C) 2001-2012, Parrot Foundation.
LICENSE INFORMATION
@@ -37,10 +37,14 @@ I. Install Git.
Linux:
The method depends on your distribution. To install you should execute (as root or sudo <cmd>):
-On Ubuntu/Debian (apt-based):
+On Ubuntu/Debian (old versions, apt-based):
apt-get install git-core
+On Ubuntu/Debian (new versions, apt-based):
+
+ apt-get install git
+
On Red Hat, Fedora (rpm-based):
yum install git
@@ -148,7 +152,7 @@ CHANGES
-------
For documentation on the user-visible changes between this version and
-previous versions, please see NEWS.
+previous versions, please see ChangeLog.
MAILING LISTS
-------------
View
5 RESPONSIBLE_PARTIES
@@ -16,9 +16,9 @@ Architect Christoph Otto
Product Manager Andrew Whitworth
-Project Manager
+Project Manager ENOBODY
-Community Manager Jonathan "Duke" Leto
+Community Ambassador Jonathan "Duke" Leto
Release Manager Bob Rogers
Patrick Michaud
@@ -37,6 +37,7 @@ Release Manager Bob Rogers
Tyler Curtis
James E Keenan
Kevin Polulak
+ Alvis Yardley
Metacommitter Allison Randal
Jerry Gay
View
2  VERSION
@@ -1 +1 @@
-4.0.0
+4.3.0
View
6 compilers/imcc/cfg.c
@@ -447,11 +447,11 @@ build_cfg(ARGMOD(imc_info_t *imcc), ARGMOD(IMC_Unit *unit))
/* Decouple unreachable blocks (not the first block, with no predecessors)
* from the CFG */
do {
- unsigned int i;
+ unsigned int j;
changes = 0;
- for (i = 1; i < unit->n_basic_blocks; i++) {
- Basic_block * const bb = unit->bb_list[i];
+ for (j = 1; j < unit->n_basic_blocks; j++) {
+ Basic_block * const bb = unit->bb_list[j];
if (!bb->pred_list) {
/* Remove all successor edges of block bb */
View
4 compilers/imcc/imcc.l
@@ -789,8 +789,10 @@ destroy_frame(struct macro_frame_t *frame, void *yyscanner)
if (frame->heredoc_rest) {
mem_sys_free(frame->heredoc_rest);
frame->heredoc_rest = NULL;
- } else
+ }
+ else {
ret = frame->s.line;
+ }
mem_sys_free(frame);
View
2  compilers/imcc/imcc.y
@@ -1019,7 +1019,7 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
/* TODO: This is very ugly and heavily nested. Can we avoid this? */
if (!STRING_equal(imcc->interp,
VTABLE_get_string(imcc->interp,
- VTABLE_getprop(imcc->interp, lib_pmc,
+ Parrot_pmc_getprop(imcc->interp, lib_pmc,
Parrot_str_new_constant(imcc->interp, "_type"))),
Parrot_str_new_constant(imcc->interp, "Ops")))
imcc_pbc_add_libdep(imcc, s);
View
4 compilers/imcc/imclexer.c
@@ -4987,8 +4987,10 @@ destroy_frame(struct macro_frame_t *frame, void *yyscanner)
if (frame->heredoc_rest) {
mem_sys_free(frame->heredoc_rest);
frame->heredoc_rest = NULL;
- } else
+ }
+ else {
ret = frame->s.line;
+ }
mem_sys_free(frame);
View
1,043 compilers/imcc/imcparser.c
@@ -9,13 +9,11 @@
*/
/* HEADERIZER HFILE: none */
/* HEADERIZER STOP */
+/* A Bison parser, made by GNU Bison 2.5. */
-/* A Bison parser, made by GNU Bison 2.4.1. */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,7 +55,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "2.5"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -78,7 +76,7 @@
/* Copy the first part of user declarations. */
-/* Line 189 of yacc.c */
+/* Line 268 of yacc.c */
#line 1 "compilers/imcc/imcc.y"
/*
@@ -1101,7 +1099,7 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
/* TODO: This is very ugly and heavily nested. Can we avoid this? */
if (!STRING_equal(imcc->interp,
VTABLE_get_string(imcc->interp,
- VTABLE_getprop(imcc->interp, lib_pmc,
+ Parrot_pmc_getprop(imcc->interp, lib_pmc,
Parrot_str_new_constant(imcc->interp, "_type"))),
Parrot_str_new_constant(imcc->interp, "Ops")))
imcc_pbc_add_libdep(imcc, s);
@@ -1111,8 +1109,8 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
-/* Line 189 of yacc.c */
-#line 1105 "compilers/imcc/imcparser.c"
+/* Line 268 of yacc.c */
+#line 1103 "compilers/imcc/imcparser.c"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -1382,7 +1380,7 @@ do_loadlib(ARGMOD(imc_info_t *imcc), ARGIN(const char *lib))
typedef union YYSTYPE
{
-/* Line 214 of yacc.c */
+/* Line 293 of yacc.c */
#line 1032 "compilers/imcc/imcc.y"
IdList * idlist;
@@ -1393,8 +1391,8 @@ typedef union YYSTYPE
-/* Line 214 of yacc.c */
-#line 1387 "compilers/imcc/imcparser.c"
+/* Line 293 of yacc.c */
+#line 1385 "compilers/imcc/imcparser.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -1405,8 +1403,8 @@ typedef union YYSTYPE
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 1399 "compilers/imcc/imcparser.c"
+/* Line 343 of yacc.c */
+#line 1397 "compilers/imcc/imcparser.c"
#ifdef short
# undef short
@@ -1456,7 +1454,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -1509,11 +1507,11 @@ YYID (yyi)
# define alloca _alloca
# else
# define YYSTACK_ALLOC alloca
-# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# endif
@@ -1536,24 +1534,24 @@ YYID (yyi)
# ifndef YYSTACK_ALLOC_MAXIMUM
# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
# endif
-# if (defined __cplusplus && ! defined _STDLIB_H \
+# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
&& (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-# ifndef _STDLIB_H
-# define _STDLIB_H 1
+# ifndef EXIT_SUCCESS
+# define EXIT_SUCCESS 0
# endif
# endif
# ifndef YYMALLOC
# define YYMALLOC malloc
-# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
# endif
# endif
# ifndef YYFREE
# define YYFREE free
-# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
void free (void *); /* INFRINGES ON USER NAME SPACE */
# endif
@@ -1582,23 +1580,7 @@ union yyalloc
((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
+ YYSTACK_GAP_MAXIMUM)
-/* Copy COUNT objects from FROM to TO. The source and destination do
- not overlap. */
-# ifndef YYCOPY
-# if defined __GNUC__ && 1 < __GNUC__
-# define YYCOPY(To, From, Count) \
- __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-# else
-# define YYCOPY(To, From, Count) \
- do \
- { \
- YYSIZE_T yyi; \
- for (yyi = 0; yyi < (Count); yyi++) \
- (To)[yyi] = (From)[yyi]; \
- } \
- while (YYID (0))
-# endif
-# endif
+# define YYCOPY_NEEDED 1
/* Relocate STACK from its old location to the new one. The
local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -1618,6 +1600,26 @@ union yyalloc
#endif
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from FROM to TO. The source and destination do
+ not overlap. */
+# ifndef YYCOPY
+# if defined __GNUC__ && 1 < __GNUC__
+# define YYCOPY(To, From, Count) \
+ __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+# else
+# define YYCOPY(To, From, Count) \
+ do \
+ { \
+ YYSIZE_T yyi; \
+ for (yyi = 0; yyi < (Count); yyi++) \
+ (To)[yyi] = (From)[yyi]; \
+ } \
+ while (YYID (0))
+# endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 31
/* YYLAST -- Last index in YYTABLE. */
@@ -2016,8 +2018,8 @@ static const yytype_uint8 yyr2[] =
1, 1, 1, 1, 1, 1, 1
};
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
- STATE-NUM when YYTABLE doesn't specify something else to do. Zero
+/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
+ Performed when YYTABLE doesn't specify something else to do. Zero
means the default is an error. */
static const yytype_uint16 yydefact[] =
{
@@ -2176,8 +2178,7 @@ static const yytype_int16 yypgoto[] =
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
positive, shift that token. If negative, reduce the rule which
- number is the opposite. If zero, do what YYDEFACT says.
- If YYTABLE_NINF, syntax error. */
+ number is the opposite. If YYTABLE_NINF, syntax error. */
#define YYTABLE_NINF -258
static const yytype_int16 yytable[] =
{
@@ -2249,6 +2250,12 @@ static const yytype_int16 yytable[] =
0, 0, 450, 0, 0, 0, 0, 122
};
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-426))
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
static const yytype_int16 yycheck[] =
{
78, 64, 131, 113, 222, 184, 344, 236, 433, 4,
@@ -2391,9 +2398,18 @@ static const yytype_uint16 yystos[] =
/* Like YYERROR except do call yyerror. This remains here temporarily
to ease the transition to the new meaning of YYERROR, for GCC.
- Once GCC version 2 has supplanted version 1, this can go. */
+ Once GCC version 2 has supplanted version 1, this can go. However,
+ YYFAIL appears to be in use. Nevertheless, it is formally deprecated
+ in Bison 2.4.2's NEWS entry, where a plan to phase it out is
+ discussed. */
#define YYFAIL goto yyerrlab
+#if defined YYFAIL
+ /* This is here to suppress warnings from the GCC cpp's
+ -Wunused-macros. Normally we don't worry about that warning, but
+ some users do, and we want to make it easy for users to remove
+ YYFAIL uses, which will produce warnings from Bison 2.5. */
+#endif
#define YYRECOVERING() (!!yyerrstatus)
@@ -2403,7 +2419,6 @@ do \
{ \
yychar = (Token); \
yylval = (Value); \
- yytoken = YYTRANSLATE (yychar); \
YYPOPSTACK (1); \
goto yybackup; \
} \
@@ -2445,19 +2460,10 @@ while (YYID (0))
#endif
-/* YY_LOCATION_PRINT -- Print the location on the stream.
- This macro was not mandated originally: define only if we know
- we won't break user code: when these are the locations we know. */
+/* This macro is provided for backward compatibility. */
#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
-# else
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
#endif
@@ -2657,7 +2663,6 @@ int yydebug;
# define YYMAXDEPTH 10000
#endif
-
#if YYERROR_VERBOSE
@@ -2760,115 +2765,142 @@ yytnamerr (char *yyres, const char *yystr)
}
# endif
-/* Copy into YYRESULT an error message about the unexpected token
- YYCHAR while in state YYSTATE. Return the number of bytes copied,
- including the terminating null byte. If YYRESULT is null, do not
- copy anything; just return the number of bytes that would be
- copied. As a special case, return 0 if an ordinary "syntax error"
- message will do. Return YYSIZE_MAXIMUM if overflow occurs during
- size calculation. */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
- int yyn = yypact[yystate];
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+ about the unexpected token YYTOKEN for the state stack whose top is
+ YYSSP.
- if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
- return 0;
- else
- {
- int yytype = YYTRANSLATE (yychar);
- YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
- YYSIZE_T yysize = yysize0;
- YYSIZE_T yysize1;
- int yysize_overflow = 0;
- enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
- char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
- int yyx;
-
-# if 0
- /* This is so xgettext sees the translatable formats that are
- constructed on the fly. */
- YY_("syntax error, unexpected %s");
- YY_("syntax error, unexpected %s, expecting %s");
- YY_("syntax error, unexpected %s, expecting %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s");
- YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
- char *yyfmt;
- char const *yyf;
- static char const yyunexpected[] = "syntax error, unexpected %s";
- static char const yyexpecting[] = ", expecting %s";
- static char const yyor[] = " or %s";
- char yyformat[sizeof yyunexpected
- + sizeof yyexpecting - 1
- + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
- * (sizeof yyor - 1))];
- char const *yyprefix = yyexpecting;
-
- /* Start YYX at -YYN if negative to avoid negative indexes in
- YYCHECK. */
- int yyxbegin = yyn < 0 ? -yyn : 0;
-
- /* Stay within bounds of both yycheck and yytname. */
- int yychecklim = YYLAST - yyn + 1;
- int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
- int yycount = 1;
-
- yyarg[0] = yytname[yytype];
- yyfmt = yystpcpy (yyformat, yyunexpected);
-
- for (yyx = yyxbegin; yyx < yyxend; ++yyx)
- if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
- {
- if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
- {
- yycount = 1;
- yysize = yysize0;
- yyformat[sizeof yyunexpected - 1] = '\0';
- break;
- }
- yyarg[yycount++] = yytname[yyx];
- yysize1 = yysize + yytnamerr (0, yytname[yyx]);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
- yyfmt = yystpcpy (yyfmt, yyprefix);
- yyprefix = yyor;
- }
+ Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is
+ not large enough to hold the message. In that case, also set
+ *YYMSG_ALLOC to the required number of bytes. Return 2 if the
+ required number of bytes is too large to store. */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+ yytype_int16 *yyssp, int yytoken)
+{
+ YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
+ YYSIZE_T yysize = yysize0;
+ YYSIZE_T yysize1;
+ enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+ /* Internationalized format string. */
+ const char *yyformat = 0;
+ /* Arguments of yyformat. */
+ char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+ /* Number of reported tokens (one for the "unexpected", one per
+ "expected"). */
+ int yycount = 0;
+
+ /* There are many possibilities here to consider:
+ - Assume YYFAIL is not used. It's too flawed to consider. See
+ <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
+ for details. YYERROR is fine as it does not invoke this
+ function.
+ - If this state is a consistent state with a default action, then
+ the only way this function was invoked is if the default action
+ is an error action. In that case, don't check for expected
+ tokens because there are none.
+ - The only way there can be no lookahead present (in yychar) is if
+ this state is a consistent state with a default action. Thus,
+ detecting the absence of a lookahead is sufficient to determine
+ that there is no unexpected or expected token to report. In that
+ case, just report a simple "syntax error".
+ - Don't assume there isn't a lookahead just because this state is a
+ consistent state with a default action. There might have been a
+ previous inconsistent state, consistent state with a non-default
+ action, or user semantic action that manipulated yychar.
+ - Of course, the expected token list depends on states to have
+ correct lookahead information, and it depends on the parser not
+ to perform extra reductions after fetching a lookahead from the
+ scanner and before detecting a syntax error. Thus, state merging
+ (from LALR or IELR) and default reductions corrupt the expected
+ token list. However, the list is correct for canonical LR with
+ one exception: it will still contain any token that will not be
+ accepted due to an error action in a later state.
+ */
+ if (yytoken != YYEMPTY)
+ {
+ int yyn = yypact[*yyssp];
+ yyarg[yycount++] = yytname[yytoken];
+ if (!yypact_value_is_default (yyn))
+ {
+ /* Start YYX at -YYN if negative to avoid negative indexes in
+ YYCHECK. In other words, skip the first -YYN actions for
+ this state because they are default actions. */
+ int yyxbegin = yyn < 0 ? -yyn : 0;
+ /* Stay within bounds of both yycheck and yytname. */
+ int yychecklim = YYLAST - yyn + 1;
+ int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+ int yyx;
+
+ for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+ if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+ && !yytable_value_is_error (yytable[yyx + yyn]))
+ {
+ if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+ {
+ yycount = 1;
+ yysize = yysize0;
+ break;
+ }
+ yyarg[yycount++] = yytname[yyx];
+ yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+ if (! (yysize <= yysize1
+ && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
+ }
+ }
+ }
- yyf = YY_(yyformat);
- yysize1 = yysize + yystrlen (yyf);
- yysize_overflow |= (yysize1 < yysize);
- yysize = yysize1;
+ switch (yycount)
+ {
+# define YYCASE_(N, S) \
+ case N: \
+ yyformat = S; \
+ break
+ YYCASE_(0, YY_("syntax error"));
+ YYCASE_(1, YY_("syntax error, unexpected %s"));
+ YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+ YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+ YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+ YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+ }
- if (yysize_overflow)
- return YYSIZE_MAXIMUM;
+ yysize1 = yysize + yystrlen (yyformat);
+ if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ return 2;
+ yysize = yysize1;
- if (yyresult)
- {
- /* Avoid sprintf, as that infringes on the user's name space.
- Don't have undefined behavior even if the translation
- produced a string with the wrong number of "%s"s. */
- char *yyp = yyresult;
- int yyi = 0;
- while ((*yyp = *yyf) != '\0')
- {
- if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
- {
- yyp += yytnamerr (yyp, yyarg[yyi++]);
- yyf += 2;
- }
- else
- {
- yyp++;
- yyf++;
- }
- }
- }
- return yysize;
+ if (*yymsg_alloc < yysize)
+ {
+ *yymsg_alloc = 2 * yysize;
+ if (! (yysize <= *yymsg_alloc
+ && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+ *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+ return 1;
}
+
+ /* Avoid sprintf, as that infringes on the user's name space.
+ Don't have undefined behavior even if the translation
+ produced a string with the wrong number of "%s"s. */
+ {
+ char *yyp = *yymsg;
+ int yyi = 0;
+ while ((*yyp = *yyformat) != '\0')
+ if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+ {
+ yyp += yytnamerr (yyp, yyarg[yyi++]);
+ yyformat += 2;
+ }
+ else
+ {
+ yyp++;
+ yyformat++;
+ }
+ }
+ return 0;
}
#endif /* YYERROR_VERBOSE */
-
/*-----------------------------------------------.
| Release the memory associated to this symbol. |
@@ -2905,6 +2937,7 @@ yydestruct (yymsg, yytype, yyvaluep, yyscanner, imcc)
}
}
+
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
@@ -2921,12 +2954,9 @@ int yyparse ();
#endif /* ! YYPARSE_PARAM */
-
-
-
-/*-------------------------.
-| yyparse or yypush_parse. |
-`-------------------------*/
+/*----------.
+| yyparse. |
+`----------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -3114,7 +3144,7 @@ YYSTYPE yylval;
/* First try to decide what to do without reference to lookahead token. */
yyn = yypact[yystate];
- if (yyn == YYPACT_NINF)
+ if (yypact_value_is_default (yyn))
goto yydefault;
/* Not known => get a lookahead token if don't already have one. */
@@ -3145,8 +3175,8 @@ YYSTYPE yylval;
yyn = yytable[yyn];
if (yyn <= 0)
{
- if (yyn == 0 || yyn == YYTABLE_NINF)
- goto yyerrlab;
+ if (yytable_value_is_error (yyn))
+ goto yyerrlab;
yyn = -yyn;
goto yyreduce;
}
@@ -3201,28 +3231,28 @@ YYSTYPE yylval;
{
case 2:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1123 "compilers/imcc/imcc.y"
{ if (yynerrs) YYABORT; (yyval.i) = 0; }
break;
case 5:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1132 "compilers/imcc/imcc.y"
{ (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 6:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1133 "compilers/imcc/imcc.y"
{ (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 7:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1135 "compilers/imcc/imcc.y"
{
(yyval.i) = (yyvsp[(1) - (1)].i);
@@ -3233,7 +3263,7 @@ YYSTYPE yylval;
case 8:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1141 "compilers/imcc/imcc.y"
{
(yyval.i) = (yyvsp[(1) - (1)].i);
@@ -3244,42 +3274,42 @@ YYSTYPE yylval;
case 9:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1146 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 10:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1147 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 11:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1148 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 12:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1149 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 13:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1153 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 14:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1155 "compilers/imcc/imcc.y"
{
(yyval.i) = 0;
@@ -3290,7 +3320,7 @@ YYSTYPE yylval;
case 15:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1164 "compilers/imcc/imcc.y"
{
imcc->line = atoi((yyvsp[(2) - (5)].s));
@@ -3301,7 +3331,7 @@ YYSTYPE yylval;
case 16:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1170 "compilers/imcc/imcc.y"
{
/* set_filename() frees the STRINGC */
@@ -3311,7 +3341,7 @@ YYSTYPE yylval;
case 17:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1178 "compilers/imcc/imcc.y"
{
/* We'll want to store an entry while emitting instructions, so just
@@ -3324,7 +3354,7 @@ YYSTYPE yylval;
case 18:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1190 "compilers/imcc/imcc.y"
{
STRING * const hll_name = Parrot_str_unescape(imcc->interp, (yyvsp[(2) - (2)].s) + 1, '"', NULL);
@@ -3339,14 +3369,14 @@ YYSTYPE yylval;
case 19:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1202 "compilers/imcc/imcc.y"
{ imcc->is_def = 1; }
break;
case 20:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1203 "compilers/imcc/imcc.y"
{
mk_const_ident(imcc, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
@@ -3357,14 +3387,14 @@ YYSTYPE yylval;
case 21:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1211 "compilers/imcc/imcc.y"
{ imcc->is_def = 1; }
break;
case 22:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1212 "compilers/imcc/imcc.y"
{
(yyval.i) = mk_pmc_const_named(imcc, imcc->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
@@ -3376,49 +3406,49 @@ YYSTYPE yylval;
case 27:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1230 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 28:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1231 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 29:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1232 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 30:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1233 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; }
break;
case 31:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1234 "compilers/imcc/imcc.y"
{ (yyval.i) = (yyvsp[(1) - (1)].i); }
break;
case 34:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1239 "compilers/imcc/imcc.y"
{ clear_state(imcc); }
break;
case 35:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1241 "compilers/imcc/imcc.y"
{
(yyval.i) = INS(imcc, imcc->cur_unit, (yyvsp[(2) - (3)].s), 0, imcc->regs,
@@ -3429,7 +3459,7 @@ YYSTYPE yylval;
case 36:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1247 "compilers/imcc/imcc.y"
{
imc_close_unit(imcc, imcc->cur_unit);
@@ -3439,7 +3469,7 @@ YYSTYPE yylval;
case 37:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1252 "compilers/imcc/imcc.y"
{
(yyval.i) = iSUBROUTINE(imcc, imcc->cur_unit, mk_sub_label(imcc, (yyvsp[(4) - (4)].s)));
@@ -3450,7 +3480,7 @@ YYSTYPE yylval;
case 38:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1258 "compilers/imcc/imcc.y"
{
(yyval.i) = MK_I(imcc, imcc->cur_unit, "null", 1, (yyvsp[(2) - (2)].sr));
@@ -3459,7 +3489,7 @@ YYSTYPE yylval;
case 39:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1262 "compilers/imcc/imcc.y"
{
char *name = mem_sys_strdup((yyvsp[(2) - (4)].s) + 1);
@@ -3477,21 +3507,21 @@ YYSTYPE yylval;
case 40:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1274 "compilers/imcc/imcc.y"
{ (yyval.i) = 0;}
break;
case 42:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1282 "compilers/imcc/imcc.y"
{ imcc->cur_unit = imc_open_unit(imcc, IMC_PASM); }
break;
case 43:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1285 "compilers/imcc/imcc.y"
{
/* if (optimizer_level & OPT_PASM)
@@ -3504,7 +3534,7 @@ YYSTYPE yylval;
case 46:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1301 "compilers/imcc/imcc.y"
{
int re_open = 0;
@@ -3521,21 +3551,21 @@ YYSTYPE yylval;
case 47:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1315 "compilers/imcc/imcc.y"
{ (yyval.sr) = (yyvsp[(2) - (3)].sr); }
break;
case 48:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1316 "compilers/imcc/imcc.y"
{ (yyval.sr) = NULL; }
break;
case 49:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1320 "compilers/imcc/imcc.y"
{
imcc->nkeys = 0;
@@ -3544,7 +3574,7 @@ YYSTYPE yylval;
case 50:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1324 "compilers/imcc/imcc.y"
{
(yyval.sr) = link_keys(imcc, imcc->nkeys, imcc->keys, 0);
@@ -3553,14 +3583,14 @@ YYSTYPE yylval;
case 51:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1330 "compilers/imcc/imcc.y"
{ imcc->keys[imcc->nkeys++] = (yyvsp[(1) - (1)].sr); }
break;
case 52:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1332 "compilers/imcc/imcc.y"
{
imcc->keys[imcc->nkeys++] = (yyvsp[(3) - (3)].sr);
@@ -3570,7 +3600,7 @@ YYSTYPE yylval;
case 53:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1340 "compilers/imcc/imcc.y"
{
imcc->cur_unit = imc_open_unit(imcc, IMC_PCCSUB);
@@ -3579,7 +3609,7 @@ YYSTYPE yylval;
case 54:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1344 "compilers/imcc/imcc.y"
{
iSUBROUTINE(imcc, imcc->cur_unit, (yyvsp[(3) - (3)].sr));
@@ -3588,7 +3618,7 @@ YYSTYPE yylval;
case 55:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1348 "compilers/imcc/imcc.y"
{
imcc->cur_call->pcc_sub->pragma = (yyvsp[(5) - (6)].t);
@@ -3601,21 +3631,21 @@ YYSTYPE yylval;
case 56:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1355 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; imcc->cur_call = NULL; }
break;
case 57:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1360 "compilers/imcc/imcc.y"
{ imcc->is_def = 1; }
break;
case 58:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1362 "compilers/imcc/imcc.y"
{
if (/* IMCC_INFO(interp)->cur_unit->last_ins->op
@@ -3644,14 +3674,14 @@ YYSTYPE yylval;
case 59:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1385 "compilers/imcc/imcc.y"
{ imcc->is_def = 0; }
break;
case 60:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1390 "compilers/imcc/imcc.y"
{
if ((yyvsp[(3) - (3)].t) & VT_OPT_FLAG && (yyvsp[(1) - (3)].t) != 'I') {
@@ -3676,14 +3706,14 @@ YYSTYPE yylval;
case 61:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1414 "compilers/imcc/imcc.y"
{ (yyval.t) = 0; }
break;
case 62:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1419 "compilers/imcc/imcc.y"
{
add_pcc_multi(imcc, imcc->cur_call, NULL);
@@ -3692,7 +3722,7 @@ YYSTYPE yylval;
case 63:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1423 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3702,7 +3732,7 @@ YYSTYPE yylval;
case 64:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1428 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3712,35 +3742,35 @@ YYSTYPE yylval;
case 65:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1435 "compilers/imcc/imcc.y"
{ (yyval.sr) = mk_const(imcc, "INTVAL", 'S'); }
break;
case 66:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1436 "compilers/imcc/imcc.y"
{ (yyval.sr) = mk_const(imcc, "FLOATVAL", 'S'); }
break;
case 67:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1437 "compilers/imcc/imcc.y"
{ (yyval.sr) = mk_const(imcc, "PMC", 'S'); }
break;
case 68:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1438 "compilers/imcc/imcc.y"
{ (yyval.sr) = mk_const(imcc, "STRING", 'S'); }
break;
case 69:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1440 "compilers/imcc/imcc.y"
{
SymReg *r;
@@ -3756,7 +3786,7 @@ YYSTYPE yylval;
case 70:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1451 "compilers/imcc/imcc.y"
{
SymReg *r;
@@ -3772,21 +3802,21 @@ YYSTYPE yylval;
case 71:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1461 "compilers/imcc/imcc.y"
{ (yyval.sr) = (yyvsp[(2) - (3)].sr); }
break;
case 72:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1466 "compilers/imcc/imcc.y"
{ (yyval.t) = 0; }
break;
case 73:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1471 "compilers/imcc/imcc.y"
{
SymReg * const r = mk_const(imcc, (yyvsp[(3) - (3)].s), 'S');
@@ -3798,7 +3828,7 @@ YYSTYPE yylval;
case 74:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1478 "compilers/imcc/imcc.y"
{
SymReg * const r = mk_const(imcc, (yyvsp[(1) - (1)].s), 'S');
@@ -3810,7 +3840,7 @@ YYSTYPE yylval;
case 75:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1489 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3821,7 +3851,7 @@ YYSTYPE yylval;
case 76:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1495 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3832,7 +3862,7 @@ YYSTYPE yylval;
case 77:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1504 "compilers/imcc/imcc.y"
{
(yyval.t) = P_VTABLE;
@@ -3843,7 +3873,7 @@ YYSTYPE yylval;
case 78:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1510 "compilers/imcc/imcc.y"
{
(yyval.t) = P_VTABLE;
@@ -3854,7 +3884,7 @@ YYSTYPE yylval;
case 79:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1519 "compilers/imcc/imcc.y"
{
(yyval.t) = P_METHOD;
@@ -3865,7 +3895,7 @@ YYSTYPE yylval;
case 80:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1525 "compilers/imcc/imcc.y"
{
(yyval.t) = P_METHOD;
@@ -3876,7 +3906,7 @@ YYSTYPE yylval;
case 81:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1534 "compilers/imcc/imcc.y"
{
(yyval.t) = P_NSENTRY;
@@ -3887,7 +3917,7 @@ YYSTYPE yylval;
case 82:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1540 "compilers/imcc/imcc.y"
{
(yyval.t) = P_NSENTRY;
@@ -3898,7 +3928,7 @@ YYSTYPE yylval;
case 83:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1549 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3908,7 +3938,7 @@ YYSTYPE yylval;
case 84:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1557 "compilers/imcc/imcc.y"
{
(yyval.t) = 0;
@@ -3918,7 +3948,7 @@ YYSTYPE yylval;
case 85:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1562 "compilers/imcc/imcc.y"
{
SymReg *r = mk_const(imcc, (yyvsp[(3) - (4)].s), 'S');
@@ -3931,7 +3961,7 @@ YYSTYPE yylval;
case 88:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1578 "compilers/imcc/imcc.y"
{
char name[128];
@@ -3953,63 +3983,63 @@ YYSTYPE yylval;
case 89:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1599 "compilers/imcc/imcc.y"
{ (yyval.i) = 0; imcc->cur_call = NULL; }
break;
case 90:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1603 "compilers/imcc/imcc.y"
{ (yyval.i) = NULL; imcc->cur_call->pcc_sub->label = 0; }
break;
case 91:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1604 "compilers/imcc/imcc.y"
{ (yyval.i) = NULL; imcc->cur_call->pcc_sub->label = 1; }
break;
case 92:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1608 "compilers/imcc/imcc.y"
{ (yyval.i) = NULL; }
break;
case 93:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1609 "compilers/imcc/imcc.y"
{ (yyval.i) = NULL; imcc->cur_call->pcc_sub->object = (yyvsp[(2) - (3)].sr); }
break;
case 94:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1613 "compilers/imcc/imcc.y"
{ (yyval.t) = 0; }
break;
case 96:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1618 "compilers/imcc/imcc.y"
{ (yyval.t) = (yyvsp[(1) - (1)].t); }
break;
case 97:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1619 "compilers/imcc/imcc.y"
{ (yyval.t) = (yyvsp[(1) - (2)].t) | (yyvsp[(2) - (2)].t); }
break;
case 98:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1623 "compilers/imcc/imcc.y"
{
(yyval.t) = P_LOAD;
@@ -4023,7 +4053,7 @@ YYSTYPE yylval;
case 99:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1631 "compilers/imcc/imcc.y"
{
(yyval.t) = P_INIT;
@@ -4037,49 +4067,49 @@ YYSTYPE yylval;
case 100:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1639 "compilers/imcc/imcc.y"
{ (yyval.t) = P_MAIN; }
break;
case 101:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1640 "compilers/imcc/imcc.y"
{ (yyval.t) = P_IMMEDIATE; }
break;
case 102:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1641 "compilers/imcc/imcc.y"
{ (yyval.t) = P_POSTCOMP; }
break;
case 103:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1642 "compilers/imcc/imcc.y"
{ (yyval.t) = P_ANON; }
break;
case 104:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1643 "compilers/imcc/imcc.y"
{ (yyval.t) = P_NEED_LEX; }
break;
case 111:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1650 "compilers/imcc/imcc.y"
{ (yyval.t) = P_MANUAL_ARGS; }
break;
case 114:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1657 "compilers/imcc/imcc.y"
{
add_pcc_sub(imcc->cur_call, (yyvsp[(2) - (5)].sr));
@@ -4089,7 +4119,7 @@ YYSTYPE yylval;
case 115:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1662 "compilers/imcc/imcc.y"
{
add_pcc_sub(imcc->cur_call, (yyvsp[(2) - (3)].sr));
@@ -4098,14 +4128,14 @@ YYSTYPE yylval;
case 116:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1668 "compilers/imcc/imcc.y"
{ (yyval.sr) = 0; }
break;
case 117:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1670 "compilers/imcc/imcc.y"
{
if (imcc->adv_named_id) {
@@ -4120,21 +4150,21 @@ YYSTYPE yylval;
case 118:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1682 "compilers/imcc/imcc.y"
{ (yyval.sr) = (yyvsp[(2) - (2)].sr); }
break;
case 119:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1687 "compilers/imcc/imcc.y"
{ (yyval.sr) = 0; }
break;
case 120:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1689 "compilers/imcc/imcc.y"
{
if ((yyvsp[(2) - (3)].sr))
@@ -4144,21 +4174,21 @@ YYSTYPE yylval;
case 121:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1696 "compilers/imcc/imcc.y"
{ (yyval.sr) = (yyvsp[(2) - (3)].sr); (yyval.sr)->type |= (yyvsp[(3) - (3)].t); }
break;
case 122:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1697 "compilers/imcc/imcc.y"
{ imcc->is_def = 1; }
break;
case 123:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1698 "compilers/imcc/imcc.y"
{
IdList * const l = (yyvsp[(4) - (4)].idlist);
@@ -4172,84 +4202,84 @@ YYSTYPE yylval;
case 124:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1709 "compilers/imcc/imcc.y"
{ (yyval.t) = 0; }
break;
case 125:
-/* Line 1455 of yacc.c */
+/* Line 1806 of yacc.c */
#line 1710 "compilers/imcc/imcc.y"
{ (yyval.t) = (yyvsp[(1) - (2)].