Skip to content

Commit

Permalink
Merge branch 'master' of github.com:parrot/parrot
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimmy Zhuo committed Nov 29, 2010
2 parents 51cfb38 + e72cca0 commit 6138a06
Show file tree
Hide file tree
Showing 229 changed files with 3,465 additions and 46,624 deletions.
14 changes: 0 additions & 14 deletions .gitignore
View file
Expand Up @@ -79,7 +79,6 @@
/pbc_to_exe
/pbc_to_exe.*
/perl6
/pirc
/tags
/temp.file
/test
Expand Down Expand Up @@ -126,19 +125,6 @@
/compilers/pge/PGE.pbc
# generated from svn:ignore of 'compilers/pge/PGE/'
/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
# 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
# generated from svn:ignore of 'compilers/tge/'
/compilers/tge/tgc.pbc
# generated from svn:ignore of 'compilers/tge/TGE/'
Expand Down
3 changes: 3 additions & 0 deletions CREDITS
View file
Expand Up @@ -705,6 +705,9 @@ D: Resizable*Array PMCs
N: Matt Kennedy
D: Some Env PMC method implementations and tests

N: Matt Rajca
D: Code refactoring

N: Mattia Barbon
D: Win32 fixes, dynamic PMC creation and loading

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
View file
Expand Up @@ -232,7 +232,7 @@
well as keys; the corresponding namespace PMC methods are gone.

2006.07.21 leo
* Parrot_exit, Parrot_on_exit take now an Interp * argument
* Parrot_x_exit, Parrot_x_on_exit take now an Interp * argument

2006.07.25 chip
* add experimental op find_type_i_p
Expand Down
23 changes: 7 additions & 16 deletions DEPRECATED.pod
View file
Expand Up @@ -49,10 +49,6 @@ L<https://trac.parrot.org/parrot/ticket/1580>

L<https://trac.parrot.org/parrot/ticket/1599>

=item CodeString [eligible in 2.7]

L<http://trac.parrot.org/parrot/ticket/1633>

=item multiple dispatch within core PMCs [eligible in 1.1]

L<https://trac.parrot.org/parrot/ticket/452>
Expand Down Expand Up @@ -204,25 +200,13 @@ These will be changed to allow more flexibility in types.

L<https://trac.parrot.org/parrot/ticket/1565>

=item find_lex [eligible in 2.4]

find_lex will not throw exception for non-existing lexicals.

L<https://trac.parrot.org/parrot/ticket/1207>

=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 find_codepoint [experimental]

Intended to replace the CodeString charname_to_ord method.

L<https://trac.parrot.org/parrot/ticket/1629>

=item finalize [experimental]

Finalize exception handler, unrolling inner runloops if needed.
Expand Down Expand Up @@ -357,6 +341,13 @@ L<https://trac.parrot.org/parrot/ticket/1564>

Load a .pbc file into the interpreter. Experimental.

=item GC timely destruction [eligible in 3.1]

All PIR ops and internal semantics related to timely destruction of PMCs
is deprecated.

L<http://trac.parrot.org/parrot/ticket/1800>

=back

=head1 Compiler tools
Expand Down
55 changes: 0 additions & 55 deletions MANIFEST
View file
Expand Up @@ -107,59 +107,6 @@ compilers/pge/PGE/builtins.pg [pge]
compilers/pge/README.pod []doc
compilers/pge/Rules.mak [pge]
compilers/pge/STATUS [pge]
compilers/pirc/Defines.mak [pirc]
compilers/pirc/README.pod []doc
compilers/pirc/Rules.mak [pirc]
compilers/pirc/TODO [pirc]
compilers/pirc/heredoc/heredocmain.c [pirc]
compilers/pirc/macro/lexer.h [pirc]
compilers/pirc/macro/macro.h [pirc]
compilers/pirc/macro/macro.l [pirc]
compilers/pirc/macro/macro.y [pirc]
compilers/pirc/macro/macrolexer.c [pirc]
compilers/pirc/macro/macrolexer.h [pirc]
compilers/pirc/macro/macroparser.c [pirc]
compilers/pirc/macro/macroparser.h [pirc]
compilers/pirc/src/bcgen.c [pirc]
compilers/pirc/src/bcgen.h [pirc]
compilers/pirc/src/hdocprep.c [pirc]
compilers/pirc/src/hdocprep.l [pirc]
compilers/pirc/src/main.c [pirc]
compilers/pirc/src/pir.l [pirc]
compilers/pirc/src/pir.y [pirc]
compilers/pirc/src/pircapi.c [pirc]
compilers/pirc/src/pircapi.h [pirc]
compilers/pirc/src/pircompiler.c [pirc]
compilers/pirc/src/pircompiler.h [pirc]
compilers/pirc/src/pircompunit.c [pirc]
compilers/pirc/src/pircompunit.h [pirc]
compilers/pirc/src/pirdefines.h [pirc]
compilers/pirc/src/piremit.c [pirc]
compilers/pirc/src/piremit.h [pirc]
compilers/pirc/src/pirerr.c [pirc]
compilers/pirc/src/pirerr.h [pirc]
compilers/pirc/src/pirheredoc.h [pirc]
compilers/pirc/src/pirlexer.c [pirc]
compilers/pirc/src/pirlexer.h [pirc]
compilers/pirc/src/pirmacro.c [pirc]
compilers/pirc/src/pirmacro.h [pirc]
compilers/pirc/src/pirop.c [pirc]
compilers/pirc/src/pirop.h [pirc]
compilers/pirc/src/pirparser.c [pirc]
compilers/pirc/src/pirparser.h [pirc]
compilers/pirc/src/pirpcc.c [pirc]
compilers/pirc/src/pirpcc.h [pirc]
compilers/pirc/src/pirregalloc.c [pirc]
compilers/pirc/src/pirregalloc.h [pirc]
compilers/pirc/src/pirsymbol.c [pirc]
compilers/pirc/src/pirsymbol.h [pirc]
compilers/pirc/src/piryy.h [pirc]
compilers/pirc/t/basic.t [test]
compilers/pirc/t/harness [test]
compilers/pirc/t/heredoc.t [test]
compilers/pirc/t/macro.t [test]
compilers/pirc/t/stmts.t [test]
compilers/pirc/t/subflags.t [test]
compilers/tge/Defines.mak [tge]
compilers/tge/README []doc
compilers/tge/Rules.mak [tge]
Expand Down Expand Up @@ -1384,7 +1331,6 @@ src/pmc/bytebuffer.pmc []
src/pmc/callcontext.pmc []
src/pmc/capture.pmc []
src/pmc/class.pmc []
src/pmc/codestring.pmc []
src/pmc/complex.pmc []
src/pmc/continuation.pmc []
src/pmc/coroutine.pmc []
Expand Down Expand Up @@ -1877,7 +1823,6 @@ t/pmc/bytebuffer.t [test]
t/pmc/callcontext.t [test]
t/pmc/capture.t [test]
t/pmc/class.t [test]
t/pmc/codestring.t [test]
t/pmc/complex.t [test]
t/pmc/config.t [test]
t/pmc/context.t [test]
Expand Down
24 changes: 0 additions & 24 deletions MANIFEST.SKIP
View file
Expand Up @@ -116,28 +116,6 @@
^/compilers/pge/PGE/builtins_gen\.pir/
^/compilers/pge/PGE\.pbc$
^/compilers/pge/PGE\.pbc/
^/compilers/pirc/.*\.o$
^/compilers/pirc/.*\.o/
^/compilers/pirc/.*\.obj$
^/compilers/pirc/.*\.obj/
^/compilers/pirc/.*\.pbd$
^/compilers/pirc/.*\.pbd/
^/compilers/pirc/pirc$
^/compilers/pirc/pirc/
^/compilers/pirc/pirc\.exe$
^/compilers/pirc/pirc\.exe/
^/compilers/pirc/t/basic_??\.pir$
^/compilers/pirc/t/basic_??\.pir/
^/compilers/pirc/t/basic_?\.pir$
^/compilers/pirc/t/basic_?\.pir/
^/compilers/pirc/t/heredoc_?\.pir$
^/compilers/pirc/t/heredoc_?\.pir/
^/compilers/pirc/t/macro_?\.pir$
^/compilers/pirc/t/macro_?\.pir/
^/compilers/pirc/t/stmts_?\.pir$
^/compilers/pirc/t/stmts_?\.pir/
^/compilers/pirc/t/subflags_?\.pir$
^/compilers/pirc/t/subflags_?\.pir/
^/compilers/tge/TGE/Parser\.pir$
^/compilers/tge/TGE/Parser\.pir/
^/compilers/tge/tgc\.pbc$
Expand Down Expand Up @@ -446,8 +424,6 @@
^/pbc_to_exe\..*/
^/perl6$
^/perl6/
^/pirc$
^/pirc/
^/ports$
^/ports/
^/runtime/parrot/dynext/.*\.bundle$
Expand Down
7 changes: 6 additions & 1 deletion NEWS
View file
@@ -1,6 +1,11 @@
New in 2.11.0
- Core
+ Just In Time native call frame generation using LibFFI
+ PIR op find_codepoint is no longer experimental, it is now supported
+ Several public functions in libparrot have been brought up to standard naming conventions.
- Languages
+ PIRC
- left the nest and is currently at https://github.com/parrot/pirc/

New in 2.10.0
- Core
Expand Down Expand Up @@ -87,7 +92,7 @@ New in 2.8.0
+ Parrot is now mirrored on github at http://github.com/parrot/parrot
- Compilers
+ Fixed problem with imcc HLL in load_bytecode difference between loading a pbc and compiling a pir

New in 2.7.0
- Core
+ cleanups in packfile and freeze/thaw handling
Expand Down
2 changes: 2 additions & 0 deletions PBC_COMPAT
View file
Expand Up @@ -28,6 +28,8 @@

# please insert tab separated entries at the top of the list

9.3 2010.11.24 NotFound move op find_codepoint out of experimental TT #1629
9.2 2010.11.21 plobsing remove CodeString PMC
9.1 2010.10.27 nwellnhof remove charset ops
9.0 2010.10.19 gerd released 2.9.0
8.0 2010.07.20 coke released 2.6.0
Expand Down
1 change: 0 additions & 1 deletion RESPONSIBLE_PARTIES
View file
Expand Up @@ -56,7 +56,6 @@ Core Developer Jonathan Worthington

Compiler Developer Patrick Michaud (PGE, PCT)
Allison Randal (TGE)
Klaas-Jan Stol (PIRC)

Platform Porter Allison Randal (Debian, Ubuntu)
Francois Perrad (MinGW32)
Expand Down
31 changes: 31 additions & 0 deletions compilers/data_json/data_json.pir
View file
Expand Up @@ -52,6 +52,7 @@ the documentation at L<http://www.json.org/>.

.sub 'compile' :method
.param string json_string
.param pmc opts :slurpy :named

.local pmc parse, match
parse = get_root_global ['parrot'; 'JSON'], 'value'
Expand All @@ -67,6 +68,14 @@ the documentation at L<http://www.json.org/>.
pirbuilder = pirgrammar.'apply'(match)
pir = pirbuilder.'get'('result')

$I0 = exists opts['target']
unless $I0 goto no_targ
$S0 = opts['target']
unless $S0 == 'pir' goto not_pir
.return (pir)
not_pir:
no_targ:

.local pmc pirc, result
pirc = compreg 'PIR'
result = pirc(pir)
Expand All @@ -81,6 +90,28 @@ the documentation at L<http://www.json.org/>.

.HLL 'parrot'

.sub unique_pmc_reg
$P0 = get_root_global ['parrot';'PGE';'Util'], 'unique'
$I0 = $P0()
$S0 = $I0
$S0 = concat "$P", $S0
.return ($S0)
.end

.sub appendln
.param pmc sb
.param string line
push sb, line
push sb, "\n"
.end

.sub 'sprintf'
.param string fmt
.param pmc args :slurpy
$S0 = sprintf fmt, args
.return ($S0)
.end

.include 'compilers/data_json/data_json/grammar.pir'
.include 'compilers/data_json/data_json/pge2pir.pir'

Expand Down

0 comments on commit 6138a06

Please sign in to comment.