[svn:parrot] r45972 - in trunk: . compilers/json config/gen/makefiles lib/Parrot/Docs/Section lib/Parrot/Harness runtime/parrot/languages runtime/parrot/library t/compilers/data_json t/compilers/json
coke at svn.parrot.org
coke at svn.parrot.org
Sat Apr 24 04:36:30 UTC 2010
Author: coke
Date: Sat Apr 24 04:36:29 2010
New Revision: 45972
URL: https://trac.parrot.org/parrot/changeset/45972
Log:
Eliminate redundant compilers/json (Close TT #1461)
Convert most remaining usage to data_json (See #1579 for a holdout)
Convert json tests to be data_json tests and actually RUN them.
They haven't been running for some time now.
Fix JSON.pir so it works again.
Added:
trunk/t/compilers/data_json/
- copied from r45874, trunk/t/compilers/json/
Deleted:
trunk/compilers/json/
trunk/t/compilers/data_json/.gitignore
trunk/t/compilers/json/
Modified:
trunk/.gitignore
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/MANIFEST.generated
trunk/config/gen/makefiles/root.in
trunk/lib/Parrot/Docs/Section/Compilers.pm
trunk/lib/Parrot/Harness/DefaultTests.pm
trunk/runtime/parrot/languages/ (props changed)
trunk/runtime/parrot/library/JSON.pir
trunk/t/compilers/data_json/from_parrot.t
trunk/t/compilers/data_json/to_parrot.t
Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/.gitignore Sat Apr 24 04:36:29 2010 (r45972)
@@ -1,603 +1,581 @@
# ex: set ro:
-# $Id
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Apr 21 10:28:38 2010 UT
+# $Id$
+# generated by tools/dev/mk_gitignore.pl Sat Apr 24 04:33:01 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
-# of the directories in the Parrot subversion repository. (Needed for
-# distributions or in general when svn is not available).
-# See docs/submissions.pod on how to recreate this file after SVN
-# has been told about new generated files.
+# of the directories in the Parrot subversion repository.
+# The .gitignore file is a convenience for developers working with git-svn.
+# See http://www.kernel.org/pub/software/scm/git/docs/gitignore.html for the
+# format of this file.
#
-# Ignore the SVN directories
-\B.svn\b
-
-# ports/ should not go into release tarballs
-ports
# generated from svn:ignore of './'
-*.core
-*.def
-*.exe
-*.exp
-*.ilk
-*.lib
-*.manifest
-*.ncb
-*.o
-*.obj
-*.patch
-*.pdb
-*.sln
-*.sto
-*.suo
-*.tmp
-*.vcproj*
-.git
-.parrot_current_rev
-CFLAGS
-MANIFEST.configure.generated
-Makefile
-TAGS
-all_cstring.str
-blib
-config_lib.pir
-cover_db
-install_config.fpmc
-installable*
-libparrot.def
-libparrot.dll
-miniparrot
-myconfig
-parrot
-parrot-nqp
-parrot-nqp.c
-parrot-nqp.pbc
-parrot.ilk
-parrot.iss
-parrot.pc
-parrot.pdb
-parrot_config
-parrot_config.c
-parrot_config.pbc
-parrot_debugger
-parrot_nci_thunk_gen
-parrot_nci_thunk_gen.c
-parrot_nci_thunk_gen.pbc
-parrot_test_run.tar.gz
-pbc_disassemble
-pbc_dump
-pbc_info
-pbc_merge
-pbc_to_exe
-pbc_to_exe.*
-perl6
-pirc
-tags
-tapir
-tapir.*
-temp.file
-test
-test.c
-test.cco
-test.err
-test.ilk
-test.ldo
-test.out
-test.pdb
-vc60.pdb
-vc70.pdb
-vtable.dump
+/*.core
+/*.def
+/*.exe
+/*.exp
+/*.ilk
+/*.lib
+/*.manifest
+/*.ncb
+/*.o
+/*.obj
+/*.patch
+/*.pdb
+/*.sln
+/*.sto
+/*.suo
+/*.tmp
+/*.vcproj*
+/.git
+/.parrot_current_rev
+/CFLAGS
+/MANIFEST.configure.generated
+/Makefile
+/TAGS
+/all_cstring.str
+/blib
+/config_lib.pir
+/cover_db
+/install_config.fpmc
+/installable*
+/libparrot.def
+/libparrot.dll
+/miniparrot
+/myconfig
+/parrot
+/parrot-nqp
+/parrot-nqp.c
+/parrot-nqp.pbc
+/parrot.ilk
+/parrot.iss
+/parrot.pc
+/parrot.pdb
+/parrot_config
+/parrot_config.c
+/parrot_config.pbc
+/parrot_debugger
+/parrot_nci_thunk_gen
+/parrot_nci_thunk_gen.c
+/parrot_nci_thunk_gen.pbc
+/parrot_test_run.tar.gz
+/pbc_disassemble
+/pbc_dump
+/pbc_info
+/pbc_merge
+/pbc_to_exe
+/pbc_to_exe.*
+/perl6
+/pirc
+/tags
+/tapir
+/tapir.*
+/temp.file
+/test
+/test.c
+/test.cco
+/test.err
+/test.ilk
+/test.ldo
+/test.out
+/test.pdb
+/vc60.pdb
+/vc70.pdb
+/vtable.dump
# generated from svn:ignore of 'compilers/data_json/'
-compilers/data_json/data_json.pbc
+/compilers/data_json/data_json.pbc
# generated from svn:ignore of 'compilers/data_json/data_json/'
-compilers/data_json/data_json/*.pbc
-compilers/data_json/data_json/*.pir
+/compilers/data_json/data_json/*.pbc
+/compilers/data_json/data_json/*.pir
# generated from svn:ignore of 'compilers/imcc/'
-compilers/imcc/*.flag
-compilers/imcc/*.o
-compilers/imcc/*.obj
-compilers/imcc/*.tmp
-compilers/imcc/Rules.mak
-compilers/imcc/imcc
-compilers/imcc/imclexer.c
-compilers/imcc/imcparser.c
-compilers/imcc/imcparser.h
-compilers/imcc/imcparser.output
-# generated from svn:ignore of 'compilers/json/'
-compilers/json/JSON.pbc
-# generated from svn:ignore of 'compilers/json/JSON/'
-compilers/json/JSON/*.pbc
-compilers/json/JSON/*.pir
-# generated from svn:ignore of 'compilers/ncigen/'
-compilers/ncigen/Makefile
-compilers/ncigen/ncigen.pbc
-# generated from svn:ignore of 'compilers/ncigen/src/'
-compilers/ncigen/src/gen_actions.pir
-compilers/ncigen/src/gen_builtins.pir
-compilers/ncigen/src/gen_grammar.pir
-# generated from svn:ignore of 'compilers/nqp/'
-compilers/nqp/nqp.pbc
-# generated from svn:ignore of 'compilers/nqp/bootstrap/'
-compilers/nqp/bootstrap/gen_actions.pir
-compilers/nqp/bootstrap/nqp.pbc
-# generated from svn:ignore of 'compilers/nqp/src/'
-compilers/nqp/src/Grammar_gen.pir
+/compilers/imcc/*.flag
+/compilers/imcc/*.o
+/compilers/imcc/*.obj
+/compilers/imcc/*.tmp
+/compilers/imcc/Rules.mak
+/compilers/imcc/imcc
+/compilers/imcc/imclexer.c
+/compilers/imcc/imcparser.c
+/compilers/imcc/imcparser.h
+/compilers/imcc/imcparser.output
# generated from svn:ignore of 'compilers/pct/src/PAST/'
-compilers/pct/src/PAST/*.pbc
+/compilers/pct/src/PAST/*.pbc
# generated from svn:ignore of 'compilers/pct/src/PCT/'
-compilers/pct/src/PCT/*.pbc
+/compilers/pct/src/PCT/*.pbc
# generated from svn:ignore of 'compilers/pct/src/POST/'
-compilers/pct/src/POST/*.pbc
-compilers/pct/src/POST/Grammar_gen.pir
+/compilers/pct/src/POST/*.pbc
+/compilers/pct/src/POST/Grammar_gen.pir
# generated from svn:ignore of 'compilers/pge/'
-compilers/pge/PGE.pbc
+/compilers/pge/PGE.pbc
# generated from svn:ignore of 'compilers/pge/PGE/'
-compilers/pge/PGE/*.dll
-compilers/pge/PGE/builtins_gen.pir
+/compilers/pge/PGE/*.dll
+/compilers/pge/PGE/builtins_gen.pir
# generated from svn:ignore of 'compilers/pirc/'
-compilers/pirc/*.o
-compilers/pirc/*.obj
-compilers/pirc/*.pbd
-compilers/pirc/pirc
-compilers/pirc/pirc.exe
+/compilers/pirc/*.o
+/compilers/pirc/*.obj
+/compilers/pirc/*.pbd
+/compilers/pirc/pirc
+/compilers/pirc/pirc.exe
# generated from svn:ignore of 'compilers/pirc/t/'
-compilers/pirc/t/basic_?.pir
-compilers/pirc/t/basic_??.pir
-compilers/pirc/t/heredoc_?.pir
-compilers/pirc/t/macro_?.pir
-compilers/pirc/t/stmts_?.pir
-compilers/pirc/t/subflags_?.pir
+/compilers/pirc/t/basic_?.pir
+/compilers/pirc/t/basic_??.pir
+/compilers/pirc/t/heredoc_?.pir
+/compilers/pirc/t/macro_?.pir
+/compilers/pirc/t/stmts_?.pir
+/compilers/pirc/t/subflags_?.pir
# generated from svn:ignore of 'compilers/tge/'
-compilers/tge/tgc.pbc
+/compilers/tge/tgc.pbc
# generated from svn:ignore of 'compilers/tge/TGE/'
-compilers/tge/TGE/Parser.pir
+/compilers/tge/TGE/Parser.pir
# generated from svn:ignore of 'docs/'
-docs/*.tmp
-docs/Makefile
-docs/doc-prep
-docs/html
-docs/packfile-c.pod
-docs/packfile-perl.pod
+/docs/*.tmp
+/docs/Makefile
+/docs/doc-prep
+/docs/html
+/docs/packfile-c.pod
+/docs/packfile-perl.pod
# generated from svn:ignore of 'docs/book/'
-docs/book/*.html
+/docs/book/*.html
# generated from svn:ignore of 'docs/ops/'
-docs/ops/*.pod
+/docs/ops/*.pod
# generated from svn:ignore of 'editor/'
-editor/Makefile
-editor/imc.vim
-editor/imcc.xml
-editor/pir.vim
+/editor/Makefile
+/editor/imc.vim
+/editor/imcc.xml
+/editor/pir.vim
# generated from svn:ignore of 'examples/languages/abc/'
-examples/languages/abc/*.c
-examples/languages/abc/*.exe
-examples/languages/abc/*.iss
-examples/languages/abc/*.o
-examples/languages/abc/*.obj
-examples/languages/abc/*.pbc
-examples/languages/abc/MANIFEST
-examples/languages/abc/abc
-examples/languages/abc/installable_abc
-examples/languages/abc/man
+/examples/languages/abc/*.c
+/examples/languages/abc/*.exe
+/examples/languages/abc/*.iss
+/examples/languages/abc/*.o
+/examples/languages/abc/*.obj
+/examples/languages/abc/*.pbc
+/examples/languages/abc/MANIFEST
+/examples/languages/abc/abc
+/examples/languages/abc/installable_abc
+/examples/languages/abc/man
# generated from svn:ignore of 'examples/languages/abc/src/'
-examples/languages/abc/src/gen_actions.pir
-examples/languages/abc/src/gen_builtins.pir
-examples/languages/abc/src/gen_grammar.pir
+/examples/languages/abc/src/gen_actions.pir
+/examples/languages/abc/src/gen_builtins.pir
+/examples/languages/abc/src/gen_grammar.pir
# generated from svn:ignore of 'examples/languages/abc/t/'
-examples/languages/abc/t/*_*.out
-examples/languages/abc/t/*_*.pir
+/examples/languages/abc/t/*_*.out
+/examples/languages/abc/t/*_*.pir
# generated from svn:ignore of 'examples/languages/squaak/'
-examples/languages/squaak/*.c
-examples/languages/squaak/*.exe
-examples/languages/squaak/*.iss
-examples/languages/squaak/*.o
-examples/languages/squaak/*.obj
-examples/languages/squaak/*.pbc
-examples/languages/squaak/MANIFEST
-examples/languages/squaak/installable_squaak
-examples/languages/squaak/squaak
+/examples/languages/squaak/*.c
+/examples/languages/squaak/*.exe
+/examples/languages/squaak/*.iss
+/examples/languages/squaak/*.o
+/examples/languages/squaak/*.obj
+/examples/languages/squaak/*.pbc
+/examples/languages/squaak/MANIFEST
+/examples/languages/squaak/installable_squaak
+/examples/languages/squaak/squaak
# generated from svn:ignore of 'examples/languages/squaak/src/'
-examples/languages/squaak/src/gen_*.pir
+/examples/languages/squaak/src/gen_*.pir
# generated from svn:ignore of 'examples/mops/'
-examples/mops/*.o
-examples/mops/mops
+/examples/mops/*.o
+/examples/mops/mops
# generated from svn:ignore of 'examples/nci/'
-examples/nci/*.pbc
+/examples/nci/*.pbc
# generated from svn:ignore of 'examples/pasm/'
-examples/pasm/hello
-examples/pasm/hello.o
-examples/pasm/hello.pbc
+/examples/pasm/hello
+/examples/pasm/hello.o
+/examples/pasm/hello.pbc
# generated from svn:ignore of 'examples/pir/befunge/'
-examples/pir/befunge/*.c
-examples/pir/befunge/*.exe
-examples/pir/befunge/*.iss
-examples/pir/befunge/*.o
-examples/pir/befunge/*.obj
-examples/pir/befunge/*.pbc
-examples/pir/befunge/MANIFEST
-examples/pir/befunge/befunge
-examples/pir/befunge/installable_befunge
+/examples/pir/befunge/*.c
+/examples/pir/befunge/*.exe
+/examples/pir/befunge/*.iss
+/examples/pir/befunge/*.o
+/examples/pir/befunge/*.obj
+/examples/pir/befunge/*.pbc
+/examples/pir/befunge/MANIFEST
+/examples/pir/befunge/befunge
+/examples/pir/befunge/installable_befunge
# generated from svn:ignore of 'ext/'
-ext/Makefile
+/ext/Makefile
# generated from svn:ignore of 'ext/Parrot-Embed/'
-ext/Parrot-Embed/*.bs
-ext/Parrot-Embed/*.bundle
-ext/Parrot-Embed/*.c
-ext/Parrot-Embed/*.def
-ext/Parrot-Embed/*.dll
-ext/Parrot-Embed/*.dump
-ext/Parrot-Embed/*.dylib
-ext/Parrot-Embed/*.exe
-ext/Parrot-Embed/*.exp
-ext/Parrot-Embed/*.h
-ext/Parrot-Embed/*.ilk
-ext/Parrot-Embed/*.lib
-ext/Parrot-Embed/*.manifest
-ext/Parrot-Embed/*.o
-ext/Parrot-Embed/*.obj
-ext/Parrot-Embed/*.old
-ext/Parrot-Embed/*.pdb
-ext/Parrot-Embed/*.pdb
-ext/Parrot-Embed/*.so
-ext/Parrot-Embed/*.tmp
-ext/Parrot-Embed/*.xs
-ext/Parrot-Embed/Build
-ext/Parrot-Embed/Build.bat
-ext/Parrot-Embed/Makefile
-ext/Parrot-Embed/Makefile.PL
-ext/Parrot-Embed/_build
-ext/Parrot-Embed/blib
-ext/Parrot-Embed/dll.base
-ext/Parrot-Embed/pm_to_blib
+/ext/Parrot-Embed/*.bs
+/ext/Parrot-Embed/*.bundle
+/ext/Parrot-Embed/*.c
+/ext/Parrot-Embed/*.def
+/ext/Parrot-Embed/*.dll
+/ext/Parrot-Embed/*.dump
+/ext/Parrot-Embed/*.dylib
+/ext/Parrot-Embed/*.exe
+/ext/Parrot-Embed/*.exp
+/ext/Parrot-Embed/*.h
+/ext/Parrot-Embed/*.ilk
+/ext/Parrot-Embed/*.lib
+/ext/Parrot-Embed/*.manifest
+/ext/Parrot-Embed/*.o
+/ext/Parrot-Embed/*.obj
+/ext/Parrot-Embed/*.old
+/ext/Parrot-Embed/*.pdb
+/ext/Parrot-Embed/*.pdb
+/ext/Parrot-Embed/*.so
+/ext/Parrot-Embed/*.tmp
+/ext/Parrot-Embed/*.xs
+/ext/Parrot-Embed/Build
+/ext/Parrot-Embed/Build.bat
+/ext/Parrot-Embed/Makefile
+/ext/Parrot-Embed/Makefile.PL
+/ext/Parrot-Embed/_build
+/ext/Parrot-Embed/blib
+/ext/Parrot-Embed/dll.base
+/ext/Parrot-Embed/pm_to_blib
# generated from svn:ignore of 'ext/Parrot-Embed/lib/Parrot/'
-ext/Parrot-Embed/lib/Parrot/*.c
-ext/Parrot-Embed/lib/Parrot/*.obj
+/ext/Parrot-Embed/lib/Parrot/*.c
+/ext/Parrot-Embed/lib/Parrot/*.obj
# generated from svn:ignore of 'ext/Parrot-Embed/t/'
-ext/Parrot-Embed/t/*.pbc
+/ext/Parrot-Embed/t/*.pbc
# generated from svn:ignore of 'include/parrot/'
-include/parrot/*.tmp
-include/parrot/config.h
-include/parrot/core_pmcs.h
-include/parrot/extend_vtable.h
-include/parrot/feature.h
-include/parrot/has_header.h
-include/parrot/opsenum.h
-include/parrot/pbcversion.h
-include/parrot/platform.h
-include/parrot/platform_interface.h
-include/parrot/platform_limits.h
-include/parrot/vtable.h
+/include/parrot/*.tmp
+/include/parrot/config.h
+/include/parrot/core_pmcs.h
+/include/parrot/extend_vtable.h
+/include/parrot/feature.h
+/include/parrot/has_header.h
+/include/parrot/opsenum.h
+/include/parrot/pbcversion.h
+/include/parrot/platform.h
+/include/parrot/platform_interface.h
+/include/parrot/platform_limits.h
+/include/parrot/vtable.h
# generated from svn:ignore of 'include/parrot/oplib/'
-include/parrot/oplib/*_ops.h
-include/parrot/oplib/*_ops_cg*.h
-include/parrot/oplib/*_ops_switch.h
-include/parrot/oplib/ops.h
+/include/parrot/oplib/*_ops.h
+/include/parrot/oplib/*_ops_cg*.h
+/include/parrot/oplib/*_ops_switch.h
+/include/parrot/oplib/ops.h
# generated from svn:ignore of 'include/pmc/'
-include/pmc/*.h
+/include/pmc/*.h
# generated from svn:ignore of 'lib/'
-lib/DumbLink.pm
+/lib/DumbLink.pm
# generated from svn:ignore of 'lib/Parrot/'
-lib/Parrot/*.tmp
-lib/Parrot/Jit.pm
-lib/Parrot/Makefile
-lib/Parrot/OpLib
-lib/Parrot/PMC.pm
-lib/Parrot/PakFile2.bs
-lib/Parrot/PakFile2.c
-lib/Parrot/blib
-lib/Parrot/pm_to_blib
+/lib/Parrot/*.tmp
+/lib/Parrot/Jit.pm
+/lib/Parrot/Makefile
+/lib/Parrot/OpLib
+/lib/Parrot/PMC.pm
+/lib/Parrot/PakFile2.bs
+/lib/Parrot/PakFile2.c
+/lib/Parrot/blib
+/lib/Parrot/pm_to_blib
# generated from svn:ignore of 'lib/Parrot/Config/'
-lib/Parrot/Config/Generated.pm
+/lib/Parrot/Config/Generated.pm
# generated from svn:ignore of 'lib/Parrot/Pmc2c/'
-lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm
+/lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm
# generated from svn:ignore of 'runtime/parrot/dynext/'
-runtime/parrot/dynext/*.bundle
-runtime/parrot/dynext/*.def
-runtime/parrot/dynext/*.dll
-runtime/parrot/dynext/*.dylib
-runtime/parrot/dynext/*.exe
-runtime/parrot/dynext/*.exp
-runtime/parrot/dynext/*.ilk
-runtime/parrot/dynext/*.lib
-runtime/parrot/dynext/*.manifest
-runtime/parrot/dynext/*.obj
-runtime/parrot/dynext/*.pdb
-runtime/parrot/dynext/*.so
-runtime/parrot/dynext/libnci.*
+/runtime/parrot/dynext/*.bundle
+/runtime/parrot/dynext/*.def
+/runtime/parrot/dynext/*.dll
+/runtime/parrot/dynext/*.dylib
+/runtime/parrot/dynext/*.exe
+/runtime/parrot/dynext/*.exp
+/runtime/parrot/dynext/*.ilk
+/runtime/parrot/dynext/*.lib
+/runtime/parrot/dynext/*.manifest
+/runtime/parrot/dynext/*.obj
+/runtime/parrot/dynext/*.pdb
+/runtime/parrot/dynext/*.so
+/runtime/parrot/dynext/libnci.*
# generated from svn:ignore of 'runtime/parrot/include/'
-runtime/parrot/include/*.fpmc
-runtime/parrot/include/*.pasm
-runtime/parrot/include/*.pbc
+/runtime/parrot/include/*.fpmc
+/runtime/parrot/include/*.pasm
+/runtime/parrot/include/*.pbc
+# generated from svn:ignore of 'runtime/parrot/languages/'
+/runtime/parrot/languages/data_json
# generated from svn:ignore of 'runtime/parrot/library/'
-runtime/parrot/library/*.pbc
-runtime/parrot/library/OpenGL_funcs.pir
-runtime/parrot/library/PAST
-runtime/parrot/library/config.pir
+/runtime/parrot/library/*.pbc
+/runtime/parrot/library/OpenGL_funcs.pir
+/runtime/parrot/library/PAST
+/runtime/parrot/library/config.pir
# generated from svn:ignore of 'runtime/parrot/library/CGI/'
-runtime/parrot/library/CGI/*.pbc
+/runtime/parrot/library/CGI/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Config/'
-runtime/parrot/library/Config/*.pbc
+/runtime/parrot/library/Config/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Configure/'
-runtime/parrot/library/Configure/*.pbc
+/runtime/parrot/library/Configure/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Data/'
-runtime/parrot/library/Data/*.pbc
+/runtime/parrot/library/Data/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Data/Dumper/'
-runtime/parrot/library/Data/Dumper/*.pbc
+/runtime/parrot/library/Data/Dumper/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Digest/'
-runtime/parrot/library/Digest/*.pbc
+/runtime/parrot/library/Digest/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Getopt/'
-runtime/parrot/library/Getopt/Obj.pbc
+/runtime/parrot/library/Getopt/Obj.pbc
# generated from svn:ignore of 'runtime/parrot/library/MIME/'
-runtime/parrot/library/MIME/*.pbc
+/runtime/parrot/library/MIME/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Math/'
-runtime/parrot/library/Math/*.pbc
+/runtime/parrot/library/Math/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/NCI/'
-runtime/parrot/library/NCI/*.pbc
+/runtime/parrot/library/NCI/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/OpenGL/'
-runtime/parrot/library/OpenGL/*.pbc
+/runtime/parrot/library/OpenGL/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/PCT/'
-runtime/parrot/library/PCT/*.pbc
+/runtime/parrot/library/PCT/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/PGE/'
-runtime/parrot/library/PGE/*.pbc
+/runtime/parrot/library/PGE/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Parrot/'
-runtime/parrot/library/Parrot/*.pbc
+/runtime/parrot/library/Parrot/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/ProfTest/'
-runtime/parrot/library/ProfTest/*.pbc
-runtime/parrot/library/ProfTest/*.pir
+/runtime/parrot/library/ProfTest/*.pbc
+/runtime/parrot/library/ProfTest/*.pir
# generated from svn:ignore of 'runtime/parrot/library/Stream/'
-runtime/parrot/library/Stream/*.pbc
+/runtime/parrot/library/Stream/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/String/'
-runtime/parrot/library/String/Utils.pbc
+/runtime/parrot/library/String/Utils.pbc
# generated from svn:ignore of 'runtime/parrot/library/TAP/'
-runtime/parrot/library/TAP/*.pbc
+/runtime/parrot/library/TAP/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Tcl/'
-runtime/parrot/library/Tcl/*.pbc
+/runtime/parrot/library/Tcl/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Test/'
-runtime/parrot/library/Test/*.pbc
+/runtime/parrot/library/Test/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Test/Builder/'
-runtime/parrot/library/Test/Builder/*.pbc
+/runtime/parrot/library/Test/Builder/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/YAML/'
-runtime/parrot/library/YAML/*.pbc
+/runtime/parrot/library/YAML/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/YAML/Dumper/'
-runtime/parrot/library/YAML/Dumper/*.pbc
+/runtime/parrot/library/YAML/Dumper/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/YAML/Parser/'
-runtime/parrot/library/YAML/Parser/*.pbc
+/runtime/parrot/library/YAML/Parser/*.pbc
# generated from svn:ignore of 'src/'
-src/*.o
-src/*.obj
-src/*.str
-src/asmfun.*
-src/core_pmcs.c
-src/exec_cpu.c
-src/exec_dep.c
-src/exec_dep.h
-src/extend_vtable.c
-src/extra_nci_thunks.c
-src/fingerprint.c
-src/glut_callbacks.c
-src/glut_nci_thunks.c
-src/glut_nci_thunks.nci
-src/install_config.c
-src/jit_cpu.c
-src/jit_defs.c
-src/jit_emit.h
-src/null_config.c
-src/parrot_config.c
-src/parrot_config.h
-src/platform.c
-src/platform_asm.s
-src/revision.c
+/src/*.o
+/src/*.obj
+/src/*.str
+/src/asmfun.*
+/src/core_pmcs.c
+/src/exec_cpu.c
+/src/exec_dep.c
+/src/exec_dep.h
+/src/extend_vtable.c
+/src/extra_nci_thunks.c
+/src/fingerprint.c
+/src/glut_callbacks.c
+/src/glut_nci_thunks.c
+/src/glut_nci_thunks.nci
+/src/install_config.c
+/src/jit_cpu.c
+/src/jit_defs.c
+/src/jit_emit.h
+/src/null_config.c
+/src/parrot_config.c
+/src/parrot_config.h
+/src/platform.c
+/src/platform_asm.s
+/src/revision.c
# generated from svn:ignore of 'src/atomic/'
-src/atomic/*.gcda
-src/atomic/*.o
+/src/atomic/*.gcda
+/src/atomic/*.o
# generated from svn:ignore of 'src/call/'
-src/call/*.o
-src/call/*.obj
-src/call/*.str
+/src/call/*.o
+/src/call/*.obj
+/src/call/*.str
# generated from svn:ignore of 'src/dynoplibs/'
-src/dynoplibs/*.bundle
-src/dynoplibs/*.c
-src/dynoplibs/*.dll
-src/dynoplibs/*.exp
-src/dynoplibs/*.h
-src/dynoplibs/*.ilk
-src/dynoplibs/*.lib
-src/dynoplibs/*.manifest
-src/dynoplibs/*.o
-src/dynoplibs/*.obj
-src/dynoplibs/*.pdb
-src/dynoplibs/*.so
-src/dynoplibs/Defines.mak
-src/dynoplibs/Rules.mak
+/src/dynoplibs/*.bundle
+/src/dynoplibs/*.c
+/src/dynoplibs/*.dll
+/src/dynoplibs/*.exp
+/src/dynoplibs/*.h
+/src/dynoplibs/*.ilk
+/src/dynoplibs/*.lib
+/src/dynoplibs/*.manifest
+/src/dynoplibs/*.o
+/src/dynoplibs/*.obj
+/src/dynoplibs/*.pdb
+/src/dynoplibs/*.so
+/src/dynoplibs/Defines.mak
+/src/dynoplibs/Rules.mak
# generated from svn:ignore of 'src/dynpmc/'
-src/dynpmc/*.bundle
-src/dynpmc/*.c
-src/dynpmc/*.def
-src/dynpmc/*.dll
-src/dynpmc/*.dump
-src/dynpmc/*.dylib
-src/dynpmc/*.exe
-src/dynpmc/*.exp
-src/dynpmc/*.h
-src/dynpmc/*.ilk
-src/dynpmc/*.lib
-src/dynpmc/*.manifest
-src/dynpmc/*.o
-src/dynpmc/*.obj
-src/dynpmc/*.pdb
-src/dynpmc/*.so
-src/dynpmc/Makefile
-src/dynpmc/md2.pmc
-src/dynpmc/md4.pmc
-src/dynpmc/md5.pmc
-src/dynpmc/ripemd160.pmc
-src/dynpmc/sha.pmc
-src/dynpmc/sha1.pmc
-src/dynpmc/sha256.pmc
-src/dynpmc/sha512.pmc
+/src/dynpmc/*.bundle
+/src/dynpmc/*.c
+/src/dynpmc/*.def
+/src/dynpmc/*.dll
+/src/dynpmc/*.dump
+/src/dynpmc/*.dylib
+/src/dynpmc/*.exe
+/src/dynpmc/*.exp
+/src/dynpmc/*.h
+/src/dynpmc/*.ilk
+/src/dynpmc/*.lib
+/src/dynpmc/*.manifest
+/src/dynpmc/*.o
+/src/dynpmc/*.obj
+/src/dynpmc/*.pdb
+/src/dynpmc/*.so
+/src/dynpmc/Makefile
+/src/dynpmc/md2.pmc
+/src/dynpmc/md4.pmc
+/src/dynpmc/md5.pmc
+/src/dynpmc/ripemd160.pmc
+/src/dynpmc/sha.pmc
+/src/dynpmc/sha1.pmc
+/src/dynpmc/sha256.pmc
+/src/dynpmc/sha512.pmc
# generated from svn:ignore of 'src/gc/'
-src/gc/*.bundle
-src/gc/*.c
-src/gc/*.def
-src/gc/*.dll
-src/gc/*.dump
-src/gc/*.dylib
-src/gc/*.exe
-src/gc/*.exp
-src/gc/*.h
-src/gc/*.ilk
-src/gc/*.lib
-src/gc/*.manifest
-src/gc/*.o
-src/gc/*.obj
-src/gc/*.pdb
-src/gc/*.so
-src/gc/Makefile
+/src/gc/*.bundle
+/src/gc/*.c
+/src/gc/*.def
+/src/gc/*.dll
+/src/gc/*.dump
+/src/gc/*.dylib
+/src/gc/*.exe
+/src/gc/*.exp
+/src/gc/*.h
+/src/gc/*.ilk
+/src/gc/*.lib
+/src/gc/*.manifest
+/src/gc/*.o
+/src/gc/*.obj
+/src/gc/*.pdb
+/src/gc/*.so
+/src/gc/Makefile
# generated from svn:ignore of 'src/interp/'
-src/interp/*.o
-src/interp/*.str
+/src/interp/*.o
+/src/interp/*.str
# generated from svn:ignore of 'src/io/'
-src/io/*.o
-src/io/*.obj
-src/io/*.str
+/src/io/*.o
+/src/io/*.obj
+/src/io/*.str
# generated from svn:ignore of 'src/nci/'
-src/nci/*.o
-src/nci/*.obj
-src/nci/*.str
+/src/nci/*.o
+/src/nci/*.obj
+/src/nci/*.str
# generated from svn:ignore of 'src/ops/'
-src/ops/*.c
-src/ops/*.o
-src/ops/*.obj
+/src/ops/*.c
+/src/ops/*.o
+/src/ops/*.obj
# generated from svn:ignore of 'src/packfile/'
-src/packfile/*.o
-src/packfile/*.obj
+/src/packfile/*.o
+/src/packfile/*.obj
# generated from svn:ignore of 'src/pmc/'
-src/pmc/*.c
-src/pmc/*.dump
-src/pmc/*.h
-src/pmc/*.o
-src/pmc/*.obj
-src/pmc/*.str
-src/pmc/*.tmp
-src/pmc/Makefile
+/src/pmc/*.c
+/src/pmc/*.dump
+/src/pmc/*.h
+/src/pmc/*.o
+/src/pmc/*.obj
+/src/pmc/*.str
+/src/pmc/*.tmp
+/src/pmc/Makefile
# generated from svn:ignore of 'src/runcore/'
-src/runcore/*.o
-src/runcore/*.obj
-src/runcore/*.str
+/src/runcore/*.o
+/src/runcore/*.obj
+/src/runcore/*.str
# generated from svn:ignore of 'src/string/'
-src/string/*.o
-src/string/*.obj
-src/string/*.str
-src/string/private_cstring.h
+/src/string/*.o
+/src/string/*.obj
+/src/string/*.str
+/src/string/private_cstring.h
# generated from svn:ignore of 'src/string/charset/'
-src/string/charset/*.o
-src/string/charset/*.obj
+/src/string/charset/*.o
+/src/string/charset/*.obj
# generated from svn:ignore of 'src/string/encoding/'
-src/string/encoding/*.o
-src/string/encoding/*.obj
+/src/string/encoding/*.o
+/src/string/encoding/*.obj
# generated from svn:ignore of 't/benchmark/'
-t/benchmark/*.pasm
-t/benchmark/*.pir
+/t/benchmark/*.pasm
+/t/benchmark/*.pir
+# generated from svn:ignore of 't/compilers/data_json/'
+/t/compilers/data_json/*.pbc
+/t/compilers/data_json/*.pir
+/t/compilers/data_json/*_pbcexe
# generated from svn:ignore of 't/compilers/imcc/'
-t/compilers/imcc/*.pbc
+/t/compilers/imcc/*.pbc
# generated from svn:ignore of 't/compilers/imcc/imcpasm/'
-t/compilers/imcc/imcpasm/*.pasm
-t/compilers/imcc/imcpasm/*.pbc
-t/compilers/imcc/imcpasm/*.pir
-t/compilers/imcc/imcpasm/*_pbcexe
+/t/compilers/imcc/imcpasm/*.pasm
+/t/compilers/imcc/imcpasm/*.pbc
+/t/compilers/imcc/imcpasm/*.pir
+/t/compilers/imcc/imcpasm/*_pbcexe
# generated from svn:ignore of 't/compilers/imcc/reg/'
-t/compilers/imcc/reg/*.pasm
-t/compilers/imcc/reg/*.pbc
-t/compilers/imcc/reg/*.pir
-t/compilers/imcc/reg/*_pbcexe*
+/t/compilers/imcc/reg/*.pasm
+/t/compilers/imcc/reg/*.pbc
+/t/compilers/imcc/reg/*.pir
+/t/compilers/imcc/reg/*_pbcexe*
# generated from svn:ignore of 't/compilers/imcc/syn/'
-t/compilers/imcc/syn/*.pasm
-t/compilers/imcc/syn/*.pbc
-t/compilers/imcc/syn/*.pir
-t/compilers/imcc/syn/*_pbcexe*
-# generated from svn:ignore of 't/compilers/json/'
-t/compilers/json/*.pbc
-t/compilers/json/*.pir
-t/compilers/json/*_pbcexe
+/t/compilers/imcc/syn/*.pasm
+/t/compilers/imcc/syn/*.pbc
+/t/compilers/imcc/syn/*.pir
+/t/compilers/imcc/syn/*_pbcexe*
# generated from svn:ignore of 't/compilers/pct/'
-t/compilers/pct/*.pbc
-t/compilers/pct/*.pir
+/t/compilers/pct/*.pbc
+/t/compilers/pct/*.pir
# generated from svn:ignore of 't/compilers/pge/'
-t/compilers/pge/*.pasm
-t/compilers/pge/*.pbc
-t/compilers/pge/*.pir
-t/compilers/pge/*_pbcexe
+/t/compilers/pge/*.pasm
+/t/compilers/pge/*.pbc
+/t/compilers/pge/*.pir
+/t/compilers/pge/*_pbcexe
# generated from svn:ignore of 't/compilers/pge/p5regex/'
-t/compilers/pge/p5regex/*.pir
+/t/compilers/pge/p5regex/*.pir
# generated from svn:ignore of 't/compilers/pge/perl6regex/'
-t/compilers/pge/perl6regex/*.pbc
-t/compilers/pge/perl6regex/*.pir
+/t/compilers/pge/perl6regex/*.pbc
+/t/compilers/pge/perl6regex/*.pir
# generated from svn:ignore of 't/compilers/tge/'
-t/compilers/tge/*.pbc
-t/compilers/tge/*.pir
-t/compilers/tge/*_pbcexe
+/t/compilers/tge/*.pbc
+/t/compilers/tge/*.pir
+/t/compilers/tge/*_pbcexe
# generated from svn:ignore of 't/dynoplibs/'
-t/dynoplibs/*.pasm
-t/dynoplibs/*.pbc
-t/dynoplibs/*.pir
+/t/dynoplibs/*.pasm
+/t/dynoplibs/*.pbc
+/t/dynoplibs/*.pir
# generated from svn:ignore of 't/dynpmc/'
-t/dynpmc/*.pasm
-t/dynpmc/*.pbc
-t/dynpmc/*.pir
-t/dynpmc/*_pbcexe*
-t/dynpmc/md2.t
-t/dynpmc/md4.t
-t/dynpmc/md5.t
-t/dynpmc/ripemd160.t
-t/dynpmc/sha.t
-t/dynpmc/sha1.t
-t/dynpmc/sha256.t
-t/dynpmc/sha512.t
+/t/dynpmc/*.pasm
+/t/dynpmc/*.pbc
+/t/dynpmc/*.pir
+/t/dynpmc/*_pbcexe*
+/t/dynpmc/md2.t
+/t/dynpmc/md4.t
+/t/dynpmc/md5.t
+/t/dynpmc/ripemd160.t
+/t/dynpmc/sha.t
+/t/dynpmc/sha1.t
+/t/dynpmc/sha256.t
+/t/dynpmc/sha512.t
# generated from svn:ignore of 't/examples/'
-t/examples/*.pasm
-t/examples/*.pbc
-t/examples/*.pir
-t/examples/*_pbcexe*
+/t/examples/*.pasm
+/t/examples/*.pbc
+/t/examples/*.pir
+/t/examples/*_pbcexe*
# generated from svn:ignore of 't/library/'
-t/library/*.out
-t/library/*.pasm
-t/library/*.pbc
-t/library/*.pir
-t/library/*_pbcexe*
+/t/library/*.out
+/t/library/*.pasm
+/t/library/*.pbc
+/t/library/*.pir
+/t/library/*_pbcexe*
# generated from svn:ignore of 't/native_pbc/'
-t/native_pbc/*_pbcexe*
+/t/native_pbc/*_pbcexe*
# generated from svn:ignore of 't/oo/'
-t/oo/*.pbc
-t/oo/*.pir
+/t/oo/*.pbc
+/t/oo/*.pir
# generated from svn:ignore of 't/op/'
-t/op/*.out
-t/op/*.pasm
-t/op/*.pbc
-t/op/*.pir
-t/op/*_pbcexe*
+/t/op/*.out
+/t/op/*.pasm
+/t/op/*.pbc
+/t/op/*.pir
+/t/op/*_pbcexe*
# generated from svn:ignore of 't/perl/'
-t/perl/Parrot_Test_1.pasm
-t/perl/Parrot_Test_1.pir
+/t/perl/Parrot_Test_1.pasm
+/t/perl/Parrot_Test_1.pir
# generated from svn:ignore of 't/pmc/'
-t/pmc/*.out
-t/pmc/*.pasm
-t/pmc/*.pbc
-t/pmc/*.pir
-t/pmc/*_pbcexe*
+/t/pmc/*.out
+/t/pmc/*.pasm
+/t/pmc/*.pbc
+/t/pmc/*.pir
+/t/pmc/*_pbcexe*
# generated from svn:ignore of 't/src/'
-t/src/*_*
+/t/src/*_*
# generated from svn:ignore of 't/stress/'
-t/stress/*.out
-t/stress/*.pasm
-t/stress/*.pbc
-t/stress/*.pir
-t/stress/*_pbcexe*
+/t/stress/*.out
+/t/stress/*.pasm
+/t/stress/*.pbc
+/t/stress/*.pir
+/t/stress/*_pbcexe*
# generated from svn:ignore of 't/tools/'
-t/tools/*.pbc
-t/tools/*.pir
-t/tools/pdb.t.*
-t/tools/pmc2c.*.c
-t/tools/pmc2c.*.dump
-t/tools/pmc2c.*.h
-t/tools/pmc2c.*.pmc
+/t/tools/*.pbc
+/t/tools/*.pir
+/t/tools/pdb.t.*
+/t/tools/pmc2c.*.c
+/t/tools/pmc2c.*.dump
+/t/tools/pmc2c.*.h
+/t/tools/pmc2c.*.pmc
# Local variables:
# mode: text
# buffer-read-only: t
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/MANIFEST Sat Apr 24 04:36:29 2010 (r45972)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Apr 24 00:39:15 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Apr 24 03:05:21 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -61,11 +61,6 @@
compilers/imcc/symreg.c [imcc]
compilers/imcc/symreg.h [imcc]
compilers/imcc/unit.h [imcc]
-compilers/json/Defines.mak [json]
-compilers/json/JSON.pir [json]
-compilers/json/JSON/grammar.pg [json]
-compilers/json/JSON/pge2pir.tg [json]
-compilers/json/Rules.mak [json]
compilers/pct/Defines.mak [pct]
compilers/pct/PCT.pir [pct]
compilers/pct/README.pod []doc
@@ -1476,6 +1471,8 @@
t/codingstd/svn_id.t [test]
t/codingstd/tabs.t [test]
t/codingstd/trailing_space.t [test]
+t/compilers/data_json/from_parrot.t [test]
+t/compilers/data_json/to_parrot.t [test]
t/compilers/imcc/imcpasm/cfg.t [test]
t/compilers/imcc/imcpasm/opt0.t [test]
t/compilers/imcc/imcpasm/opt1.t [test]
@@ -1505,8 +1502,6 @@
t/compilers/imcc/syn/symbols.t [test]
t/compilers/imcc/syn/tail.t [test]
t/compilers/imcc/syn/veracity.t [test]
-t/compilers/json/from_parrot.t [test]
-t/compilers/json/to_parrot.t [test]
t/compilers/pct/complete_workflow.t [test]
t/compilers/pct/past.t [test]
t/compilers/pct/pct_hllcompiler.t [test]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/MANIFEST.SKIP Sat Apr 24 04:36:29 2010 (r45972)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Sat Apr 24 02:49:43 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat Apr 24 03:01:22 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -188,14 +188,6 @@
^compilers/imcc/imcparser\.h/
^compilers/imcc/imcparser\.output$
^compilers/imcc/imcparser\.output/
-# generated from svn:ignore of 'compilers/json/'
-^compilers/json/JSON\.pbc$
-^compilers/json/JSON\.pbc/
-# generated from svn:ignore of 'compilers/json/JSON/'
-^compilers/json/JSON/.*\.pbc$
-^compilers/json/JSON/.*\.pbc/
-^compilers/json/JSON/.*\.pir$
-^compilers/json/JSON/.*\.pir/
# generated from svn:ignore of 'compilers/pct/src/PAST/'
^compilers/pct/src/PAST/.*\.pbc$
^compilers/pct/src/PAST/.*\.pbc/
@@ -869,6 +861,13 @@
^t/benchmark/.*\.pasm/
^t/benchmark/.*\.pir$
^t/benchmark/.*\.pir/
+# generated from svn:ignore of 't/compilers/data_json/'
+^t/compilers/data_json/.*\.pbc$
+^t/compilers/data_json/.*\.pbc/
+^t/compilers/data_json/.*\.pir$
+^t/compilers/data_json/.*\.pir/
+^t/compilers/data_json/.*_pbcexe$
+^t/compilers/data_json/.*_pbcexe/
# generated from svn:ignore of 't/compilers/imcc/'
^t/compilers/imcc/.*\.pbc$
^t/compilers/imcc/.*\.pbc/
@@ -899,13 +898,6 @@
^t/compilers/imcc/syn/.*\.pir/
^t/compilers/imcc/syn/.*_pbcexe.*$
^t/compilers/imcc/syn/.*_pbcexe.*/
-# generated from svn:ignore of 't/compilers/json/'
-^t/compilers/json/.*\.pbc$
-^t/compilers/json/.*\.pbc/
-^t/compilers/json/.*\.pir$
-^t/compilers/json/.*\.pir/
-^t/compilers/json/.*_pbcexe$
-^t/compilers/json/.*_pbcexe/
# generated from svn:ignore of 't/compilers/pct/'
^t/compilers/pct/.*\.pbc$
^t/compilers/pct/.*\.pbc/
Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/MANIFEST.generated Sat Apr 24 04:36:29 2010 (r45972)
@@ -8,9 +8,6 @@
blib/lib/libparrot.so.2.3.0 [main]lib
blib/lib/libparrot.so [main]lib
compilers/data_json/data_json.pbc [data_json]
-compilers/json/JSON.pbc [json]
-compilers/json/JSON/grammar.pbc [json]
-compilers/json/JSON/pge2pir.pbc [json]
config/gen/call_list/opengl.in []
docs/ops/bit.pod [doc]
docs/ops/cmp.pod [doc]
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/config/gen/makefiles/root.in Sat Apr 24 04:36:29 2010 (r45972)
@@ -122,7 +122,6 @@
include compilers/pct/Defines.mak
include ext/nqp-rx/Defines.mak
include compilers/data_json/Defines.mak
-include compilers/json/Defines.mak
###############################################################################
#
@@ -604,7 +603,6 @@
$(TGE_LIB_PBCS) \
$(PGE_LIB_PBCS) \
$(PCT_LIB_PBCS) \
- $(JSON_LIB_PBCS) \
$(DATA_JSON_LIB_PBCS) \
$(NQP_LIB_PBCS) \
$(GEN_LIBRARY) \
@@ -1844,7 +1842,7 @@
$(RM_F) $(FLUID_FILES_1)
$(RM_F) $(FLUID_FILES_2)
$(RM_RF) lib/Parrot/OpLib
- $(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS) $(JSON_CLEANUPS)
+ $(RM_F) $(NQP_CLEANUPS) $(PGE_CLEANUPS) $(TGE_CLEANUPS)
$(RM_F) $(PIRC_CLEANUPS) $(PCT_CLEANUPS) $(DATA_JSON_CLEANUPS)
$(RM_F) $(GEN_PASM_INCLUDES) $(GEN_PM_INCLUDES) $(DYNOPLIBS_CLEANUPS)
@@ -2556,7 +2554,6 @@
include compilers/pct/Rules.mak
include compilers/tge/Rules.mak
include compilers/data_json/Rules.mak
-include compilers/json/Rules.mak
include ext/nqp-rx/Rules.mak
# Local variables:
Modified: trunk/lib/Parrot/Docs/Section/Compilers.pm
==============================================================================
--- trunk/lib/Parrot/Docs/Section/Compilers.pm Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/lib/Parrot/Docs/Section/Compilers.pm Sat Apr 24 04:36:29 2010 (r45972)
@@ -45,7 +45,7 @@
$self->new_group( 'PGE', 'the Parrot Grammar Engine', 'compilers/pge' ),
$self->new_group( 'TGE', 'the Tree Grammar Engine', 'compilers/tge' ),
$self->new_group( 'PCT', 'Parrot Compiler Toolkit', 'compilers/pct' ),
- $self->new_group( 'JSON', 'JavaScript Object Notation', 'compilers/json' ),
+ $self->new_group( 'JSON', 'JavaScript Object Notation', 'compilers/data_json' ),
$self->new_group( 'PIRC', 'a PIR Compiler', 'compilers/pirc' ),
$self->new_group( 'NCIGEN', 'Native Call Interface Generator', 'compilers/ncigen' ),
);
Modified: trunk/lib/Parrot/Harness/DefaultTests.pm
==============================================================================
--- trunk/lib/Parrot/Harness/DefaultTests.pm Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/lib/Parrot/Harness/DefaultTests.pm Sat Apr 24 04:36:29 2010 (r45972)
@@ -77,6 +77,7 @@
t/perl/*.t
);
+
# library tests are run unless --runcore-tests or --core-tests is present.
@library_tests = qw(
t/compilers/pct/*.t
@@ -84,6 +85,7 @@
t/compilers/pge/p5regex/*.t
t/compilers/pge/perl6regex/*.t
t/compilers/tge/*.t
+ t/compilers/data_json/*.t
t/library/*.t
t/tools/*.t
t/profiling/*.t
Modified: trunk/runtime/parrot/library/JSON.pir
==============================================================================
--- trunk/runtime/parrot/library/JSON.pir Sat Apr 24 04:26:43 2010 (r45971)
+++ trunk/runtime/parrot/library/JSON.pir Sat Apr 24 04:36:29 2010 (r45972)
@@ -12,7 +12,7 @@
load_bytecode 'JSON.pir'
$S0 = _json( $P0 )
-To generate a PMC from a JSON string, see L<compilers/json/JSON.pir>.
+To generate a PMC from a JSON string, see L<compilers/data_json>.
=cut
Deleted: trunk/t/compilers/json/.gitignore
==============================================================================
--- trunk/t/compilers/json/.gitignore Sat Apr 24 04:36:29 2010 (r45874)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,3 +0,0 @@
-/*_pbcexe
-/*.pbc
-/*.pir
Modified: trunk/t/compilers/data_json/from_parrot.t
==============================================================================
--- trunk/t/compilers/json/from_parrot.t Wed Apr 21 23:28:56 2010 (r45874)
+++ trunk/t/compilers/data_json/from_parrot.t Sat Apr 24 04:36:29 2010 (r45972)
@@ -4,11 +4,11 @@
=head1 NAME
-t/compilers/json/from_parrot.t - test parrot to JSON conversion.
+t/compilers/data_json/from_parrot.t - test parrot to JSON conversion.
=head1 SYNOPSIS
- % prove t/compilers/json/from_parrot.t
+ % prove t/compilers/data_json/from_parrot.t
=head1 DESCRIPTION
@@ -20,6 +20,7 @@
.include 'test_more.pir'
plan(39)
+ load_bytecode 'JSON.pbc'
test_create_json_of_an_empty_string()
test_create_json_of_a_non_empty_string()
test_create_json_of_a_string_with_simple_escapes()
@@ -46,7 +47,6 @@
.local string s
s = ''
- load_bytecode 'JSON.pbc'
$S0 = _json( s, 0 )
is($S0, '""', 'Create JSON of an empty string')
.end
@@ -57,7 +57,6 @@
.local string s
s = 'abcdeABCDE01234$%^&*'
- load_bytecode 'JSON.pbc'
$S0 = _json( s, 0 )
is($S0, '"abcdeABCDE01234$%^&*"', 'Create JSON of a non-empty string')
.end
@@ -68,7 +67,6 @@
.local string s
s = "abcde\\ABCDE\"01234\n$%^&*"
# XXX more escapes need to be tested; see http://www.json.org/
- load_bytecode 'JSON.pbc'
$S0 = _json( s, 0 )
is($S0, '"abcde\\ABCDE\"01234\n$%^&*"', 'Create JSON of a string with simple escapes')
.end
@@ -78,7 +76,6 @@
.sub test_create_json_of_some_integers
.local int i
i = 0
- load_bytecode 'JSON.pbc'
$S0 = _json( i, 0 )
is($S0, 0, 'Create JSON of some integers (0)')
i = 35
@@ -100,7 +97,6 @@
.sub test_create_json_of_some_numbers
.local num n
n = 0.0
- load_bytecode 'JSON.pbc'
$S0 = _json( n )
is($S0, 0, 'Create JSON of some numbers (0)')
n = 2.50
@@ -119,7 +115,6 @@
.sub test_create_json_of_various_scalars_with_pretty_option
.local string s
s = "abcde\\ABCDE\"01234\n$%^&*"
- load_bytecode 'JSON.pbc'
$S0 = _json( s, 1 )
is($S0, "\"abcde\\\\ABCDE\\\"01234\\n\$\%\^\&\*\"\n", 'Create JSON of various scalars with pretty option (string)')
@@ -152,7 +147,6 @@
array[8] = 8
array[9] = 9
- load_bytecode 'JSON.pbc'
$S0 = _json( array, 0 )
is($S0, '[0,1,2,3,4,5,6,7,8,9]', 'Create JSON of an array')
.end
@@ -175,7 +169,6 @@
array[8] = 8
array[9] = 9
- load_bytecode 'JSON.pbc'
$S0 = _json( array, 1 )
is($S0, <<'OUTPUT', 'Create pretty JSON of an array')
[
@@ -207,7 +200,6 @@
array[4] = -2147483648
array[5] = 2147483647
- load_bytecode 'JSON.pbc'
$S0 = _json( array, 1 )
is($S0, <<'OUTPUT', 'Create JSON of an array, keep element ordering')
[
@@ -235,7 +227,6 @@
array[4] = "json"
array[5] = 0.0
- load_bytecode 'JSON.pbc'
$S0 = _json( array, 1 )
is($S0, <<'OUTPUT', 'Create JSON of a mixed array')
[
@@ -260,7 +251,6 @@
hash["gamma"] = 3.1
hash["delta"] = "DELTA"
- load_bytecode 'JSON.pbc'
$S0 = _json( hash, 1 )
is($S0, <<'OUTPUT', 'Create JSON of hash')
{
@@ -283,7 +273,6 @@
hash["gamma"] = 3.1
hash["delta"] = "DELTA"
- load_bytecode 'JSON.pbc'
$S0 = _json( hash, 0 )
is($S0, '{"alpha":29,"beta":"B","delta":"DELTA","gamma":3.1}', 'Create non-pretty JSON of hash')
.end
@@ -304,9 +293,9 @@
push city1, street1
push city1, street2
- city2 = new 'Array' # empty
+ city2 = new 'FixedPMCArray' # empty
- country = new 'Array'
+ country = new 'FixedPMCArray'
country = 2
country[0] = city1
country[1] = city2
@@ -315,7 +304,6 @@
world["population"] = 1234567890
world["some_country"] = country
- load_bytecode 'JSON.pbc'
$S0 = _json( world, 1 )
is($S0, <<'OUTPUT', 'Create JSON of nested structure including ResizablePMCArray and empties')
{
@@ -353,9 +341,9 @@
push city1, street1
push city1, street2
- city2 = new 'Array' # empty
+ city2 = new 'FixedPMCArray' # empty
- country = new 'Array'
+ country = new 'FixedPMCArray'
country = 2
country[0] = city1
country[1] = city2
@@ -364,7 +352,6 @@
world["population"] = 1234567890
world["some_country"] = country
- load_bytecode 'JSON.pbc'
$S0 = _json( world, 0 )
is($S0, '{"population":1234567890,"some_country":[[{"Perl":"Highway","Python":"Grove","Ruby":"Lane"},{}],[]]}', 'Create non-pretty JSON of nested structure')
.end
@@ -376,7 +363,6 @@
s = new 'String'
s = ''
- load_bytecode 'JSON.pbc'
$S0 = _json( s, 0 )
is($S0, '""', 'Create JSON of String PMCs')
$S0 = _json( s, 1 )
@@ -397,7 +383,6 @@
i = new 'Integer'
i = 0
- load_bytecode 'JSON.pbc'
$S0 = _json( i, 0 )
is($S0, 0, 'Create JSON of String PMCs')
$S0 = _json( i, 1 )
@@ -418,7 +403,6 @@
b = new 'Boolean'
b = 0
- load_bytecode 'JSON.pbc'
$S0 = _json( b, 0 )
is($S0, 'false', 'Create JSON of Boolean PMCs')
$S0 = _json( b, 1 )
@@ -438,7 +422,6 @@
.local pmc n
null n
- load_bytecode 'JSON.pbc'
$S0 = _json( n, 0 )
is($S0, 'null', 'Create JSON of null and .Undef')
$S0 = _json( n, 1 )
Modified: trunk/t/compilers/data_json/to_parrot.t
==============================================================================
--- trunk/t/compilers/json/to_parrot.t Wed Apr 21 23:28:56 2010 (r45874)
+++ trunk/t/compilers/data_json/to_parrot.t Sat Apr 24 04:36:29 2010 (r45972)
@@ -11,11 +11,11 @@
=head1 NAME
-t/compilers/json/to_parrot.t - test JSON to parrot conversions
+t/compilers/data_json/to_parrot.t - test JSON to parrot conversions
=head1 SYNOPSIS
- % prove t/compilers/json/to_parrot.t
+ % prove t/compilers/data_json/to_parrot.t
=head1 DESCRIPTION
@@ -689,12 +689,13 @@
return pir_output_is( <<"END_PIR", $dumped, $reason, %args );
.sub test :main
- load_bytecode 'compilers/json/JSON.pbc'
+ load_language 'data_json'
load_bytecode 'dumper.pbc'
- .local pmc JSON, result
- JSON = compreg "JSON"
- result = JSON("$code")
+ .local pmc JSON, eval, result
+ JSON = compreg 'data_json'
+ eval = JSON.'compile'("$code")
+ result = eval()
_dumper(result, "JSON")
.end
END_PIR
@@ -710,11 +711,13 @@
return pir_error_output_like( <<"END_PIR", qr/not a valid JSON value/, $reason, %args );
.sub test :main
- load_bytecode 'compilers/json/JSON.pbc'
+ load_language 'data_json'
- .local pmc JSON, result
- JSON = compreg "JSON"
- result = JSON("$code")
+ .local pmc JSON, eval, result
+
+ JSON = compreg 'data_json'
+ eval = JSON.'compile'("$code")
+ result = eval()
.end
END_PIR
More information about the parrot-commits
mailing list