Permalink
Browse files

Update to master, fixing conflicts

  • Loading branch information...
2 parents 23cc86f + fab1ffb commit 3fa25828dd0106b297db41d632ff5aaaaee83afa @Whiteknight Whiteknight committed May 19, 2012
Showing with 12,994 additions and 10,898 deletions.
  1. +2 −1 CREDITS
  2. +26 −0 ChangeLog
  3. +40 −31 MANIFEST
  4. +3 −3 MANIFEST.generated
  5. +0 −181 README
  6. +194 −0 README.pod
  7. +1 −1 RESPONSIBLE_PARTIES
  8. +1 −1 VERSION
  9. +20 −4 api.yaml
  10. +37 −0 compilers/README.pod
  11. +5 −4 compilers/imcc/imc.h
  12. +2 −9 compilers/imcc/imcc.l
  13. +1 −17 compilers/imcc/imcc.y
  14. +1,517 −1,959 compilers/imcc/imclexer.c
  15. +1,899 −1,901 compilers/imcc/imcparser.c
  16. +224 −230 compilers/imcc/imcparser.h
  17. +1 −4 compilers/imcc/main.c
  18. +5 −14 compilers/imcc/pbc.c
  19. +2 −4 compilers/imcc/symreg.c
  20. +2 −1 compilers/opsc/src/Ops/File.pm
  21. +17 −1 compilers/opsc/src/Ops/Op.pm
  22. +10 −15 compilers/pct/src/PCT/HLLCompiler.pir
  23. +12 −3 compilers/tge/{README → README.pod}
  24. +18 −0 config/README.pod
  25. +4 −1 config/auto/icu.pm
  26. +1 −0 config/gen/makefiles/root.in
  27. +230 −0 docs/README.pod
  28. +24 −0 docs/binaries/README.pod
  29. +3 −0 docs/binaries/parrot.pod
  30. +0 −24 docs/book/draft/README
  31. +62 −0 docs/book/draft/README.pod
  32. +2 −2 docs/book/draft/appb_patch_submission.pod
  33. +2 −2 docs/compiler_faq.pod
  34. +1 −3 docs/embed.pod
  35. +8 −8 docs/gettingstarted.pod
  36. +0 −15 docs/glossary.pod
  37. +0 −76 docs/imcc/README
  38. +124 −0 docs/imcc/README.pod
  39. +26 −0 docs/index/book.json
  40. +1 −0 docs/index/developer.json
  41. +6 −0 docs/index/index.json
  42. +0 −14 docs/parrot.pod
  43. +1 −0 docs/parrothist.pod
  44. +2 −2 docs/pdds/draft/pdd11_extending.pod
  45. +4 −3 docs/pdds/pdd07_codingstd.pod
  46. +7 −9 docs/pdds/{draft → }/pdd31_hll.pod
  47. +1 −1 docs/project/debian_packaging_guide.pod
  48. +49 −47 docs/project/release_manager_guide.pod
  49. +1 −3 docs/project/release_parrot_github_guide.pod
  50. +0 −40 examples/README
  51. +68 −0 examples/README.pod
  52. +3 −3 examples/benchmarks/oo1.pir
  53. +3 −3 examples/benchmarks/oo2.pir
  54. +3 −3 examples/benchmarks/oo3.pir
  55. +0 −43 examples/benchmarks/oo4.pasm
  56. +0 −29 examples/benchmarks/oo4.pl
  57. +0 −14 examples/benchmarks/oo4.py
  58. +0 −19 examples/benchmarks/oo4.rb
  59. +3 −1 examples/embed/cotorra.c
  60. +0 −10 examples/mops/README
  61. +34 −0 examples/mops/README.pod
  62. +0 −4 examples/sdl/minesweeper/README
  63. +23 −0 examples/sdl/minesweeper/README.pod
  64. +0 −4 examples/sdl/tetris/README
  65. +24 −0 examples/sdl/tetris/README.pod
  66. +0 −15 examples/shootout/README
  67. +37 −0 examples/shootout/README.pod
  68. +0 −2 examples/tge/README
  69. +18 −0 examples/tge/README.pod
  70. +32 −0 ext/README.pod
  71. +0 −24 ext/winxed/README
  72. +49 −0 ext/winxed/README.pod
  73. +1 −1 ext/winxed/Rules.mak
  74. +3,950 −3,188 ext/winxed/compiler.pir
  75. +133 −94 ext/winxed/driver.pir
  76. +32 −0 frontend/README.pod
  77. +0 −3 frontend/parrot2/main.c
  78. +3 −1 frontend/parrot2/prt0.pir
  79. +5 −18 frontend/parrot_debugger/main.c
  80. +1 −1 frontend/pbc_disassemble/main.c
  81. +195 −32 frontend/pbc_merge/main.c
  82. +18 −0 include/README.pod
  83. +21 −0 include/parrot/api.h
  84. +8 −0 include/parrot/call.h
  85. +8 −0 include/parrot/compiler.h
  86. +0 −23 include/parrot/context.h
  87. +1 −1 include/parrot/datatypes.h
  88. +8 −20 include/parrot/exceptions.h
  89. +48 −4 include/parrot/exit.h
  90. +0 −4 include/parrot/extend.h
  91. +0 −1 include/parrot/gc_api.h
  92. +10 −9 include/parrot/hash.h
  93. +6 −1 include/parrot/interpreter.h
  94. +20 −0 include/parrot/key.h
  95. +13 −1 include/parrot/oplib/core_ops.h
  96. +255 −243 include/parrot/oplib/ops.h
  97. +255 −243 include/parrot/opsenum.h
  98. +26 −11 include/parrot/packfile.h
  99. +2 −2 include/parrot/pmc_freeze.h
  100. +14 −0 include/parrot/string_funcs.h
  101. +18 −4 lib/Parrot/Distribution.pm
  102. +1 −1 lib/Parrot/Docs/Section/Info.pm
  103. +6 −3 lib/Parrot/Headerizer.pm
  104. +1 −1 lib/Parrot/Manifest.pm
  105. +19 −0 lib/README.pod
  106. +16 −0 ports/ubuntu/{README → README.pod}
  107. +20 −0 runtime/README.pod
  108. +0 −2 runtime/parrot/dynext/README
  109. +17 −0 runtime/parrot/dynext/README.pod
  110. +0 −10 runtime/parrot/include/README
  111. +39 −0 runtime/parrot/include/README.pod
  112. +0 −12 runtime/parrot/library/PCT/README
  113. +27 −0 runtime/parrot/library/PCT/README.pod
  114. +0 −1 runtime/parrot/library/Stream/Writer.pir
  115. +35 −35 runtime/parrot/library/distutils.pir
  116. +0 −33 runtime/parrot/library/osutils.pir
  117. +18 −0 src/README.pod
  118. +8 −13 src/alarm.c
  119. +1 −4 src/call/args.c
  120. +29 −1 src/call/context.c
  121. +0 −32 src/call/context_accessors.c
  122. +3 −3 src/call/ops.c
  123. +20 −0 src/call/pcc.c
  124. +1 −1 src/datatypes.c
  125. +4 −4 src/dynext.c
  126. +0 −8 src/dynoplibs/README
  127. +27 −0 src/dynoplibs/README.pod
  128. +46 −46 src/dynoplibs/bit.ops
  129. +5 −5 src/dynoplibs/math.ops
  130. +5 −5 src/dynoplibs/trans.ops
  131. +8 −7 src/dynpmc/README.pod
  132. +1 −2 src/embed/api.c
  133. +58 −0 src/embed/pmc.c
  134. +5 −12 src/embed/strings.c
  135. +42 −110 src/exceptions.c
  136. +125 −20 src/exit.c
  137. +3 −21 src/extend.c
  138. +2 −2 src/gc/alloc_memory.c
  139. +1 −1 src/gc/api.c
  140. +2 −3 src/gc/fixed_allocator.c
  141. +1 −1 src/gc/gc_gms.c
  142. +3 −3 src/gc/gc_inf.c
  143. +1 −1 src/gc/gc_ms.c
  144. +1 −1 src/gc/gc_ms2.c
  145. +1 −2 src/gc/mark_sweep.c
  146. +16 −18 src/gc/string_gc.c
  147. +2 −0 src/gc/system.c
  148. +2 −1 src/hash.c
  149. +0 −4 src/interp/api.c
  150. +3 −3 src/interp/inter_cb.c
  151. +1 −1 src/io/api.c
  152. +15 −15 src/key.c
  153. +0 −2 src/namespace.c
  154. +12 −12 src/ops/bit.ops
  155. +72 −72 src/ops/cmp.ops
  156. +8 −30 src/ops/core.ops
  157. +749 −629 src/ops/core_ops.c
  158. +7 −9 src/ops/experimental.ops
  159. +86 −86 src/ops/math.ops
  160. +2 −14 src/ops/object.ops
  161. +1 −1 src/ops/pmc.ops
  162. +45 −45 src/ops/set.ops
  163. +45 −29 src/ops/string.ops
  164. +1 −1 src/ops/var.ops
  165. +39 −3 src/packfile/api.c
  166. +2 −2 src/packfile/output.c
  167. +12 −12 src/packfile/pf_items.c
  168. +7 −7 src/platform/generic/exec.c
  169. +2 −1 src/platform/win32/env.c
  170. +10 −6 src/pmc/alarm.pmc
  171. +65 −1 src/pmc/bigint.pmc
  172. +28 −12 src/pmc/callcontext.pmc
  173. +10 −0 src/pmc/class.pmc
  174. +6 −0 src/pmc/complex.pmc
  175. +37 −2 src/pmc/continuation.pmc
  176. +0 −1 src/pmc/coroutine.pmc
  177. +0 −16 src/pmc/default.pmc
  178. +34 −0 src/pmc/exceptionhandler.pmc
  179. +5 −6 src/pmc/hash.pmc
  180. +91 −3 src/pmc/key.pmc
  181. +47 −3 src/pmc/lexpad.pmc
  182. +18 −4 src/pmc/namespace.pmc
  183. +8 −20 src/pmc/object.pmc
  184. +6 −1 src/pmc/orderedhashiterator.pmc
  185. +8 −14 src/pmc/pmclist.pmc
  186. +1 −3 src/pmc/scheduler.pmc
  187. +6 −17 src/pmc/string.pmc
  188. +5 −3 src/pmc/structview.pmc
  189. +0 −4 src/pmc/sub.pmc
  190. +2 −2 src/runcore/profiling.c
  191. +1 −1 src/scheduler.c
  192. +40 −8 src/string/api.c
  193. +1 −1 src/string/encoding.c
  194. +33 −6 src/string/encoding/shared.c
  195. +0 −2 src/vtable.tbl
  196. +0 −3 t/archive/README
  197. +17 −0 t/archive/README.pod
  198. +0 −1 t/benchmark/benchmarks.t
  199. +15 −6 t/codingstd/c_function_docs.t
  200. +56 −0 t/codingstd/case_sensitive_files.t
  201. +2 −5 t/codingstd/pmc_docs.t
  202. +1 −21 t/compilers/imcc/syn/clash.t
  203. +0 −2 t/compilers/imcc/syn/tail.t
  204. +3 −3 t/compilers/opsc/01-parse-body.t
  205. +5 −2 t/compilers/opsc/04-op.t
  206. +1 −33 t/dynoplibs/debug.t
  207. +6 −28 t/dynoplibs/io.t
  208. +54 −31 t/dynpmc/gziphandle.t
  209. +6 −6 t/dynpmc/select.t
  210. +1 −10 t/library/osutils.t
  211. +16 −2 t/manifest/{README → README.pod}
  212. +0 −1 t/native_pbc/testdata/README
  213. +17 −0 t/native_pbc/testdata/README.pod
  214. +25 −32 t/oo/objects.t
  215. +0 −3 t/op/stringu.t
  216. +0 −6 t/perl/README
  217. +22 −0 t/perl/README.pod
  218. +1 −5 t/pmc/context.t
  219. +22 −20 t/pmc/filehandle.t
  220. +26 −1 t/pmc/lexpad.t
  221. +1 −1 t/pmc/namespace.t
  222. +1 −25 t/pmc/object-meths.t
  223. +10 −9 t/pmc/parrotio.t
  224. +2 −2 t/pmc/string.t
  225. +20 −18 t/pmc/stringhandle.t
  226. +1 −1 t/pmc/timer.t
  227. +0 −4 t/run/README
  228. +18 −0 t/run/README.pod
  229. +0 −5 t/src/README
  230. +19 −0 t/src/README.pod
  231. +2 −15 t/src/basic.t
  232. +90 −5 t/src/embed/pmc.t
  233. +5 −55 t/src/extend.t
  234. +1 −17 t/src/extend_vtable.t
  235. +17 −45 t/steps/auto/icu-01.t
  236. +5 −5 t/tools/dev/search_ops/samples.pm
  237. +13 −13 t/tools/install/02-install_files.t
  238. +0 −146 t/tools/install/testlib/README
  239. +184 −0 t/tools/install/testlib/README.pod
  240. +20 −6 t/tools/pmc2cutils/{README → README.pod}
  241. +49 −0 tools/README.pod
  242. +16 −2 tools/build/{README → README.pod}
  243. +0 −36 tools/dev/README.md
  244. +57 −0 tools/dev/README.pod
  245. +1 −1 tools/dev/mk_language_shell.in
  246. +1 −1 tools/dev/pbc_to_exe.pir
  247. +0 −4 tools/release/README
  248. +18 −0 tools/release/README.pod
  249. +6 −7 tools/release/release.json
  250. +2 −2 tools/release/update_version.pl
View
@@ -112,9 +112,10 @@ D: typo squisher
E: yDNA@cpan.org
N: Andrew Whitworth
+D: Product Manager (2.9.0 - current)
D: Internals development
D: Documentation
-D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0, 3.3.0, 3.10.0 and 4.0.0
+D: Release manager for 0.8.2, 1.3.0, 1.5.0, 2.4.0, 2.11.0, 3.3.0, 3.10.0, 4.0.0 and 4.4.0
E: wknight8111@gmail.com
U: Whiteknight
View
@@ -1,3 +1,29 @@
+2012-06-XX release 4.5.0
+ - Core
+ - Documentation
+ - Tests
+ - Community
+
+2012-05-15 release 4.4.0
+ - Core
+ + Most internal calls to libc exit(x) have been replaced with
+ Parrot_x_* API calls or PARROT_FORCE_EXIT
+ - Documentation
+ + 'pdd31_hll.pod' made stable in 'docs/pdds/'.
+ + Updated main 'README' to 'README.pod'
+ + Updated various dependencies, e.g., 'lib/Parrot/Distribution.pm'.
+ + Updated all 'README' files to 'README.pod' files.
+ + Added 'README.pod' files to top-level directories.
+ - Tests
+ + Update various tests to pull from new 'README.pod'
+ + Updated 't/tools/install/02-install_files.t' to pull from new
+ 'README.pod'
+ - Community
+ - Platforms
+ - Tools
+ + pbc_merge has been fixed to deduplicate constant strings and
+ merge annotations segments
+
2012-04-17 release 4.3.0
- Core
+ Winxed snapshot updated to 1.7.0
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -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.3.0.dylib [main]lib
+blib/lib/libparrot.4.4.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.3.0 [main]lib
+blib/lib/libparrot.so.4.4.0 [main]lib
compilers/data_json/data_json.pbc [data_json]
config/gen/call_list/opengl.in []
-cygparrot-4.3.0.dll [main]bin
+cygparrot-4.4.0.dll [main]bin
docs/ops/bit.pod [doc]
docs/ops/cmp.pod [doc]
docs/ops/core.pod [doc]
View
181 README
@@ -1,181 +0,0 @@
-This is Parrot, version 4.3.0
-------------------------------
-
-Parrot is Copyright (C) 2001-2012, Parrot Foundation.
-
-
-LICENSE INFORMATION
--------------------
-
-This code is distributed under the terms of the Artistic License 2.0.
-For more details, see the full text of the license in the file LICENSE.
-
-OVERVIEW
---------
-Parrot is a virtual machine designed to efficiently compile and execute
-bytecode for dynamic languages.
-
-PREREQUISITES
--------------
-
-You need a C compiler, a linker, and a make program of course.
-
-If you will be linking with the ICU library you have to download and install it
-before configuring Parrot. Get it from http://site.icu-project.org/download
-
-You also need Perl 5.8.4 or newer, and Storable 2.12 or newer
-for running various configure and build scripts.
-
-For most of the platforms that we are supporting initially, Parrot should build
-out of the box. docs/parrot.pod lists the core platforms. PLATFORMS provides
-reports on the platforms on which Parrot has been built and tested.
-
-HOW TO GET PARROT FROM GITHUB
------------------------------
-I. Install Git.
-
-Linux:
-The method depends on your distribution. To install you should execute (as root or sudo <cmd>):
-
-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
-
-on Gentoo (portage):
-
- emerge -av dev-vcs/git
-
-Windows:
-There are 2 Git ports on Windows:
-
-msysgit http://code.google.com/p/msysgit/downloads/list
-TortoiseGit http://code.google.com/p/tortoisegit/downloads/list
-
-Macintosh OS X:
-
-An Internet search will locate a variety of git installers for Mac OS X,
-including this:
-
- http://help.github.com/mac-git-installation/
-
-II. Obtaining Parrot from github.com
-
-To get a copy of the Parrot Git repository:
-
- git clone git://github.com/parrot/parrot.git
-
-This will checkout the master branch by default. To create a local branch
-that tracks the branch "some_branch":
-
- git checkout -b --track some_branch origin/some_branch
-
-All the above URLs are read-only. If you are a Parrot core developer, then
-use the read-write URL:
-
- git clone git@github.com:parrot/parrot.git
-
-You can view the list of branches at http://github.com/parrot/parrot
-
-INSTRUCTIONS
-------------
-
-For now, unpack your Parrot tarball, (if you're reading this, you've
-probably already done that) and type
-
- perl Configure.pl --optimize
-
-to run the Configure script. The Configure.pl script extracts configuration
-from the running perl5 program. You may need to explicitly tell Configure.pl
-which compiler and linker to use. For example, to compile C files with 'cc',
-C++ files with 'CC', and link everything together with 'CC', you would type
-
- perl Configure.pl --cc=cc --link=CC --ld=CC
-
-See "perl Configure.pl --help" for more options and docs/configuration.pod
-for more details.
-
-For systems like HPUX that don't have inet_pton please run
-
- perl Configure.pl --define=inet_aton
-
-Running Configure.pl will generate a config.h header, a Parrot::Config
-module, platform files and many Makefiles.
-
-The file "myconfig" has an overview of configure settings.
-
-Next, run make. (Configure.pl will tell you which version of make it
-recommends for your system.)
-
-Now, the interpreter should build. If you are building the ICU library
-(this is the default on most systems), you need to use GNU make instead
-(or something compatible with it).
-
-You can test Parrot by running "make test". You can run the tests in parallel
-with "make TEST_JOBS=3 test".
-
-You can run the full test suite with
-
- make fulltest
-
-Note: PLATFORMS contains notes about whether test failures are expected
-on your system.
-
-You can install Parrot with:
-
- make install
-
-By default, this installs in /usr/local, with the Parrot executable in
-/usr/local/bin. If you want to install Parrot into another location use:
-
- perl Configure.pl --prefix=/home/joe/bird
- make install
-
-But please note that dynamic libs will not be found for non-standard
-locations unless you set LD_LIBRARY_PATH or similar.
-
-Look at docs/parrot.pod and docs/intro.pod for where to go from here. If you
-have any problems, see the section "How To Submit A Bug Report" in
-docs/submissions.pod. These documents are in POD format. You can view these
-files with the command:
-
- perldoc -F docs/intro.pod
-
-CHANGES
--------
-
-For documentation on the user-visible changes between this version and
-previous versions, please see ChangeLog.
-
-MAILING LISTS
--------------
-
-The Parrot user mailing list is parrot-users@lists.parrot.org. Subscribe by
-filling out the form at http://lists.parrot.org/mailman/listinfo/parrot-users .
-The list is archived at http://lists.parrot.org/pipermail/parrot-users/ .
-
-For development discussions see the information in docs/gettingstarted.pod.
-
-FEEDBACK, PATCHES, etc.
------------------------
-
-See docs/submissions.pod for more information on reporting bugs and
-submitting patches.
-
-WEB SITES
----------
-
-The following web sites have all the information you need about Parrot:
- http://www.parrot.org/
- http://docs.parrot.org/
- https://github.com/parrot/parrot/
-
-Have fun,
- The Parrot Team.
Oops, something went wrong.

0 comments on commit 3fa2582

Please sign in to comment.