update header layout

natus/Makefile.am

@@ -9,21 +9,22 @@ AM_CXXFLAGS = -Wall -I$(top_srcdir) -DMODSUFFIX='".so"'
 AM_LDFLAGS  = -export-symbols-regex '^(_ZNK?5natus|natus_)' -ldl -lpthread
 
 # Variables
-CHEADERS   = misc.h  value.h  private.h natus.h  types.h  backend.h 
-CSOURCES   = misc.c  value.c  private.c
-CXXHEADERS = misc.hh value.hh           natus.hh types.hh
-CXXSOURCES = misc.cc value.cc
+CHEADERS   = natus.h  natus-engine.h 
+CXXHEADERS = natus.hh
+CSOURCES   = misc.c   value.c  private.c
+CXXSOURCES = misc.cc  value.cc
 
 # Handle the headers
 natinc_HEADERS = $(CHEADERS) $(CXXHEADERS)
+noinst_HEADERS = natus-internal.h
 
 # Build our internal C libraries
 noinst_LTLIBRARIES   = libnatusc.la libnatusc-require.la
 
 libnatusc_la_SOURCES = $(CSOURCES) $(CHEADERS)
 libnatusc_la_CFLAGS  = $(AM_CFLAGS) -DMODULEDIR=$(moduledir) -DENGINEDIR=$(enginedir)
 
-libnatusc_require_la_SOURCES = require.c require.h
+libnatusc_require_la_SOURCES = require.c natus-require.h
 libnatusc_require_la_CFLAGS  = $(AM_CFLAGS)
 
 # Build/install the shared C/C++ libraries
@@ -33,7 +34,7 @@ libnatus_la_SOURCES          = $(CXXSOURCES) $(CXXHEADERS)
 libnatus_la_CXXFLAGS         = $(AM_CXXFLAGS)
 libnatus_la_LIBADD           = libnatusc.la
 
-libnatus_require_la_SOURCES  = require.cc require.hh
+libnatus_require_la_SOURCES  = require.cc natus-require.hh
 libnatus_require_la_CXXFLAGS = $(AM_CXXFLAGS)
 libnatus_require_la_LIBADD   = libnatus.la libnatusc-require.la
 

natus/engines/JavaScriptCore.c

@@ -38,7 +38,7 @@
 #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
 typedef JSContextRef natusEngCtx;
 typedef JSValueRef natusEngVal;
-#include <natus/backend.h>
+#include <natus-engine.h>
 
 #define NATUS_PRIV_JSC_CLASS "natus.JavaScriptCore.JSClass"
 

natus/engines/Makefile.am

@@ -1,13 +1,14 @@
 enginesdir=$(libdir)/$(PACKAGE_NAME)/$(PACKAGE_VERSION)/engines
 AM_LDFLAGS = -module -avoid-version -no-undefined -shared
+AM_CFLAGS = -g -Wall -I$(top_srcdir)/natus
 
 engines_LTLIBRARIES=
 
 # SpiderMonkey (Mozilla) engine
 if WITH_SPIDERMONKEY
 engines_LTLIBRARIES += SpiderMonkey.la
 SpiderMonkey_la_SOURCES  = SpiderMonkey.c
-SpiderMonkey_la_CFLAGS = $(AM_CFLAGS) @SpiderMonkey_CFLAGS@ -g -Wall -I../../
+SpiderMonkey_la_CFLAGS = $(AM_CFLAGS) @SpiderMonkey_CFLAGS@
 SpiderMonkey_la_LDFLAGS  = $(AM_LDFLAGS)  @SpiderMonkey_LIBS@
 SpiderMonkey_la_LIBADD   = ../libnatus.la
 endif
@@ -16,7 +17,7 @@ endif
 if WITH_V8
 engines_LTLIBRARIES += v8.la
 v8_la_SOURCES  = v8.cc
-v8_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions -fno-rtti -g -Wall -I../../
+v8_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions -fno-rtti
 v8_la_LDFLAGS  = $(AM_LDFLAGS)  -fno-exceptions -fno-rtti -lv8 -lpthread
 v8_la_LIBADD   = ../libnatus.la
 endif
@@ -25,7 +26,7 @@ endif
 if WITH_JAVASCRIPTCORE
 engines_LTLIBRARIES += JavaScriptCore.la
 JavaScriptCore_la_SOURCES = JavaScriptCore.c
-JavaScriptCore_la_CFLAGS  = $(AM_CFLAGS) @JavaScriptCore_CFLAGS@ -g -Wall -I../../
+JavaScriptCore_la_CFLAGS  = $(AM_CFLAGS) @JavaScriptCore_CFLAGS@
 JavaScriptCore_la_LDFLAGS = $(AM_LDFLAGS)  @JavaScriptCore_LIBS@
 JavaScriptCore_la_LIBADD  = ../libnatus.la
 endif

natus/engines/SpiderMonkey.c

@@ -29,7 +29,7 @@
 #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
 typedef JSContext* natusEngCtx;
 typedef jsval* natusEngVal;
-#include <natus/backend.h>
+#include <natus-engine.h>
 
 static void
 sm_val_unlock(natusEngCtx ctx, natusEngVal val);

natus/engines/v8.cc

@@ -32,7 +32,7 @@ using namespace v8;
 #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
 typedef Persistent<Context>* natusEngCtx;
 typedef Persistent<Value>* natusEngVal;
-#include <natus/backend.h>
+#include <natus-engine.h>
 
 #define V8_PRIV_SLOT 0
 #define V8_PRIV_STRING String::New("natus::v8::private")

natus/main.cc

@@ -41,6 +41,7 @@ using namespace std;
 
 #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
 #include <natus/natus.hh>
+#include <natus/natus-require.hh>
 using namespace natus;
 
 #define _str(s) # s

natus/misc.c

@@ -29,8 +29,8 @@
 #include <assert.h>
 #include <stddef.h>
 
-#include "misc.h"
-#include "value.h"
+#define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
+#include "natus.h"
 
 #define SET_ARGUMENT(type) { \
   p = va_arg(apc, void*); \

natus/misc.cc

@@ -21,9 +21,9 @@
  *
  */
 
-#include "misc.h"
-#include "value.h"
-#include "value.hh"
+#define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
+#include <natus.h>
+#include <natus.hh>
 using namespace natus;
 
 namespace natus

natus/backend.h → natus/natus-engine.h

@@ -23,12 +23,7 @@
 
 #ifndef ENGINEMOD_H_
 #define ENGINEMOD_H_
-#include "value.h"
-#include "private.h"
-
-#ifndef I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
-#error Natus is not stable, go look elsewhere...
-#endif
+#include <natus.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,6 +67,8 @@ extern "C" {
     prfx ## _equal \
   }
 
+typedef struct natusPrivate natusPrivate;
+
 typedef enum {
   natusPropertyActionDelete    = 1,
   natusPropertyActionGet       = 1 << 1,
@@ -128,6 +125,8 @@ typedef struct {
 
 natusEngVal natus_handle_property(natusPropertyAction act, natusEngVal obj, const natusPrivate *priv, natusEngVal idx, natusEngVal val, natusEngValFlags *flags);
 natusEngVal natus_handle_call    (natusEngVal obj, const natusPrivate *priv, natusEngVal ths, natusEngVal arg, natusEngValFlags *flags);
+void natus_private_free(natusPrivate *priv);
+bool natus_private_set(natusPrivate *self, const char *name, void *priv, natusFreeFunction free);
 
 #ifdef __cplusplus
 } /* extern "C" */

natus/private.h → natus/natus-internal.h

@@ -21,9 +21,10 @@
  *
  */
 
-#ifndef PRIVATE_H_
-#define PRIVATE_H_
-#include "types.h"
+#ifndef NATUS_INTERNAL_H_
+#define NATUS_INTERNAL_H_
+#include <natus.h>
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -55,4 +56,4 @@ natus_private_foreach(const natusPrivate *self, bool rev, natusPrivateForeach fo
 #ifdef __cplusplus
 } /* extern "C" */
 #endif /* __cplusplus */
-#endif /* PRIVATE_H_ */
+#endif /* NATUS_INTERNAL_H_ */

natus/require.hh → natus/natus-require.hh

@@ -23,7 +23,7 @@
 
 #ifndef NATUS_REQUIRE_HH_
 #define NATUS_REQUIRE_HH_
-#include <natus/natus.hh>
+#include <natus.hh>
 
 #undef NATUS_MODULE
 #define NATUS_MODULE(modname) \