Browse files

Remove embed.h (and all traces of it) and embed.c. Get things buildin…

…g again
  • Loading branch information...
1 parent 1cb5265 commit c989e15304e701a0257117712ebebaee5a1de749 @Whiteknight Whiteknight committed Aug 6, 2011
View
2 compilers/imcc/Rules.in
@@ -87,7 +87,6 @@ compilers/imcc/parser_util$(O) : \
include/imcc/yyscanner.h \
include/imcc/embed.h \
$(INC_DIR)/dynext.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) \
include/pmc/pmc_sub.h
@@ -192,7 +191,6 @@ compilers/imcc/main$(O) : \
compilers/imcc/symreg.h \
compilers/imcc/unit.h \
include/imcc/yyscanner.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h \
$(INC_DIR)/api.h \
View
2 compilers/imcc/main.c
@@ -29,7 +29,7 @@ IMCC helpers.
#include <stdlib.h>
#include "imc.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/longopt.h"
#include "parrot/runcore_api.h"
#include "pmc/pmc_callcontext.h"
View
1 compilers/imcc/parser_util.c
@@ -19,7 +19,6 @@
#include "imc.h"
#include "parrot/dynext.h"
-#include "parrot/embed.h"
#include "pmc/pmc_sub.h"
#include "pmc/pmc_callcontext.h"
#include "pbc.h"
View
22 config/gen/makefiles/root.in
@@ -370,6 +370,7 @@ PARROT_H_HEADERS = \
$(INC_DIR)/pmc_freeze.h \
$(INC_DIR)/vtable.h \
$(INC_DIR)/context.h \
+ $(INC_DIR)/disassemble.h \
$(INC_DIR)/exceptions.h \
$(INC_DIR)/warnings.h \
$(INC_DIR)/memory.h \
@@ -1053,8 +1054,7 @@ $(INSTALLABLEPROVE) : parrot-prove.pbc $(PBC_TO_EXE) src/install_config$(O)
frontend/parrot_debugger/main$(O) : \
$(PARROT_H_HEADERS) \
frontend/parrot_debugger/main.c \
- $(INC_DIR)/runcore_api.h \
- $(INC_DIR)/embed.h
+ $(INC_DIR)/runcore_api.h
$(PDB) : frontend/parrot_debugger/main$(O) src/parrot_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$@ \
@@ -1111,7 +1111,6 @@ $(PDUMP) : frontend/pbc_dump/main$(O) frontend/pbc_dump/packdump$(O) $(LIBPARROT
frontend/pbc_dump/main$(O) : \
$(INC_DIR)/longopt.h \
$(INC_DIR)/api.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/oplib/core_ops.h \
$(PARROT_H_HEADERS) \
@@ -1449,10 +1448,10 @@ src/runcore/trace$(O) : \
$(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/runcore_api.h
-src/debug$(O) : $(INC_DIR)/embed.h $(INC_DIR)/extend.h \
+src/debug$(O) : $(INC_DIR)/extend.h \
$(PARROT_H_HEADERS) src/debug.c \
$(INC_DIR)/oplib/ops.h \
- $(INC_DIR)/oplib/core_ops.h \
+ $(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/runcore_api.h $(INC_DIR)/runcore_trace.h \
src/debug.str include/pmc/pmc_key.h \
include/pmc/pmc_continuation.h \
@@ -1511,7 +1510,7 @@ src/runcore/profiling$(O) : src/runcore/profiling.str src/runcore/profiling.c \
include/pmc/pmc_sub.h \
include/pmc/pmc_namespace.h \
$(INC_DIR)/oplib/core_ops.h $(INC_DIR)/runcore_api.h \
- $(INC_DIR)/runcore_profiling.h $(INC_DIR)/embed.h \
+ $(INC_DIR)/runcore_profiling.h \
$(PARROT_H_HEADERS) \
$(INC_DIR)/extend.h \
$(INC_DIR)/extend_vtable.h
@@ -1607,7 +1606,6 @@ src/packfile/api$(O) : \
include/pmc/pmc_packfileview.h \
$(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/dynext.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/extend.h \
$(INC_DIR)/extend_vtable.h \
$(PARROT_H_HEADERS) \
@@ -1621,7 +1619,6 @@ src/packfile/output$(O) : \
$(INC_DIR)/extend.h \
$(INC_DIR)/runcore_api.h \
src/packfile/pf_private.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/core_ops.h \
src/packfile/output.c
@@ -1635,7 +1632,6 @@ src/packfile/segments$(O) : \
src/packfile/segments.str \
$(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/dynext.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/extend.h \
$(INC_DIR)/extend_vtable.h \
$(PARROT_H_HEADERS) \
@@ -1730,12 +1726,12 @@ src/platform/win32/uid$(O) : src/platform/win32/uid.c $(PARROT_H_HEADERS)
src/runcore/cores$(O) : src/runcore/cores.str \
src/runcore/cores.c \
include/pmc/pmc_sub.h \
- $(INC_DIR)/dynext.h $(INC_DIR)/embed.h $(INC_DIR)/oplib/core_ops.h \
+ $(INC_DIR)/dynext.h $(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/oplib/ops.h \
$(INC_DIR)/runcore_api.h $(INC_DIR)/runcore_trace.h \
$(PARROT_H_HEADERS)
-src/diassemble$(O) : \
+src/disassemble$(O) : \
$(PARROT_H_HEADERS) \
src/disassemble.c \
$(INC_DIR)/oplib/ops.h \
@@ -1748,7 +1744,6 @@ src/diassemble$(O) : \
src/embed/api$(O) : \
$(PARROT_H_HEADERS) \
$(INC_DIR)/api.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/runcore_api.h \
src/embed/api.c \
src/embed/embed_private.h \
@@ -1757,7 +1752,6 @@ src/embed/api$(O) : \
src/embed/bytecode$(O) : \
$(PARROT_H_HEADERS) \
$(INC_DIR)/api.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/runcore_api.h \
src/embed/bytecode.c \
src/embed/embed_private.h \
@@ -1909,7 +1903,6 @@ src/string/encoding/ucs4$(O) : \
src/string/encoding/unicode.h
frontend/pbc_merge/main$(O) : \
- $(INC_DIR)/embed.h \
$(INC_DIR)/api.h \
$(INC_DIR)/longopt.h \
frontend/pbc_merge/main.c \
@@ -1933,7 +1926,6 @@ src/atomic/gcc_x86$(O) : $(PARROT_H_HEADERS) src/atomic/gcc_x86.c
src/ops/core_ops$(O) : src/ops/core_ops.c \
$(PARROT_H_HEADERS) \
$(INC_DIR)/dynext.h \
- $(INC_DIR)/embed.h \
$(INC_DIR)/oplib/core_ops.h \
$(INC_DIR)/runcore_api.h \
include/pmc/pmc_continuation.h \
View
7 docs/embed.pod
@@ -12,8 +12,8 @@ for the newer API is located at F<docs/embed_new.pod>.
=head1 SYNOPSIS
- #include <parrot/embed.h>
- #include <parrot/extend.h>
+ #include "parrot/parrot.h"
+ #include "parrot/extend.h"
int main(int argc, char* argv[])
{
@@ -39,8 +39,6 @@ for the newer API is located at F<docs/embed_new.pod>.
=over 4
-=item F<include/parrot/embed.h>
-
=item F<include/parrot/extend.h>
=back
@@ -462,7 +460,6 @@ performing both compiling and linking in one step.
=head2 Load bytecode as a library and run a single subroutine
#include <parrot/parrot.h>
- #include <parrot/embed.h>
#include <parrot/extend.h>
int main(int argc, char *argv[])
View
2 docs/pdds/pdd10_embedding.pod
@@ -108,7 +108,7 @@ do less work through the API, and more work through bytecode and the runcore.
=item * The embed API uses a single header file: L<include/parrot/api.h>.
Embedding applications should use only this header file and no other header
files from Parrot. Embedding applications should NOT use
-L<include/parrot/parrot.h> or L<include/parrot/embed.h>, or any other files.
+L<include/parrot/parrot.h>, or any other files.
=item * libparrot does little to no signal handling. Those are typically the
responsibility of the embedder.
View
3 docs/tests.pod
@@ -97,7 +97,6 @@ C source tests are usually located in F<t/src/*.t>. A simple test looks like:
c_output_is(<<'CODE', <<'OUTPUT', "name for test");
#include <stdio.h>
#include "parrot/parrot.h"
- #include "parrot/embed.h"
int main(int argc, char* argv[]) {
Parrot_Interp interp;
@@ -190,7 +189,7 @@ errors if make has completed.) You can run them with any of the following:
=head2 Testing language implementations
-Language implementations are usually tested with
+Language implementations are usually tested with
C<language_output_is> and friends.
=head1 Ideal tests:
View
1 examples/c/pbc_info.c
@@ -23,7 +23,6 @@ over the main directory.
*/
#include "parrot/parrot.h"
-#include "parrot/embed.h"
/*
=item C<static INTVAL iter(PARROT_INTERP, PackFile_Segment *seg, void
View
2 examples/c/test_main.c
@@ -21,7 +21,7 @@ sample up to date with respect to the latest parrot functionality.
*/
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/longopt.h"
#include <stdio.h>
#include <stdlib.h>
View
1 examples/compilers/japhc.c
@@ -27,7 +27,6 @@ example compiler used by japh16.pasm
*/
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "../../src/pmc/pmc_sub.h"
#define C_DEBUG 0
View
2 examples/embed/cotorra.c
@@ -25,7 +25,7 @@ options and able to run only pbc files.
#include <stdlib.h>
#include <string.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
/**********************************************************************/
View
1 ext/Parrot-Embed/lib/Parrot/Embed.xs
@@ -1,6 +1,5 @@
#define PERL_NO_GET_CONTEXT
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "parrot/extend.h"
#include "EXTERN.h"
#include "perl.h"
View
1 frontend/parrot_debugger/main.c
@@ -142,7 +142,6 @@ and C<debug_break> ops in F<ops/debug.ops>.
#include <string.h>
#include <ctype.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "parrot/debugger.h"
#include "parrot/runcore_api.h"
View
6 frontend/pbc_disassemble/main.c
@@ -63,12 +63,6 @@ Writes output to C<filename>.
* which in turn uses the C<PDB_disassemble()> function from F<src/debug.c>.
*/
-/* Flags indicating the presence of the -b and -h command-line switches */
-typedef enum {
- enum_DIS_BARE = 1, /* -b switch */
- enum_DIS_HEADER = 2 /* -h switch */
-} Parrot_disassemble_options;
-
/* Longopts option table */
static struct longopt_opt_decl options[] = {
{ '?', '?', OPTION_optional_FLAG, { "--help" } },
View
1 frontend/pbc_dump/main.c
@@ -50,7 +50,6 @@ efficiency on reading non-native PBCs.
#include "parrot/longopt.h"
#include "parrot/oplib/ops.h"
#include "parrot/oplib/core_ops.h"
-#include "parrot/embed.h"
/*
View
1 frontend/pbc_merge/main.c
@@ -42,7 +42,6 @@ segments from the input PBC files.
#include "parrot/oplib/ops.h"
#include "parrot/oplib/core_ops.h"
#include "pmc/pmc_sub.h"
-#include "parrot/embed.h"
extern const unsigned char * Parrot_get_config_hash_bytes(void);
extern int Parrot_get_config_hash_length(void);
View
6 include/parrot/disassemble.h
@@ -1,16 +1,12 @@
/* embed.h
* Copyright (C) 2001-2010, Parrot Foundation.
* Overview:
- * This is the Parrot embedding system--the only part of Parrot that
- * the outside world should see.
- * References:
- * embed.c, docs/embed.pod.
+ * disassembly-related utilities
*/
#ifndef PARROT_DISASSEMBLE_H_GUARD
#define PARROT_DISASSEMBLE_H_GUARD
-#include "parrot/parrot.h"
#include "parrot/core_types.h" /* types used */
#include "parrot/compiler.h" /* compiler capabilities */
#include "parrot/config.h" /* PARROT_VERSION... */
View
6 include/parrot/packfile.h
@@ -772,10 +772,6 @@ void Parrot_pf_mark_packfile(PARROT_INTERP, ARGMOD_NULLOK(PackFile * pf))
__attribute__nonnull__(1)
FUNC_MODIFIES(* pf);
-PARROT_CANNOT_RETURN_NULL
-PMC* set_current_sub(PARROT_INTERP)
- __attribute__nonnull__(1);
-
#define ASSERT_ARGS_do_sub_pragmas __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(pfpmc))
@@ -897,8 +893,6 @@ PMC* set_current_sub(PARROT_INTERP)
, PARROT_ASSERT_ARG(pbc))
#define ASSERT_ARGS_Parrot_pf_mark_packfile __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_set_current_sub __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
- PARROT_ASSERT_ARG(interp))
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: src/packfile/api.c */
View
1 include/parrot/parrot.h
@@ -266,6 +266,7 @@ typedef struct PackFile_ByteCode PackFile_ByteCode;
#include "parrot/namespace.h"
#include "parrot/hll.h"
#include "parrot/pbcversion.h"
+#include "parrot/disassemble.h"
#endif /* PARROT_PARROT_H_GUARD */
View
1 src/debug.c
@@ -22,7 +22,6 @@ the Parrot debugger, and the C<debug> ops.
#include <stdlib.h>
#include "parrot/parrot.h"
#include "parrot/extend.h"
-#include "parrot/embed.h"
#include "parrot/oplib.h"
#include "parrot/debugger.h"
#include "parrot/oplib/ops.h"
View
1 src/embed/api.c
@@ -19,7 +19,6 @@ This file implements functions of the Parrot embedding interface.
#include "parrot/parrot.h"
#include "parrot/runcore_api.h"
-#include "parrot/embed.h"
#include "parrot/api.h"
#include "embed_private.h"
View
1 src/embed/bytecode.c
@@ -20,7 +20,6 @@ with Parrot bytecode.
#include "parrot/parrot.h"
#include "parrot/runcore_api.h"
-#include "parrot/embed.h"
#include "parrot/api.h"
#include "embed_private.h"
View
1 src/ops/core.ops
@@ -5,7 +5,6 @@
BEGIN_OPS_PREAMBLE
#include "parrot/dynext.h"
-#include "parrot/embed.h"
#include "parrot/runcore_api.h"
#include "pmc/pmc_continuation.h"
#include "pmc/pmc_fixedintegerarray.h"
View
3 src/ops/core_ops.c
@@ -37,7 +37,6 @@ extern op_lib_t core_op_lib;
#include "parrot/dynext.h"
-#include "parrot/embed.h"
#include "parrot/runcore_api.h"
#include "pmc/pmc_continuation.h"
#include "pmc/pmc_fixedintegerarray.h"
@@ -23690,7 +23689,7 @@ op_lib_t core_op_lib = {
1091, /* op_count */
core_op_info_table, /* op_info_table */
core_op_func_table, /* op_func_table */
- get_op /* op_code() */
+ get_op /* op_code() */
};
/*
View
10 src/packfile/api.c
@@ -169,6 +169,10 @@ static PackFile* read_pbc_file_packfile_handle(PARROT_INTERP,
__attribute__nonnull__(1)
__attribute__nonnull__(2);
+PARROT_CANNOT_RETURN_NULL
+static PMC* set_current_sub(PARROT_INTERP)
+ __attribute__nonnull__(1);
+
static int sub_pragma(PARROT_INTERP,
pbc_action_enum_t action,
ARGIN(const PMC *sub_pmc))
@@ -235,6 +239,8 @@ static int sub_pragma(PARROT_INTERP,
#define ASSERT_ARGS_read_pbc_file_packfile_handle __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(fullname))
+#define ASSERT_ARGS_set_current_sub __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+ PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_sub_pragma __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(sub_pmc))
@@ -2709,7 +2715,7 @@ read_pbc_file_packfile(PARROT_INTERP, ARGIN(STRING * const fullname),
/*
-=item C<PMC* set_current_sub(PARROT_INTERP)>
+=item C<static PMC* set_current_sub(PARROT_INTERP)>
Search the fixup table for a PMC matching the argument. On a match,
set up the appropriate context.
@@ -2724,7 +2730,7 @@ DEPRECATED: use Parrot_pf_get_packfile_main_sub instead
*/
PARROT_CANNOT_RETURN_NULL
-PMC*
+static PMC*
set_current_sub(PARROT_INTERP)
{
ASSERT_ARGS(set_current_sub)
View
1 src/packfile/pf_private.h
@@ -9,7 +9,6 @@ Parrot itself.
#include "parrot/parrot.h"
#include "parrot/packfile.h"
-#include "parrot/embed.h"
#include "parrot/extend.h"
#include "parrot/dynext.h"
#include "parrot/runcore_api.h"
View
1 src/pmc/parrotinterpreter.pmc
@@ -24,7 +24,6 @@ These are the vtable functions for the ParrotInterpreter base class
*/
-#include "parrot/embed.h"
#include "parrot/dynext.h"
#include "parrot/io.h"
#include "parrot/runcore_api.h"
View
3 src/pmc/parrotthread.pmc
@@ -23,9 +23,6 @@ It provides the following methods:
*/
-#include "parrot/embed.h"
-
-
pmclass ParrotThread no_ro auto_attrs {
ATTR INTVAL tid; /* thread id */
View
2 src/pmc/threadinterpreter.pmc
@@ -19,8 +19,6 @@ which supports:
*/
-#include "parrot/embed.h"
-
/* HEADERIZER HFILE: none */
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
View
1 src/runcore/cores.c
@@ -242,7 +242,6 @@ next opcode, or examine and manipulate data from the executing program.
*/
#include "parrot/runcore_api.h"
-#include "parrot/embed.h"
#include "parrot/runcore_trace.h"
#include "cores.str"
View
1 src/runcore/profiling.c
@@ -19,7 +19,6 @@ Functions controlling Parrot's profiling runcore.
#include "parrot/runcore_api.h"
#include "parrot/extend.h"
-#include "parrot/embed.h"
#include "parrot/runcore_profiling.h"
#include "parrot/oplib/core_ops.h"
View
2 t/compilers/opsc/01-parse.t
@@ -110,7 +110,7 @@ END
BEGIN_OPS_PREAMBLE
#include "parrot/dynext.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/runcore_api.h"
#include "../pmc/pmc_continuation.h"
#include "../pmc/pmc_parrotlibrary.h"
View
45 t/src/embed.t
@@ -40,7 +40,7 @@ my $common = linedirective(__LINE__) . <<'CODE';
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
#include "parrot/extend_vtable.h"
#include "imcc/api.h"
@@ -71,40 +71,11 @@ static Parrot_Interp new_interp()
CODE
-c_output_is(linedirective(__LINE__) . <<'CODE', <<'OUTPUT', "Minimal embed, using just the embed.h header" );
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "parrot/embed.h"
-
-void fail(const char *msg);
-
-void fail(const char *msg)
-{
- fprintf(stderr, "failed: %s\n", msg);
- exit(EXIT_FAILURE);
-}
-
-int main(int argc, const char **argv)
-{
- Parrot_Interp interp;
- interp = Parrot_new(NULL);
- if (! interp)
- fail("Cannot create parrot interpreter");
-
- puts("Done");
- Parrot_destroy(interp);
- return 0;
-}
-CODE
-Done
-OUTPUT
-
c_output_is(linedirective(__LINE__) . <<'CODE', <<'OUTPUT', "Minimal embed, create multiple interps" );
#include <stdio.h>
#include <stdlib.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
void fail(const char *msg);
@@ -142,7 +113,7 @@ c_output_is(linedirective(__LINE__) . <<'CODE', <<'OUTPUT', "Minimal embed, crea
#include <stdio.h>
#include <stdlib.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
void fail(const char *msg);
@@ -680,7 +651,7 @@ SKIP: {
c_output_is( <<'CODE', <<'OUTPUT', "Parrot Compile API Single call" );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
static opcode_t *
run(PARROT_INTERP, int argc, cosnt char *argv[])
@@ -760,7 +731,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Parrot Compile API Multiple Calls" );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
static void
compile_run(PARROT_INTERP, const char *src, Parrot_String *type, int argc,
@@ -851,7 +822,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Parrot Compile API Multiple 1st bad PIR" );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
static void
compile_run(PARROT_INTERP, const char *src, Parrot_String *type, int argc,
@@ -942,7 +913,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Parrot Compile API Multiple 2nd bad PIR" );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
static void
compile_run(PARROT_INTERP, const char *src, Parrot_String *type, int argc,
@@ -1032,7 +1003,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Parrot Compile API Multiple bad PIR" );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
static void
compile_run(PARROT_INTERP, const char *src, Parrot_String *type, int argc,
View
1 t/src/embed/api.t
@@ -42,7 +42,6 @@ sub linedirective
##include <string.h>
##include "parrot/parrot.h"
##include "parrot/api.h"
-##include "parrot/embed.h"
##include "parrot/extend.h"
#
#static void fail(const char *msg);
View
1 t/src/embed/strings.t
@@ -31,7 +31,6 @@ plan tests => 1;
c_output_is( <<'CODE', <<'OUTPUT', "wchar import / export" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/api.h>
#include <stdio.h>
View
1 t/src/exit.t
@@ -29,7 +29,6 @@ Tests C<Parrot_x_exit()> and C<Parrot_x_on_exit()> functions.
c_output_is( <<'CODE', <<'OUTPUT', "on_exit - interpreter" );
#include <stdio.h>
#include <parrot/parrot.h>
-#include <parrot/embed.h>
void
ex1(PARROT_INTERP, int x, void*p)
View
39 t/src/extend.t
@@ -40,7 +40,7 @@ sub linedirective
c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_PMC_null' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -62,7 +62,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_get_root_namespace/Parrot_(un)register_pmc' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -88,7 +88,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'set/get_intreg' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -118,7 +118,6 @@ c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_fprintf');
#include <stdio.h>
// This is to get Parrot_io_STDOUT, is there a better way?
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "parrot/extend.h"
int
@@ -141,7 +140,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_printf/Parrot_eprintf with no interp');
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -160,7 +159,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'set/get_numreg' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -190,7 +189,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_new_string' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -216,7 +215,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'Parrot_new_string/Parrot_(un)register_string' );
#include <stdio.h>
- #include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -246,7 +245,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'set/get_strreg' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -276,7 +275,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'PMC_set/get_integer' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -308,7 +307,7 @@ OUTPUT
c_output_is( linedirective(__LINE__) . <<'CODE', <<'OUTPUT', 'Parrot_free_cstring');
#include <stdio.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
static void fail(const char *msg);
@@ -359,7 +358,7 @@ c_output_is( <<'CODE', <<'OUTPUT', 'PMC_set/get_integer_keyed_int' );
#include <stdio.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -391,7 +390,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'set/get_pmcreg' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -429,7 +428,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'PMC_set/get_number' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -462,7 +461,7 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'PMC_set/get_string' );
#include <stdio.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
int
@@ -516,7 +515,7 @@ system(".$PConfig{slash}parrot$PConfig{exe}", '-o', $temp_pbc, $temp_pasm);
c_output_is( <<"CODE", <<'OUTPUT', 'call a parrot sub' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
+#include <parrot/parrot.h>
#include <parrot/extend.h>
/* also both the test PASM and the_test() print to stderr
@@ -564,7 +563,6 @@ OUTPUT
c_output_is( <<"CODE", <<'OUTPUT', 'call a parrot sub using the unified interface' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
/* also both the test PASM and the_test() print to stderr
@@ -630,7 +628,6 @@ system(".$PConfig{slash}parrot$PConfig{exe}", '-o', $temp_pbc, $temp_pir);
c_output_is( <<"CODE", <<'OUTPUT', 'call a parrot sub and return an integer' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
/* also both the test PASM and the_test() print to stderr
@@ -687,7 +684,6 @@ system(".$PConfig{slash}parrot$PConfig{exe}", '-o', $temp_pbc, $temp_pasm);
c_output_is( <<"CODE", <<'OUTPUT', 'call a parrot sub, catch exception' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
/* also both the test PASM and the_test() print to stderr
@@ -775,7 +771,6 @@ system(".$PConfig{slash}parrot$PConfig{exe}", '-o', $temp_pbc, $temp_pir);
c_output_is( <<"CODE", <<'OUTPUT', 'eval code through a parrot sub - #39669', todo => "Must explicitly set a PIR compreg");
#include <parrot/parrot.h>
-#include <parrot/embed.h>
int
main(int argc, const char *argv[])
@@ -803,7 +798,6 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', 'compile string in a fresh interp - #39986', todo => "Must explicitly set a PIR compreg" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
int
@@ -835,7 +829,6 @@ OUTPUT
c_output_is( <<"CODE", <<'OUTPUT', 'call multi sub from C - #41511' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
int
@@ -863,7 +856,6 @@ OUTPUT
c_output_is( <<"CODE", <<'OUTPUT', 'call multi sub from C - unified interface' );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/extend.h>
int
@@ -893,7 +885,6 @@ c_output_is( <<'CODE', <<'OUTPUT', 'multiple Parrot_new/Parrot_x_exit cycles' );
#include <stdio.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
/* this is Parrot_x_exit without the exit()
* it will call Parrot_really_destroy() as an exit handler
View
2 t/src/extend_vtable.t
@@ -39,7 +39,7 @@ my $common = linedirective(__LINE__) . <<'CODE';
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "parrot/extend.h"
#include "parrot/extend_vtable.h"
View
2 t/src/misc.t
@@ -40,7 +40,6 @@ c_output_is(linedirective(__LINE__) . <<'CODE', <<'OUTPUT', "Parrot_vsnprintf" )
#include <stdlib.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "parrot/misc.h"
void fail(const char *msg);
@@ -74,7 +73,6 @@ c_output_is(linedirective(__LINE__) . <<'CODE', <<'OUTPUT', "Parrot_vsnprintf wi
#include <stdlib.h>
#include "parrot/parrot.h"
-#include "parrot/embed.h"
#include "parrot/misc.h"
void fail(const char *msg);
View
2 t/src/pointer_array.t
@@ -34,7 +34,6 @@ plan tests => 2;
c_output_is( <<'CODE', <<'OUTPUT', "Pointer array" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/pointer_array.h>
#include <stdio.h>
@@ -96,7 +95,6 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Pointer array (iterating)" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
#include <parrot/pointer_array.h>
#include <stdio.h>
View
2 t/src/warnings.t
@@ -33,7 +33,6 @@ Hacked from t/src/basics.t
c_output_is( <<'CODE', <<'OUTPUT', "print_pbc_location" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
int
main(int argc, const char* argv[])
@@ -55,7 +54,6 @@ OUTPUT
c_output_is( <<'CODE', <<'OUTPUT', "Parrot_warn" );
#include <parrot/parrot.h>
-#include <parrot/embed.h>
int
main(int argc, const char* argv[])
View
2 t/tools/dev/searchops/samples.pm
@@ -18,7 +18,7 @@ $core = q{
BEGIN_OPS_PREAMBLE
#include "parrot/dynext.h"
-#include "parrot/embed.h"
+#include "parrot/parrot.h"
#include "../interp/interp_guts.h"
END_OPS_PREAMBLE

0 comments on commit c989e15

Please sign in to comment.