Permalink
Browse files

Sync with trunk

git-svn-id: https://svn.parrot.org/parrot/branches/gsoc_nfg@48230 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent 20547fd commit 79a76f60ada7356f93a07fc97975d5dc3a6c9e8c @darbelo darbelo committed Jul 30, 2010
View
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Tue Jul 20 08:39:24 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Jul 29 08:25:21 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -619,7 +619,6 @@ examples/languages/abc/t/abc_functions [examples]
examples/languages/abc/t/abc_special_variables [examples]
examples/languages/abc/t/abc_statement [examples]
examples/languages/squaak/MAINTAINER [examples]
-examples/languages/squaak/PARROT_REVISION [examples]
examples/languages/squaak/README [examples]
examples/languages/squaak/doc/tutorial_episode_1.pod [examples]
examples/languages/squaak/doc/tutorial_episode_2.pod [examples]
View
@@ -147,7 +147,7 @@ static void fixup_globals(PARROT_INTERP)
__attribute__nonnull__(1);
PARROT_WARN_UNUSED_RESULT
-static size_t get_codesize(PARROT_INTERP,
+static size_t get_code_size(PARROT_INTERP,
ARGIN(const IMC_Unit *unit),
ARGOUT(size_t *src_lines))
__attribute__nonnull__(1)
@@ -257,7 +257,7 @@ static void verify_signature(PARROT_INTERP,
, PARROT_ASSERT_ARG(pc))
#define ASSERT_ARGS_fixup_globals __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_get_codesize __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_get_code_size __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(unit) \
, PARROT_ASSERT_ARG(src_lines))
@@ -630,7 +630,7 @@ store_key_const(PARROT_INTERP, ARGIN(const char *str), int idx)
/*
-=item C<static size_t get_codesize(PARROT_INTERP, const IMC_Unit *unit, size_t
+=item C<static size_t get_code_size(PARROT_INTERP, const IMC_Unit *unit, size_t
*src_lines)>
Stores globals for later fixup, returning the code size in number of ops.
@@ -641,9 +641,9 @@ Stores globals for later fixup, returning the code size in number of ops.
PARROT_WARN_UNUSED_RESULT
static size_t
-get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_lines))
+get_code_size(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_lines))
{
- ASSERT_ARGS(get_codesize)
+ ASSERT_ARGS(get_code_size)
Instruction *ins = unit->instructions;
size_t code_size;
@@ -669,7 +669,7 @@ get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_line
else if (ins->opname && *ins->opname) {
(*src_lines)++;
if (ins->opnum < 0)
- IMCC_fatal(interp, 1, "get_codesize: "
+ IMCC_fatal(interp, 1, "get_code_size: "
"no opnum ins#%d %I\n",
ins->index, ins);
@@ -685,7 +685,7 @@ get_codesize(PARROT_INTERP, ARGIN(const IMC_Unit *unit), ARGOUT(size_t *src_line
code_size += ins->opsize;
}
else if (ins->opsize)
- IMCC_fatal(interp, 1, "get_codesize: "
+ IMCC_fatal(interp, 1, "get_code_size: "
"non instruction with size found\n");
}
@@ -2233,50 +2233,50 @@ e_pbc_emit(PARROT_INTERP, SHIM(void *param), ARGIN(const IMC_Unit *unit),
/* first instruction, do initialisation ... */
if (ins == unit->instructions) {
- size_t ins_size;
- const size_t oldsize = get_old_size(interp,
+ size_t ins_size, seg_size;
+ const size_t old_size = get_old_size(interp,
&IMCC_INFO(interp)->ins_line);
- const size_t code_size = get_codesize(interp, unit, &ins_size);
- const size_t bytes = (oldsize + code_size) * sizeof (opcode_t);
+ const size_t code_size = get_code_size(interp, unit, &ins_size);
+ const size_t bytes = (old_size + code_size) * sizeof (opcode_t);
- IMCC_debug(interp, DEBUG_PBC, "code_size(ops) %d oldsize %d\n",
- code_size, oldsize);
+ IMCC_debug(interp, DEBUG_PBC, "code_size(ops) %d old_size %d\n",
+ code_size, old_size);
constant_folding(interp, unit);
store_sub_size(interp, code_size, ins_size);
/* allocate code */
- interp->code->base.data = (opcode_t *)
+ interp->code->base.data = (opcode_t *)
mem_sys_realloc(interp->code->base.data, bytes);
/* reallocating this removes its mmaped-ness; needs encapsulation */
interp->code->base.pf->is_mmap_ped = 0;
- interp->code->base.size = oldsize + code_size;
+ interp->code->base.size = old_size + code_size;
- IMCC_INFO(interp)->pc = (opcode_t *)interp->code->base.data + oldsize;
- IMCC_INFO(interp)->npc = 0;
+ IMCC_INFO(interp)->pc = (opcode_t *)interp->code->base.data + old_size;
+ IMCC_INFO(interp)->npc = 0;
/* FIXME length and multiple subs */
- IMCC_INFO(interp)->debug_seg = Parrot_new_debug_seg(interp,
- interp->code,
- (size_t)IMCC_INFO(interp)->ins_line + ins_size + 1);
+ seg_size = (size_t)IMCC_INFO(interp)->ins_line + ins_size + 1;
+ IMCC_INFO(interp)->debug_seg =
+ Parrot_new_debug_seg(interp, interp->code, seg_size);
Parrot_debug_add_mapping(interp, IMCC_INFO(interp)->debug_seg,
- IMCC_INFO(interp)->ins_line, unit->file);
+ old_size, unit->file);
/* if item is a PCC_SUB entry then store it constants */
if (ins->symregs[0] && ins->symregs[0]->pcc_sub) {
- add_const_pmc_sub(interp, ins->symregs[0], oldsize,
- oldsize + code_size);
+ add_const_pmc_sub(interp, ins->symregs[0], old_size,
+ old_size + code_size);
}
else {
/* need a dummy to hold register usage */
SymReg * const r = mk_sub_label(interp, "(null)");
r->type = VT_PCC_SUB;
r->pcc_sub = mem_gc_allocate_zeroed_typed(interp, pcc_sub_t);
- add_const_pmc_sub(interp, r, oldsize, oldsize + code_size);
+ add_const_pmc_sub(interp, r, old_size, old_size + code_size);
}
}
View
@@ -312,7 +312,8 @@ sub _handle_icushared {
else {
# on MacOS X there's sometimes an errornous \c at the end of the
# output line. Remove it.
- $icushared =~ s/\s\\c$//;
+ # see TT #1722
+ $icushared =~ s/\s\\c\s/ /g;
}
}
View
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2009, Parrot Foundation.
+# Copyright (C) 2001-2010, Parrot Foundation.
# $Id$
=head1 NAME
@@ -69,6 +69,14 @@ sub runstep {
my $cwd = cwd();
$cwd =~ s{ }{\\ }g;
+ # Build directory can have non ascii characters
+ # Maybe not the better fix, but allows keep working on the issue.
+ # See TT #1717
+ my $cwdcharset = q{};
+ if ($cwd =~ /[^[:ascii:]]/) {
+ $cwdcharset = 'binary:';
+ }
+
my $pkg = __PACKAGE__;
print {$OUT} <<"END";
# ex: set ro:
@@ -121,6 +129,8 @@ END
die "type of '$k' is not supported : $type\n";
}
# String
+ $v =~ s/\\/\\\\/g;
+ $v =~ s/\\\\"/\\"/g;
# escape unescaped double quotes
$v =~ s/(?<!\\)"/\\"/g;
$v =~ s/\n/\\n/g;
@@ -136,7 +146,7 @@ END
}
}
}
- elsif (s/\@PWD\@/$cwd/) {
+ elsif (s/\"\@PWD\@\"/$cwdcharset\"$cwd\"/) {
print {$OUT} $_;
}
else {
@@ -987,18 +987,9 @@ $(INSTALLABLEPROVE) : parrot-prove.pbc $(PBC_TO_EXE) src/install_config$(O)
# Parrot Debugger
#
-src/parrot_debugger$(O) : $(INC_DIR)/embed.h \
- src/parrot_debugger.c \
- $(INC_DIR)/runcore_api.h \
- compilers/imcc/imc.h $(PARROT_H_HEADERS) compilers/imcc/parser.h \
- compilers/imcc/cfg.h \
- compilers/imcc/debug.h \
- compilers/imcc/imcparser.h \
- compilers/imcc/instructions.h \
- compilers/imcc/sets.h \
- compilers/imcc/symreg.h \
- compilers/imcc/unit.h \
- $(INC_DIR)/oplib/ops.h
+src/parrot_debugger$(O) : $(PARROT_H_HEADERS) src/parrot_debugger.c \
+ $(INC_DIR)/embed.h \
+ $(INC_DIR)/runcore_api.h
$(PDB) : src/parrot_debugger$(O) src/parrot_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
@@ -1 +0,0 @@
-47087
@@ -425,7 +425,7 @@ find out how you do such a binding).
method assignment($/) {
my $lhs := $<primary>.ast;
- my $rhs := $<expression>.ast;
+ my $rhs := $<EXPR>.ast;
$lhs.lvalue(1);
make PAST::Op.new( $lhs, $rhs, :pasttype('bind'), :node($/) );
}
@@ -437,7 +437,7 @@ Note that we set the lvalue flag on $lhs. See PDD26 for details on this flag.
Write the action method for stat_or_def. Simply retrieve the result object from statement and make
that the result object.
- method stat_or_def {
+ method stat_or_def($/) {
make $<statement>.ast;
}
Oops, something went wrong.

0 comments on commit 79a76f6

Please sign in to comment.