flattened source directory structure

diff --git a/build.rb b/build.rb
index e441e512fc8192d75f867e024aefdbb3222b788d..adfac4e49cc2afa517bbad327e6fc71b69411be5 100755 (executable)
--- a/build.rb
+++ b/build.rb
@@ -49,8 +49,7 @@ base_env = BuildEnv.new do |env|
   env["CFLAGS"] += ['-DLEAK_DETECT_LEVEL=1', '--std=c99', '-Wall', '-Wextra']#, '-Werror']
   env["CPPPATH"] += Dir['modules/libcds/source/**/'] + [
     'modules/libopts/source',
-    'source/libparse/',
-    'source/sclpl/',
+    'source/',
   ]
 end
 
@@ -77,17 +76,11 @@ end
 #------------------------------------------------------------------------------
 # Release Build Targets
 #------------------------------------------------------------------------------
-# Build options parsing and data structures library
-main_env.Library('build/lib/libcds.a',   FileList['modules/libcds/source/**/*.c'])
-main_env.Library('build/lib/libopts.a',  FileList['modules/libopts/source/**/*.c'])
-runtime_libs = ['build/lib/libopts.a', 'build/lib/libcds.a']
+# Build the compiler
+sources = FileList['source/*.c', 'modules/libopts/source/*.c']
+main_env.Program('build/bin/sclpl', sources)
 
-# Build the parser as a library
-compiler_libs = ['build/lib/libparse.a'] + runtime_libs
-main_env.Library('build/lib/libparse.a', FileList['source/libparse/*.c'])
-main_env.Program('build/bin/sclpl', FileList['source/sclpl/*.c'] + compiler_libs)
-
-# Build the sclpl runtime library
+# Build the runtime library
 main_env.Library('build/lib/libsrt.a',   FileList['source/runtime/*.c'])
 main_env.Install('build/include/sclpl.h', 'source/runtime/sclpl.h')
 
@@ -95,9 +88,7 @@ main_env.Install('build/include/sclpl.h', 'source/runtime/sclpl.h')
 # Test Build Targets
 #------------------------------------------------------------------------------
 if Opts[:profile].include? "test"
-  compiler_libs = ['build/lib/libparse-test.a'] + runtime_libs
-  test_env.Library('build/lib/libparse-test.a', FileList['source/libparse/*.c'])
-  test_env.Program('build/bin/sclpl-test', FileList['source/sclpl/*.c'] + compiler_libs)
+  test_env.Program('build/bin/sclpl-test', sources)
   test_env.Command('RSpec', [], 'CMD' => [
       'rspec', '--pattern', 'spec/**{,/*/**}/*_spec.rb', '--format', 'documentation'])
 end

diff --git a/source/libparse/ast.c b/source/ast.c
similarity index 99%
rename from source/libparse/ast.c
rename to source/ast.c
index 947fcf2513be8d91d13bb6942d3624d39ebd37ed..2b8769dcc71bad8b5c955f98e9b067da7857f95a 100644 (file)
--- a/source/libparse/ast.c
+++ b/source/ast.c
@@ -1,4 +1,4 @@
-#include <libparse.h>
+#include <sclpl.h>
 
 AST* Require(char* name)
 {

diff --git a/source/libparse/gc.c b/source/gc.c
similarity index 99%
rename from source/libparse/gc.c
rename to source/gc.c
index abd90a144a51502e5024900912f45412f17661f0..24ded9a0a02459d8bb610dfc817b137b6764d1aa 100644 (file)
--- a/source/libparse/gc.c
+++ b/source/gc.c
@@ -1,4 +1,4 @@
-#include <libparse.h>
+#include <sclpl.h>
 
 typedef struct obj_t {
     uintptr_t refs;

diff --git a/source/libparse/grammar.c b/source/grammar.c
similarity index 99%
rename from source/libparse/grammar.c
rename to source/grammar.c
index 96e35376c20cfb562dda791d9905d54af56ec9ee..3c8d7f2662b6a638b97430ee0e6a0000a18d2e45 100644 (file)
--- a/source/libparse/grammar.c
+++ b/source/grammar.c
@@ -4,7 +4,7 @@
   $Revision$
   $HeadURL$
 */
-#include <libparse.h>
+#include <sclpl.h>
 
 static AST* require(Parser* p);
 static AST* type_annotation(Parser* p);

diff --git a/source/libparse/lexer.c b/source/lexer.c
similarity index 99%
rename from source/libparse/lexer.c
rename to source/lexer.c
index 1952084507862cf8740767ceae239bc54a6f3baa..7dd08c26dc3a7d34b3dd55d3d4cc20fc6652bbf5 100644 (file)
--- a/source/libparse/lexer.c
+++ b/source/lexer.c
@@ -4,7 +4,7 @@
   $Revision$
   $HeadURL$
   */
-#include <libparse.h>
+#include <sclpl.h>
 
 static char* dupstring(const char* old) {
     size_t length = strlen(old);

diff --git a/source/sclpl/main.c b/source/main.c
similarity index 99%
rename from source/sclpl/main.c
rename to source/main.c
index 7d0e6fc161dadc170f0d5ae1e756ee48f630c81c..5a53e0d9776fc7f7c50d1bc041872d9131a0a172 100644 (file)
--- a/source/sclpl/main.c
+++ b/source/main.c
@@ -1,4 +1,3 @@
-#include <libparse.h>
 #include <sclpl.h>
 
 /* Command Line Options

diff --git a/source/libparse/parser.c b/source/parser.c
similarity index 99%
rename from source/libparse/parser.c
rename to source/parser.c
index a5e81acc59c05db6f0d8d108eaaaf95495ffb532..1875ce7b8bf0f59955fbbe9ec26074122df6a3e3 100644 (file)
--- a/source/libparse/parser.c
+++ b/source/parser.c
@@ -4,7 +4,7 @@
   $Revision$
   $HeadURL$
   */
-#include <libparse.h>
+#include <sclpl.h>
 
 Tok tok_eof = { NULL, 0, 0, T_END_FILE, {0} };
 

diff --git a/source/sclpl/pprint.c b/source/pprint.c
similarity index 100%
rename from source/sclpl/pprint.c
rename to source/pprint.c

diff --git a/source/libparse/libparse.h b/source/sclpl.h
similarity index 91%
rename from source/libparse/libparse.h
rename to source/sclpl.h
index 71133216db1b2e44602804fb5a04b2798f9e1341..9ce9ff0fa52a2140a1b7e0b3ccef6d8b6acd4576 100644 (file)
--- a/source/libparse/libparse.h
+++ b/source/sclpl.h
@@ -1,18 +1,19 @@
 /**
-  @file libparse.h
+  @file sclpl.h
 */
-#ifndef LIBPARSE_H
-#define LIBPARSE_H
+#ifndef SCLPL_H
+#define SCLPL_H
 
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
 #include <setjmp.h>
+#include <opts.h>
 
 /* Garbage Collection
  *****************************************************************************/
@@ -193,4 +194,11 @@ bool expect_str(Parser* p_parser, TokType type, const char* p_text);
 // Grammar Routines
 AST* toplevel(Parser* p);
 
-#endif /* LIBPARSE_H */
+/* Pretty Printing
+ *****************************************************************************/
+void pprint_token_type(FILE* file, Tok* token);
+void pprint_token_value(FILE* file, Tok* token);
+void pprint_token(FILE* file, Tok* token, bool print_loc);
+//void pprint_tree(FILE* file, AST* tree, int depth);
+
+#endif /* SCLPL_H */

diff --git a/source/sclpl/sclpl.h b/source/sclpl/sclpl.h
deleted file mode 100644 (file)
index 32ea246..0000000
--- a/source/sclpl/sclpl.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-  @file sclpl.h
-*/
-#ifndef SCLPL_H
-#define SCLPL_H
-
-#include <opts.h>
-#include <libparse.h>
-#include <stdio.h>
-
-/* Pretty Printing Data Structures */
-void pprint_token_type(FILE* file, Tok* token);
-void pprint_token_value(FILE* file, Tok* token);
-void pprint_token(FILE* file, Tok* token, bool print_loc);
-//void pprint_tree(FILE* file, AST* tree, int depth);
-
-#endif /* SCLPL_H */