Permalink
Browse files

[html_cleanup] merge in origin/master

  • Loading branch information...
2 parents 6cbc51a + 3e9a2f0 commit b8261e42876c7e2406014cc9791ffc5164d00998 @mikehh mikehh committed Dec 29, 2010
Showing with 10,215 additions and 7,472 deletions.
  1. +13 −1 CREDITS
  2. +1 −2 Configure.pl
  3. +24 −27 DEPRECATED.pod
  4. +12 −5 MANIFEST
  5. +1 −1 README.deutsch
  6. +3 −3 README.espanol
  7. +1 −1 README.polski
  8. +2 −0 compilers/imcc/Rules.in
  9. +1 −1 compilers/imcc/debug.c
  10. +12 −5 compilers/imcc/imcc.y
  11. +21 −11 compilers/imcc/imclexer.c
  12. +864 −856 compilers/imcc/imcparser.c
  13. +7 −6 compilers/imcc/imcparser.h
  14. +102 −15 compilers/imcc/main.c
  15. +12 −63 compilers/imcc/pbc.c
  16. +13 −7 compilers/imcc/pcc.c
  17. +0 −1 compilers/imcc/symreg.c
  18. +1 −1 compilers/imcc/symreg.h
  19. +24 −24 compilers/pct/src/PAST/Compiler.pir
  20. +1 −1 compilers/pct/src/PCT/Dumper.pir
  21. +1 −1 compilers/pct/src/PCT/Grammar.pir
  22. +2 −2 compilers/pct/src/PCT/HLLCompiler.pir
  23. +7 −7 compilers/pct/src/POST/Compiler.pir
  24. +3 −3 compilers/pge/PGE/Exp.pir
  25. +2 −2 compilers/pge/PGE/Perl6Regex.pir
  26. +1 −1 compilers/tge/TGE/Compiler.pir
  27. +19 −2 config/auto/coverage.pm
  28. +1 −1 config/auto/gc.pm
  29. +1 −0 config/auto/ipv6/test.in
  30. +99 −9 config/auto/pmc.pm
  31. +205 −85 config/gen/makefiles/root.in
  32. +1 −0 config/gen/platform/darwin/sysmem.c
  33. +0 −62 config/init/headers.pm
  34. +61 −0 docs/dev/coverage.pod
  35. +265 −189 docs/pdds/draft/pdd10_embedding.pod
  36. +2 −2 docs/project/release_manager_guide.pod
  37. +1 −1 examples/c/test_main.c
  38. +0 −1 examples/config/file/configcompiler
  39. +0 −1 examples/config/file/configwithfatalstep
  40. +3 −3 examples/io/httpd.pir
  41. +30 −30 examples/library/ncurses_life.pir
  42. +7 −7 examples/pir/befunge/debug.pir
  43. +1 −1 examples/pir/befunge/io.pir
  44. +1 −1 examples/pir/befunge/load.pir
  45. +179 −179 examples/pir/life.pir
  46. +9 −9 examples/pir/pirric.pir
  47. +13 −13 examples/pir/readline.pir
  48. +8 −8 examples/sdl/lcd/clock.pir
  49. +3 −3 examples/streams/Combiner.pir
  50. +3 −3 examples/streams/Filter.pir
  51. +372 −417 ext/nqp-rx/src/stage0/HLL-s0.pir
  52. +989 −1,103 ext/nqp-rx/src/stage0/NQP-s0.pir
  53. +537 −594 ext/nqp-rx/src/stage0/P6Regex-s0.pir
  54. +16 −16 ext/nqp-rx/src/stage0/Regex-s0.pir
  55. +239 −128 frontend/parrot/main.c
  56. +6 −6 frontend/parrot_debugger/main.c
  57. +3 −2 frontend/pbc_dump/main.c
  58. +3 −2 frontend/pbc_merge/main.c
  59. +715 −0 include/parrot/api.h
  60. +12 −1 include/parrot/debugger.h
  61. +1 −1 include/parrot/dynext.h
  62. +15 −5 include/parrot/embed.h
  63. +16 −0 include/parrot/exit.h
  64. +13 −0 include/parrot/gc_api.h
  65. +16 −9 include/parrot/global_setup.h
  66. +1 −1 include/parrot/imcc.h
  67. +40 −19 include/parrot/interpreter.h
  68. +7 −0 include/parrot/library.h
  69. +5 −13 include/parrot/longopt.h
  70. +5 −2 include/parrot/misc.h
  71. +0 −2 include/parrot/oplib/core_ops.h
  72. +283 −285 include/parrot/oplib/ops.h
  73. +283 −285 include/parrot/opsenum.h
  74. +0 −442 include/parrot/packfile.h
  75. +0 −2 include/parrot/parrot.h
  76. +27 −1 include/parrot/pmc.h
  77. +5 −131 include/parrot/pmc_freeze.h
  78. +1 −37 include/parrot/string_funcs.h
  79. +0 −64 include/parrot/string_primitives.h
  80. +0 −1 lib/Parrot/Configure/Step/List.pm
  81. +0 −4 lib/Parrot/Distribution.pm
  82. +2 −3 lib/Parrot/Docs/Section/C.pm
  83. +2 −0 lib/Parrot/Headerizer.pm
  84. +0 −1 lib/Parrot/Pmc2c/PCCMETHOD.pm
  85. +1 −1 lib/Parrot/Test/Harness.pm
  86. BIN ports/fedora/{2.6.0 → 2.11.0}/parrot.desk.in.tar.gz
  87. +25 −11 ports/fedora/{2.6.0 → 2.11.0}/parrot.spec
  88. +1 −1 runtime/parrot/library/CGI/QueryHash.pir
  89. +1 −1 runtime/parrot/library/Data/Dumper/Base.pir
  90. +1 −1 runtime/parrot/library/Data/Dumper/Default.pir
  91. +11 −11 runtime/parrot/library/MIME/Base64.pir
  92. +4 −4 runtime/parrot/library/PGE/Hs.pir
  93. +5 −5 runtime/parrot/library/PGE/Perl6Grammar.pir
  94. +1 −1 runtime/parrot/library/Stream/Base.pir
  95. +1 −1 runtime/parrot/library/Stream/Lines.pir
  96. +2 −2 runtime/parrot/library/String/Utils.pir
  97. +2 −1 runtime/parrot/library/TAP/Harness.pir
  98. +3 −5 runtime/parrot/library/Test/Builder/Output.pir
  99. +11 −11 runtime/parrot/library/Test/Builder/Test.pir
  100. +6 −6 runtime/parrot/library/Test/Builder/TestPlan.pir
  101. +13 −13 runtime/parrot/library/Test/Builder/Tester.pir
  102. +4 −4 runtime/parrot/library/Test/More.pir
  103. +1 −1 runtime/parrot/library/YAML/Dumper/Base.pir
  104. +1 −1 runtime/parrot/library/YAML/Dumper/Default.pir
  105. +128 −17 src/debug.c
  106. +17 −48 src/dynext.c
  107. +5 −4 src/dynpmc/Defines.in
  108. +53 −17 src/dynpmc/Rules.in
  109. +27 −8 src/embed.c
  110. +819 −0 src/embed/api.c
  111. +48 −0 src/embed/embed_private.h
  112. +603 −0 src/embed/pmc.c
  113. +237 −0 src/embed/strings.c
  114. +14 −34 src/exceptions.c
  115. +49 −1 src/exit.c
  116. +24 −0 src/gc/api.c
  117. +2 −2 src/gc/gc_ms2.c
  118. +0 −8 src/gc/gc_private.h
  119. +3 −0 src/gc/mark_sweep.c
  120. +37 −34 src/global_setup.c
  121. +14 −98 src/hash.c
  122. +59 −0 src/interp/inter_misc.c
  123. +83 −51 src/library.c
  124. +34 −95 src/longopt.c
  125. +575 −623 src/ops/core_ops.c
  126. +3 −6 src/ops/pmc.ops
  127. +0 −6 src/ops/string.ops
  128. +34 −25 src/packfile/object_serialization.c
  129. +52 −28 src/pbc_disassemble.c
  130. +76 −2 src/pmc.c
  131. +4 −11 src/pmc/callcontext.pmc
  132. +18 −12 src/pmc/eventhandler.pmc
  133. +3 −0 src/pmc/exception.pmc
  134. +13 −9 src/pmc/exporter.pmc
  135. +1 −1 src/pmc/fixedintegerarray.pmc
  136. +1 −1 src/pmc/fixedpmcarray.pmc
  137. +0 −1 src/pmc/imageiosize.pmc
  138. +0 −2 src/pmc/iterator.pmc
  139. +3 −38 src/pmc/orderedhash.pmc
  140. +0 −1 src/pmc/packfiledebug.pmc
  141. +4 −2 src/pmc/socket.pmc
  142. +0 −1 src/pmc/stringbuilder.pmc
  143. +0 −1 src/pmc/undef.pmc
  144. +1 −0 src/pointer_array.c
  145. +40 −149 src/string/api.c
  146. +0 −394 src/string/primitives.c
  147. +21 −12 src/utils.c
  148. +7 −1 t/codingstd/pccmethod_deps.t
  149. +3 −0 t/codingstd/perlcritic.t
  150. +1 −1 t/compilers/imcc/syn/const.t
  151. +0 −1 t/configure/testlib/adefectivefoobar
  152. +0 −1 t/configure/testlib/bdefectivefoobar
  153. +0 −1 t/configure/testlib/cdefectivefoobar
  154. +0 −1 t/configure/testlib/ddefectivefoobar
  155. +0 −1 t/configure/testlib/verbosefoobar
  156. +1 −1 t/dynoplibs/pmc_pow.t
  157. +1 −1 t/dynpmc/foo.t
  158. +8 −2 t/harness.pir
  159. +3 −2 t/library/lwp.t
  160. +3 −3 t/library/mime_base64.t
  161. +4 −4 t/library/streams.t
  162. +2 −2 t/oo/new.t
  163. +2 −2 t/oo/root_new.t
  164. +10 −10 t/op/arithmetics_pmc.t
  165. +37 −1 t/op/calling.t
  166. +15 −15 t/op/cmp-nonbranch.t
  167. +11 −7 t/op/exit.t
  168. +12 −12 t/op/string.t
  169. +2 −2 t/op/string_cs.t
  170. +4 −4 t/op/stringu.t
  171. +178 −38 t/pmc/bigint.t
  172. +9 −1 t/pmc/continuation.t
  173. +10 −10 t/pmc/eval.t
  174. +15 −19 t/pmc/eventhandler.t
  175. +55 −1 t/pmc/exporter.t
  176. +24 −2 t/pmc/fixedintegerarray.t
  177. +3 −3 t/pmc/fixedpmcarray.t
  178. +2 −2 t/pmc/fixedstringarray.t
  179. +6 −3 t/pmc/hash.t
  180. +24 −1 t/pmc/hashiterator.t
  181. +35 −3 t/pmc/key.t
  182. +13 −2 t/pmc/mappedbytearray.t
  183. +9 −9 t/pmc/resizablepmcarray.t
  184. +6 −1 t/pmc/role.t
  185. +3 −2 t/pmc/socket.t
  186. +0 −1 t/pmc/string.t
  187. +1 −0 t/pmc/testfile
  188. +4 −1 t/run/options.t
  189. +75 −79 tools/dev/checkdepend.pl → t/src/checkdepend.t
  190. +310 −0 t/src/embed/pmc.t
  191. +92 −0 t/src/embed/strings.t
  192. +1 −1 t/steps/auto/pmc-01.t
  193. +0 −93 t/steps/init/headers-01.t
  194. +25 −13 tools/build/parrot_config_c.pl
  195. +120 −0 tools/dev/findhacks.pl
  196. +42 −14 tools/dev/github_post_receive.pl
  197. +92 −0 tools/dev/make_cover.pl
  198. +1 −0 tools/dev/mk_nci_thunks.pl
  199. +1 −1 tools/dev/nci_thunk_gen.pir
  200. +77 −40 tools/dev/pbc_to_exe.pir
View
14 CREDITS
@@ -323,6 +323,11 @@ N: Dave Woldrich
D: Win32 build fixes
E: dave@woldrich.com
+N: David Czech
+U: kapace
+E: davidczech510@gmail.com
+D: increasing EventHandler test coverage
+
N: David M. Lloyd
U: dmlloyd
E: dmlloyd@tds.net
@@ -712,7 +717,9 @@ N: Matt Kennedy
D: Some Env PMC method implementations and tests
N: Matt Rajca
-D: Code refactoring
+E: mattmatt.rajca@me.com
+A: mattrajca
+D: Code refactoring, increasing test coverage
N: Mattia Barbon
D: Win32 fixes, dynamic PMC creation and loading
@@ -1047,6 +1054,11 @@ D: Nicer command line handling in ops2c.pl
N: Tony Payne
D: Example hanoi.pasm
+N: Tony Young
+E: rofflwaffls@gmail.com
+A: rfw
+D: increasing PMC test coverage
+
N: Tyler Curtis
U: tcurtis
E: tyler.l.curtis@gmail.com
View
@@ -553,7 +553,7 @@ =head1 CONFIGURATION-FILE INTERFACE
...
init::hints verbose-step
- init::headers
+ ...
inter::progs fatal-step
...
auto::gcc verbose-step
@@ -600,7 +600,6 @@ =head2 Example
init::defaults
init::install
init::hints verbose-step
- init::headers
inter::progs
inter::make
inter::lex
View
@@ -104,12 +104,6 @@ will not auto-vivify nested hashes and return PMCNULL early.
L<https://trac.parrot.org/parrot/ticket/1561>
-=item Method unescape on String [experimental]
-
-This is a helper method for testing of Parrot_str_unescape_string.
-
-L<https://trac.parrot.org/parrot/ticket/1628>
-
=item logical_* vtables [eligiblie in 2.7]
These can be replaced by C<get_bool> and intval ops unless you're using them for
@@ -200,13 +194,6 @@ These will be changed to allow more flexibility in types.
L<https://trac.parrot.org/parrot/ticket/1565>
-=item inplace string updates. [eligible in 2.4]
-
-All "inplace" string update ops are deprecated. E.g. "chopn_s", etc.
-Part of COW removal.
-
-L<https://trac.parrot.org/parrot/ticket/1540>
-
=item finalize [experimental]
Finalize exception handler, unrolling inner runloops if needed.
@@ -291,6 +278,12 @@ At this point, C<:init> is a no-op, and will therefore be removed.
L<https://trac.parrot.org/parrot/ticket/1896>
+=item encoding:charset:"" string literals [eligible in 3.1]
+
+This form of string literals will be removed.
+
+L<https://trac.parrot.org/parrot/ticket/1808>
+
=back
=head1 Functions
@@ -324,20 +317,6 @@ this rather than relying on in-place modification of an existing pointer.
L<https://trac.parrot.org/parrot/ticket/1584>
-=item STRING COW [eligible in 2.4]
-
-COW strings are to be removed. All "inplace" string modification
-functions and all "inplace" string ops are deprecated.
-
-L<https://trac.parrot.org/parrot/ticket/1540>
-
-=item Parrot_str_unescape_string [experimental]
-
-This function is an experimental addition to enhance and maybe replace
-Parrot_str_unescape
-
-L<https://trac.parrot.org/parrot/ticket/1628>
-
=item Parrot_load_bytecode_file [experimental]
Load a .pbc file into the interpreter. Experimental.
@@ -349,6 +328,24 @@ is deprecated.
L<http://trac.parrot.org/parrot/ticket/1800>
+=item Non-const STRING* arguments [eligible in 3.1]
+
+Due immutable nature of STRINGs we are changing internal handling to use only
+const STRING pointers. It will improve optimizations possibilities by compiler,
+make parrot const-correct, etc.
+
+Passing of non-const STRING* arguments is deprecated and will be changed to
+const STRING*. This includes (but not limited to) all string API functions,
+VTABLEs, PCC, etc.
+
+L<http://trac.parrot.org/parrot/ticket/1906>
+
+=item Old string_* functions [eligible in 3.0]
+
+The old string_* functions will be removed.
+
+L<http://trac.parrot.org/parrot/ticket/1809>
+
=back
=head1 Compiler tools
View
@@ -289,7 +289,6 @@ config/gen/platform/win32/sysmem.c []
config/gen/platform/win32/threads.h []
config/gen/platform/win32/time.c []
config/init/defaults.pm []
-config/init/headers.pm []
config/init/hints.pm []
config/init/hints/aix.pm []
config/init/hints/cygwin.pm []
@@ -354,6 +353,7 @@ docs/debug.pod [doc]
docs/debugger.pod [doc]
docs/dev/byteorder.pod [doc]
docs/dev/c_functions.pod [doc]
+docs/dev/coverage.pod [doc]
docs/dev/debugging_with_msvc.pod [doc]
docs/dev/events.pod [doc]
docs/dev/headerizer.pod [doc]
@@ -916,6 +916,7 @@ frontend/parrot_debugger/main.c []
frontend/pbc_dump/main.c []
frontend/pbc_dump/packdump.c []
frontend/pbc_merge/main.c []
+include/parrot/api.h [main]include
include/parrot/atomic.h [main]include
include/parrot/atomic/fallback.h [main]include
include/parrot/atomic/gcc_pcc.h [main]include
@@ -979,7 +980,6 @@ include/parrot/settings.h [main]include
include/parrot/stat.h [main]include
include/parrot/string.h [main]include
include/parrot/string_funcs.h [main]include
-include/parrot/string_primitives.h [main]include
include/parrot/sub.h [main]include
include/parrot/sysmem.h [main]include
include/parrot/thr_pthread.h [main]include
@@ -1262,6 +1262,10 @@ src/dynpmc/rational.pmc []
src/dynpmc/rotest.pmc []
src/dynpmc/subproxy.pmc []
src/embed.c []
+src/embed/api.c []
+src/embed/embed_private.h []
+src/embed/pmc.c []
+src/embed/strings.c []
src/exceptions.c []
src/exit.c []
src/extend.c []
@@ -1446,7 +1450,6 @@ src/string/encoding/ucs2.c []
src/string/encoding/ucs4.c []
src/string/encoding/utf16.c []
src/string/encoding/utf8.c []
-src/string/primitives.c []
src/string/unicode.h []
src/sub.c []
src/thread.c []
@@ -1929,6 +1932,7 @@ t/pmc/stringiterator.t [test]
t/pmc/sub.t [test]
t/pmc/sys.t [test]
t/pmc/task.t [test]
+t/pmc/testfile [test]
t/pmc/testlib/annotations.pir [test]
t/pmc/testlib/number.pasm [test]
t/pmc/testlib/packfile_common.pir [test]
@@ -1947,7 +1951,10 @@ t/run/options.t [test]
t/src/README []doc
t/src/atomic.t [test]
t/src/basic.t [test]
+t/src/checkdepend.t [test]
t/src/embed.t [test]
+t/src/embed/pmc.t [test]
+t/src/embed/strings.t [test]
t/src/exit.t [test]
t/src/extend.t [test]
t/src/pointer_array.t [test]
@@ -2006,7 +2013,6 @@ t/steps/gen/makefiles-01.t [test]
t/steps/gen/opengl-01.t [test]
t/steps/gen/platform-01.t [test]
t/steps/init/defaults-01.t [test]
-t/steps/init/headers-01.t [test]
t/steps/init/hints-01.t [test]
t/steps/init/hints/darwin-01.t [test]
t/steps/init/hints/linux-01.t [test]
@@ -2105,12 +2111,12 @@ tools/dev/README []doc
tools/dev/addopstags.pl []
tools/dev/as2c.pl []
tools/dev/bench_op.pir []
-tools/dev/checkdepend.pl []
tools/dev/create_language.pl [devel]
tools/dev/debian_docs.sh []
tools/dev/dump_pbc.pl []
tools/dev/faces.pl []
tools/dev/fetch_languages.pl []
+tools/dev/findhacks.pl []
tools/dev/gen_charset_tables.pl []
tools/dev/gen_class.pl []
tools/dev/gen_makefile.pl [devel]
@@ -2122,6 +2128,7 @@ tools/dev/install_doc_files.pl []
tools/dev/install_files.pl []
tools/dev/lib_deps.pl []
tools/dev/list_unjitted.pl []
+tools/dev/make_cover.pl []
tools/dev/manicheck.pl []
tools/dev/mk_author_map.pl []
tools/dev/mk_inno.pl []
View
@@ -1,4 +1,4 @@
-Parrot-Version 2.10.1
+Parrot-Version 2.11.0
---------------------
Parrot ist lizenziert (C) 2001-2010, Parrot Foundation.
View
@@ -1,8 +1,8 @@
LÉASE
------------------------
-Esta es la versión Parrot, 2.10.1
------------------------------
+Esta es la versión Parrot, 2.11.0
+---------------------------------
Parrot Copyright (C) 2001-2010, Parrot Foundation.
@@ -180,4 +180,4 @@ Los siguientes sitios web contienen toda la información que necesitas sobre Par
http://docs.parrot.org/
Que se diviertan,
- El equipo de Parrot.
+ El equipo de Parrot.
View
@@ -1,4 +1,4 @@
-To jest Parrot, wersja 2.10.1
+To jest Parrot, wersja 2.11.0
-----------------------------
Prawa autorskie (C) Parrota należą do 2001-2010, Parrot Foundation.
View
@@ -157,6 +157,8 @@ compilers/imcc/main$(O) : \
$(INC_DIR)/imcc.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h \
+ $(INC_DIR)/api.h \
+ $(INC_DIR)/longopt.h \
$(PARROT_H_HEADERS)
## SUFFIX OVERRIDE - Warnings (This is generated code)
View
@@ -96,7 +96,7 @@ IMCC_fatal_standalone(PARROT_INTERP, int code, ARGIN(const char *fmt), ...)
va_start(ap, fmt);
imcc_vfprintf(interp, Parrot_io_STDERR(interp), fmt, ap);
va_end(ap);
- Parrot_x_exit(interp, code);
+ Parrot_x_jump_out_error(interp, code);
}
/*
View
@@ -1315,8 +1315,8 @@ sub:
{
IMCC_INFO(interp)->cur_call->pcc_sub->pragma = $5;
if (!IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid) {
- IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = mem_sys_strdup(
- IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->name);
+ IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid =
+ IMCC_INFO(interp)->cur_unit->instructions->symregs[0];
}
}
sub_params
@@ -1447,9 +1447,10 @@ subid:
}
| SUBID '(' any_string ')'
{
+ SymReg *r = mk_const(interp, $3, 'S');
$$ = 0;
- IMCC_INFO(interp)->cur_unit->subid = mk_const(interp, $3, 'S');
- IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = str_dup_remove_quotes($3);
+ IMCC_INFO(interp)->cur_unit->subid = r;
+ IMCC_INFO(interp)->cur_unit->instructions->symregs[0]->subid = r;
mem_sys_free($3);
}
;
@@ -2015,6 +2016,13 @@ get_results:
op_assign:
target assign_op var
{ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, $2, 2, $1, $3); }
+ | target CONCAT_ASSIGN var
+ {
+ if ($1->set == 'P')
+ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "concat", 2, $1, $3);
+ else
+ $$ = MK_I(interp, IMCC_INFO(interp)->cur_unit, "concat", 3, $1, $1, $3);
+ }
;
assign_op:
@@ -2024,7 +2032,6 @@ assign_op:
| DIV_ASSIGN { $$ = (char *)"div"; }
| MOD_ASSIGN { $$ = (char *)"mod"; }
| FDIV_ASSIGN { $$ = (char *)"fdiv"; }
- | CONCAT_ASSIGN { $$ = (char *)"concat"; }
| BAND_ASSIGN { $$ = (char *)"band"; }
| BOR_ASSIGN { $$ = (char *)"bor"; }
| BXOR_ASSIGN { $$ = (char *)"bxor"; }
Oops, something went wrong.

0 comments on commit b8261e4

Please sign in to comment.