A bit cleanup on cond-features population

Author: ktakashi

CMakeLists.txt

@@ -403,21 +403,10 @@ IF(WINDOWS_SUPPORT)
   ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
 ENDIF()
 
-SET(SAGITTARIUS_EXT_FEATURES ${PROJECT_BINARY_DIR}/build/src/ext-features.c)
-
-# sub directory can add features
-# FIXME this is ugly
-FILE(WRITE ${SAGITTARIUS_EXT_FEATURES}
-  "#define LIBSAGITTARIUS_BODY
-#include <sagittarius/private/core.h>
-void Sg__InitExtFeatures()
-{
-")
+SET(SAGITTARIUS_EXT_FEATURES ${PROJECT_BINARY_DIR}/ext-features.inc)
+
 MACRO(ADD_FEATURE feature)
-  FILE(APPEND ${SAGITTARIUS_EXT_FEATURES} 
-    "Sg_AddCondFeature(UC(\"${feature}\"));\n")
-  FILE(APPEND ${SAGITTARIUS_EXT_FEATURES} 
-    "Sg_AddCondFeature(UC(\"sagittarius.${feature}\"));\n")
+  FILE(APPEND ${SAGITTARIUS_EXT_FEATURES} "EXT_FEATURE(\"${feature}\");\n")
 ENDMACRO()
 
 # Issue #37: Name conflictin with other 'sash'.
@@ -454,10 +443,6 @@ ADD_SUBDIRECTORY(ext ${SAGITTARIUS_EXT_WORK_DIRECTORY})
 # at the bottom of the file.
 ADD_SUBDIRECTORY(cmake build/cmake)
 
-FILE(APPEND ${SAGITTARIUS_EXT_FEATURES}
-  "
-}")
-
 CONFIGURE_FILE(cmake/sagittarius-config.in 
   ${PROJECT_BINARY_DIR}/sagittarius-config)
 CONFIGURE_FILE(cmake/sagittarius-package.in 

src/CMakeLists.txt

@@ -99,20 +99,7 @@ SET(SAGITTARIUS_LIB_SOURCE
   wrappers.c
   # libraries
   ${STUB_SOURCES}
-  ${BUILTIN_SOURCES}
-  
-  # Since we use non builtin library in REPL
-  # I don't see the reason it need to be builtin
-  # lib_repl.c
-  # now match is replaced to Alex Shin's match
-  #lib_match_core.c
-  ${SAGITTARIUS_EXT_FEATURES}
-)
-
-# to add features in core
-SET_SOURCE_FILES_PROPERTIES(${SAGITTARIUS_EXT_FEATURES}
-  PROPERTIES
-  GENERATED TRUE)
+  ${BUILTIN_SOURCES})
 
 ADD_LIBRARY(sagittarius SHARED 
   ${SAGITTARIUS_LIB_SOURCE}

src/core.c

@@ -682,9 +682,16 @@ static void init_cond_features()
 
   /* version clause */
   Sg_AddCondFeature(UC("cond-expand.version"));
-  
+
+#define EXT_FEATURE(name)					\
+  do {								\
+    Sg_AddCondFeature(UC(name));				\
+    Sg_AddCondFeature(UC("sagittarius." name));			\
+  } while (0)
+
   /* extlib features */
-  Sg__InitExtFeatures();
+  #include <ext-features.inc>
+#undef EXT_FEATURE
 }
 
 /* Starting point of the Sagittarius engine */