[parrot/parrot] 7aef36: Merge from master. we had some conflicts in the op...

GitHub noreply at github.com
Sat Feb 4 17:59:37 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/parrot/parrot
  Commit: 7aef3690558347cafa0d16c03779a1f3be708466
      https://github.com/parrot/parrot/commit/7aef3690558347cafa0d16c03779a1f3be708466
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-02-04 (Sat, 04 Feb 2012)

  Changed paths:
    M .gitignore
  A .travis.yml
  M CREDITS
  M ChangeLog
  M Configure.pl
  M MANIFEST
  M MANIFEST.SKIP
  M MANIFEST.generated
  M PBC_COMPAT
  M README
  M RESPONSIBLE_PARTIES
  M TODO
  M VERSION
  M api.yaml
  M compilers/imcc/Rules.in
  M compilers/imcc/api.c
  M compilers/imcc/imc.h
  M compilers/imcc/imcc.y
  M compilers/imcc/imcparser.c
  M compilers/imcc/main.c
  M compilers/imcc/parser_util.c
  M compilers/imcc/pbc.c
  M compilers/imcc/symreg.h
  M compilers/opsc/src/Ops/Compiler/Actions.pm
  M compilers/opsc/src/Ops/Compiler/Grammar.pm
  M compilers/opsc/src/Ops/Trans/C.pm
  M compilers/pct/src/PAST/Compiler.pir
  M compilers/pct/src/PAST/Node.pir
  M compilers/pct/src/PCT/HLLCompiler.pir
  M compilers/pct/src/PCT/Node.pir
  M compilers/pge/PGE/Exp.pir
  M config/auto/warnings.pm
  M config/gen/makefiles.pm
  M config/gen/makefiles/docs.in
  R config/gen/makefiles/ext.in
  M config/gen/makefiles/root.in
  M config/init/defaults.pm
  M config/init/hints.pm
  M config/init/hints/cygwin.pm
  M config/init/hints/msys.pm
  A docs/binaries/ops2c.pod
  A docs/binaries/parrot-nqp.pod
  A docs/binaries/parrot-prove.pod
  A docs/binaries/parrot.pod
  A docs/binaries/parrot_config.pod
  A docs/binaries/parrot_nci_thunk_gen.pod
  A docs/binaries/parrotbug.pod
  A docs/binaries/pbc_to_exe.pod
  A docs/binaries/plumage.pod
  A docs/binaries/winxed.pod
  M docs/book/draft/appe_source_code.pod
  M docs/book/draft/ch01_introduction.pod
  M docs/book/pct/ch01_introduction.pod
  M docs/book/pir/ch01_introduction.pod
  M docs/book/pir/ch08_io.pod
  M docs/deprecations/deprecations.pod
  M docs/embed.pod
  M docs/faq.pod
  M docs/gettingstarted.pod
  M docs/intro.pod
  M docs/parrot.pod
  M docs/parrothist.pod
  M docs/pdds/draft/pdd06_pasm.pod
  M docs/pdds/pdd03_calling_conventions.pod
  M docs/pdds/pdd10_embedding.pod
  M docs/pdds/pdd22_io.pod
  M docs/project/cage_cleaners_guide.pod
  M docs/project/committer_guide.pod
  M docs/project/metacommitter_guide.pod
  M docs/project/release_manager_guide.pod
  M docs/project/ticket_triaging.pod
  M docs/submissions.pod
  M docs/tests.pod
  M docs/translations/README.BGR
  M docs/translations/README.deutsch
  M docs/translations/README.espanol
  M docs/translations/README.francais
  M docs/translations/README.polski
  M docs/translations/README.pt-BR
  M docs/user/pir/pmcs.pod
  M examples/c/pbc_info.c
  M examples/c/test_main.c
  M examples/compilers/japhc.c
  M examples/config/file/configcompiler
  A examples/config/file/configverbose
  M examples/embed/cotorra.c
  M examples/io/post.pir
  M examples/languages/abc/setup.pir
  M examples/languages/abc/src/parser/actions.nqp
  M examples/languages/abc/t/abc_functions
  M examples/languages/squaak/doc/tutorial_episode_1.pod
  M examples/languages/squaak/doc/tutorial_episode_4.pod
  M examples/languages/squaak/doc/tutorial_episode_5.pod
  M examples/languages/squaak/doc/tutorial_episode_6.pod
  M examples/languages/squaak/src/Squaak/Actions.pm
  M examples/languages/squaak/src/Squaak/Grammar.pm
  M examples/languages/squaak/src/Squaak/Runtime.pm
  M examples/languages/squaak/t/00-sanity.t
  M examples/pir/befunge/setup.pir
  A examples/pir/coop_threads.pir
  M examples/pir/make_hello_pbc.pir
  R ext/Parrot-Embed/Build.PL
  R ext/Parrot-Embed/Changes
  R ext/Parrot-Embed/MANIFEST
  R ext/Parrot-Embed/README
  R ext/Parrot-Embed/TODO
  R ext/Parrot-Embed/lib/Parrot/Embed.pm
  R ext/Parrot-Embed/lib/Parrot/Embed.xs
  R ext/Parrot-Embed/lib/Parrot/Interpreter.pm
  R ext/Parrot-Embed/lib/Parrot/PMC.pm
  R ext/Parrot-Embed/t/00-load.t
  R ext/Parrot-Embed/t/greet.pir
  R ext/Parrot-Embed/t/interp.t
  R ext/Parrot-Embed/t/languages.t
  R ext/Parrot-Embed/t/pipp.t
  R ext/Parrot-Embed/tools/check_embed_coverage.pl
  R ext/Parrot-Embed/tools/write_typemap.pl
  R ext/Parrot-Embed/typemap
  M ext/nqp-rx/src/stage0/Regex-s0.pir
  M ext/winxed/compiler.pir
  M ext/winxed/driver.pir
  M frontend/parrot2/main.c
  M frontend/parrot2/prt0.pir
  M frontend/parrot2/prt0.winxed
  M frontend/parrot_debugger/main.c
  M frontend/pbc_disassemble/main.c
  M frontend/pbc_dump/main.c
  M frontend/pbc_dump/packdump.c
  M frontend/pbc_merge/main.c
  A include/parrot/alarm.h
  M include/parrot/api.h
  M include/parrot/call.h
  M include/parrot/context.h
  M include/parrot/datatypes.h
  A include/parrot/disassemble.h
  R include/parrot/embed.h
  A include/parrot/events.h
  M include/parrot/exceptions.h
  M include/parrot/extend.h
  M include/parrot/gc_api.h
  M include/parrot/interpreter.h
  M include/parrot/io.h
  M include/parrot/misc.h
  M include/parrot/namespace.h
  M include/parrot/oo.h
  M include/parrot/oplib/core_ops.h
  M include/parrot/oplib/ops.h
  M include/parrot/opsenum.h
  M include/parrot/packfile.h
  M include/parrot/parrot.h
  M include/parrot/platform_interface.h
  M include/parrot/pmc.h
  M include/parrot/pointer_array.h
  M include/parrot/runcore_api.h
  M include/parrot/runcore_profiling.h
  M include/parrot/runcore_subprof.h
  M include/parrot/scheduler.h
  M include/parrot/scheduler_private.h
  M lib/Parrot/Configure/Compiler.pm
  M lib/Parrot/Configure/Options/Conf/File.pm
  M lib/Parrot/Docs/File.pm
  M lib/Parrot/Docs/HTMLPage.pm
  M lib/Parrot/Harness/DefaultTests.pm
  M lib/Parrot/Harness/Smoke.pm
  A lib/Parrot/Harness/TestSets.pm
  M lib/Parrot/Install.pm
  M lib/Parrot/Manifest.pm
  M lib/Parrot/Pmc2c/PMC.pm
  M lib/Parrot/Pmc2c/PMC/RO.pm
  M lib/Parrot/Pmc2c/UtilFunctions.pm
  M lib/Parrot/Test/Pod.pm
  M parrotbug
  M ports/debian/libparrot3.3.0.symbols
  M ports/debian/rules
  M runtime/parrot/bin/prove.pir
  A runtime/parrot/include/green_threads.pir
  M runtime/parrot/include/hllmacros.pir
  M runtime/parrot/library/Archive/Tar.pir
  M runtime/parrot/library/Archive/Zip.pir
  M runtime/parrot/library/Configure/genfile.pir
  M runtime/parrot/library/ProfTest/PIRProfile.nqp
  M runtime/parrot/library/Test/Builder.pir
  M runtime/parrot/library/Test/Builder/Output.pir
  M runtime/parrot/library/Test/More.pir
  M runtime/parrot/library/distutils.pir
  M runtime/parrot/library/osutils.pir
  A src/alarm.c
  M src/call/args.c
  M src/call/context_accessors.c
  M src/call/ops.c
  M src/call/pcc.c
  M src/debug.c
  A src/disassemble.c
  M src/dynext.c
  M src/dynoplibs/Rules.in
  M src/dynpmc/Defines.in
  M src/dynpmc/Rules.in
  M src/dynpmc/dynlexpad.pmc
  M src/dynpmc/select.pmc
  R src/embed.c
  M src/embed/api.c
  M src/embed/bytecode.c
  M src/embed/pmc.c
  A src/events.c
  M src/exceptions.c
  M src/exit.c
  M src/extend.c
  M src/gc/gc_gms.c
  M src/gc/gc_ms.c
  M src/gc/mark_sweep.c
  M src/hash.c
  M src/hll.c
  A src/interp/api.c
  M src/interp/inter_cb.c
  R src/interp/inter_create.c
  R src/interp/inter_misc.c
  M src/io/buffer.c
  M src/key.c
  M src/misc.c
  M src/multidispatch.c
  M src/namespace.c
  M src/nci/libffi.c
  M src/oo.c
  M src/ops/core.ops
  M src/ops/core_ops.c
  M src/ops/experimental.ops
  M src/ops/io.ops
  M src/ops/math.ops
  M src/ops/string.ops
  M src/ops/sys.ops
  M src/packfile/api.c
  M src/packfile/pf_items.c
  M src/packfile/pf_private.h
  M src/platform/darwin/hires_timer.c
  M src/platform/generic/file.c
  M src/platform/generic/hires_timer.c
  M src/platform/generic/io.c
  M src/platform/generic/time.c
  M src/platform/win32/dl.c
  M src/platform/win32/hires_timer.c
  M src/platform/win32/io.c
  M src/pmc.c
  A src/pmc/alarm.pmc
  M src/pmc/arrayiterator.pmc
  M src/pmc/bytebuffer.pmc
  A src/pmc/callback.pmc
  M src/pmc/callcontext.pmc
  M src/pmc/coroutine.pmc
  M src/pmc/default.pmc
  M src/pmc/eval.pmc
  M src/pmc/exception.pmc
  M src/pmc/exceptionhandler.pmc
  M src/pmc/filehandle.pmc
  M src/pmc/fixedfloatarray.pmc
  M src/pmc/fixedintegerarray.pmc
  M src/pmc/fixedpmcarray.pmc
  M src/pmc/fixedstringarray.pmc
  M src/pmc/hash.pmc
  M src/pmc/hashiterator.pmc
  M src/pmc/imageiosize.pmc
  M src/pmc/imccompiler.pmc
  M src/pmc/integer.pmc
  M src/pmc/iterator.pmc
  M src/pmc/key.pmc
  M src/pmc/orderedhashiterator.pmc
  M src/pmc/packfile.pmc
  M src/pmc/packfileannotation.pmc
  M src/pmc/packfileview.pmc
  M src/pmc/parrotinterpreter.pmc
  A src/pmc/pmclist.pmc
  M src/pmc/pointer.pmc
  M src/pmc/scheduler.pmc
  M src/pmc/socket.pmc
  M src/pmc/stringiterator.pmc
  M src/pmc/structview.pmc
  M src/pmc/sub.pmc
  M src/pmc/task.pmc
  M src/pmc/timer.pmc
  M src/pmc/undef.pmc
  M src/pointer_array.c
  M src/runcore/cores.c
  M src/runcore/main.c
  M src/runcore/profiling.c
  M src/runcore/subprof.c
  M src/scheduler.c
  M src/string/api.c
  A t/archive/README
  M t/codingstd/filenames.t
  M t/compilers/data_json/to_parrot.t
  M t/compilers/imcc/syn/clash.t
  M t/compilers/imcc/syn/op.t
  M t/compilers/imcc/syn/regressions.t
  M t/compilers/opsc/01-parse.t
  M t/compilers/opsc/06-opsfile.t
  M t/compilers/pct/past.t
  M t/compilers/tge/grammar.t
  M t/configure/008-file_based_configuration.t
  R t/configure/testlib/verbosefoobar
  M t/dynoplibs/io.t
  M t/dynpmc/gziphandle.t
  M t/dynpmc/os.t
  M t/dynpmc/select.t
  A t/fullharness
  M t/harness
  M t/harness.pir
  M t/library/p6object.t
  M t/native_pbc/header.t
  M t/native_pbc/integer.t
  M t/native_pbc/number.t
  M t/native_pbc/string.t
  M t/oo/metamodel.t
  M t/op/arithmetics.t
  M t/op/calling.t
  M t/op/comp.t
  M t/op/gc.t
  M t/op/inf_nan.t
  M t/op/lexicals.t
  M t/op/number.t
  M t/op/stringu.t
  A t/pmc/alarm.t
  M t/pmc/class.t
  M t/pmc/complex.t
  M t/pmc/exceptionhandler.t
  M t/pmc/exporter.t
  M t/pmc/filehandle.t
  M t/pmc/float.t
  M t/pmc/hash.t
  M t/pmc/io.t
  M t/pmc/io_iterator.t
  M t/pmc/iterator.t
  M t/pmc/mappedbytearray.t
  M t/pmc/multidispatch.t
  M t/pmc/namespace-old.t
  M t/pmc/nci.t
  M t/pmc/opcode.t
  M t/pmc/packfile.t
  M t/pmc/packfileview.t
  M t/pmc/parrotio.t
  A t/pmc/pmclist.t
  M t/pmc/resizablefloatarray.t
  M t/pmc/resizableintegerarray.t
  M t/pmc/resizablepmcarray.t
  M t/pmc/resizablestringarray.t
  R t/pmc/scheduler.t
  M t/pmc/stringhandle.t
  M t/pmc/sub.t
  M t/pmc/task.t
  A t/pmc/task_primes.t
  M t/pmc/timer.t
  M t/run/options.t
  M t/src/embed.t
  M t/src/embed/api.t
  M t/src/embed/pmc.t
  M t/src/embed/strings.t
  M t/src/exit.t
  M t/src/extend.t
  M t/src/extend_vtable.t
  M t/src/misc.t
  M t/src/pointer_array.t
  A t/src/threads_io.t
  M t/src/warnings.t
  R t/steps/auto/sha1-01.t
  M t/tools/dev/search_ops/samples.pm
  M t/tools/install/testlib/README
  M tools/dev/install_files.pl
  M tools/dev/mk_inno_language.pl
  M tools/dev/pbc_to_exe.pir
  M tools/dev/resubmit_smolder.pl
  R tools/docs/make_html_docs.pl
  A tools/docs/mk_html_docs.pl
  M tools/release/release.json

  Log Message:
  -----------
  Merge from master. we had some conflicts in the ops because of the earlier green_threads merge, so those conflicts have been resolved and the new ops files have been generated

More information about the parrot-commits mailing list