6model: headerize and CONST_STRING knowhow_bootstrapper

parrot · Mar 18, 2014 · 7f145f4 · 7f145f4
1 parent d6c9ce0
commit 7f145f4
Show file tree

Hide file tree

Showing 6 changed files with 261 additions and 122 deletions.
diff --git a/config/gen/makefiles/root.in b/config/gen/makefiles/root.in
@@ -1529,11 +1529,22 @@ examples/pasm/hello$(EXE): examples/pasm/hello.pbc $(PBC_TO_EXE)
 #
 ###############################################################################
 
-src/6model/knowhow_bootstrapper$(O) : $(PARROT_H_HEADERS) $(EXTEND_HEADERS) include/parrot/6model/knowhow_bootstrapper.h include/parrot/6model/repr/KnowHOWREPR.h src/6model/knowhow_bootstrapper.c
+src/6model/knowhow_bootstrapper$(O) : $(PARROT_H_HEADERS) \
+	$(INC_DIR)/6model/knowhow_bootstrapper.h \
+	$(INC_DIR)/6model/repr/KnowHOWREPR.h \
+	src/6model/knowhow_bootstrapper.str \
+	src/6model/knowhow_bootstrapper.c
 
-src/6model/multi_dispatch$(O) : $(PARROT_H_HEADERS) $(EXTEND_HEADERS) include/parrot/6model/multi_dispatch.h include/pmc/pmc_sub.h src/6model/multi_dispatch.c
+src/6model/multi_dispatch$(O) : $(PARROT_H_HEADERS) \
+	$(INC_DIR)/6model/multi_dispatch.h \
+	$(INC_PMC_DIR)/pmc_sub.h \
+	src/6model/multi_dispatch.str \
+	src/6model/multi_dispatch.c
 
-src/6model/repr_registry$(O) : $(PARROT_H_HEADERS) $(SIX_MODEL_REPR_HEADERS) $(EXTEND_HEADERS) src/6model/repr_registry.c
+src/6model/repr_registry$(O) : $(PARROT_H_HEADERS) \
+	$(SIX_MODEL_REPR_HEADERS) \
+	src/6model/repr_registry.str \
+	src/6model/repr_registry.c
 
 src/6model/serialization_context$(O) : $(PARROT_H_HEADERS) $(EXTEND_HEADERS) src/6model/serialization_context.c
 

diff --git a/include/parrot/6model/knowhow_bootstrapper.h b/include/parrot/6model/knowhow_bootstrapper.h
@@ -1,2 +1,48 @@
-PMC * SixModelObject_bootstrap_knowhow(PARROT_INTERP, PMC *sc);
-PMC * SixModelObject_setup_knowhow_attribute(PARROT_INTERP, PMC *sc, PMC *knowhow);
+/* 6model/knowhow_bootstrapper.h
+ * Copyright (C) 2010-2011, The Perl Foundation.
+ * Copyright (C) 2014, Parrot Foundation.
+ */
+
+#ifndef PARROT_KNOWHOW_BOOTSTRAPPER_H_GUARD
+#define PARROT_KNOWHOW_BOOTSTRAPPER_H_GUARD
+
+/* HEADERIZER BEGIN: src/6model/knowhow_bootstrapper.c */
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+
+PARROT_EXPORT
+PARROT_WARN_UNUSED_RESULT
+PARROT_CANNOT_RETURN_NULL
+PMC * SixModelObject_bootstrap_knowhow(PARROT_INTERP, ARGIN(PMC *sc))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2);
+
+PARROT_EXPORT
+PARROT_WARN_UNUSED_RESULT
+PARROT_CANNOT_RETURN_NULL
+PMC * SixModelObject_setup_knowhow_attribute(PARROT_INTERP,
+    ARGIN(PMC *sc),
+    ARGIN(PMC *knowhow))
+        __attribute__nonnull__(1)
+        __attribute__nonnull__(2)
+        __attribute__nonnull__(3);
+
+#define ASSERT_ARGS_SixModelObject_bootstrap_knowhow \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(sc))
+#define ASSERT_ARGS_SixModelObject_setup_knowhow_attribute \
+     __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+       PARROT_ASSERT_ARG(interp) \
+    , PARROT_ASSERT_ARG(sc) \
+    , PARROT_ASSERT_ARG(knowhow))
+/* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
+/* HEADERIZER END: src/6model/knowhow_bootstrapper.c */
+
+#endif /* PARROT_KNOWHOW_BOOTSTRAPPER_H_GUARD */
+
+/*
+ * Local variables:
+ *   c-file-style: "parrot"
+ * End:
+ * vim: expandtab shiftwidth=4 cinoptions='\:2=2' :
+ */