fix namespace and include. mv src to iv

README.mkd

@@ -13,10 +13,10 @@ see LICENSE files
 
 lv5 is ECMA262 5.1 engine
 
-for more information, see [lv5 README](https://github.com/Constellation/iv/tree/master/src/lv5) and [lv5 wiki](https://github.com/Constellation/iv/wiki/lv5)
+for more information, see [lv5 README](https://github.com/Constellation/iv/tree/master/iv/lv5) and [lv5 wiki](https://github.com/Constellation/iv/wiki/lv5)
 
 ## iv / phonic
 
 phonic is Ruby library of ECMA262 5.1 Parser API
 
-for more information, see [phonic README](https://github.com/Constellation/iv/tree/master/src/phonic)
+for more information, see [phonic README](https://github.com/Constellation/iv/tree/master/iv/phonic)

SConstruct

@@ -34,19 +34,19 @@ def TestLv5(context, object_files, libs):
 
 def Lv5(context):
   lv5_task, lv5_objs, lv5_libs = context.SConscript(
-    'src/lv5/SConscript',
+    'iv/lv5/SConscript',
     variant_dir=join(root_dir, 'obj', 'lv5'),
-    src=join(root_dir, 'src', 'lv5'),
+    src=join(root_dir, 'iv', 'lv5'),
     duplicate=False,
     exports="context root_dir"
   )
   return lv5_task, lv5_objs, lv5_libs
 
 def Main(context, deps):
   return context.SConscript(
-    'src/SConscript',
-    variant_dir=join(root_dir, 'obj', 'src'),
-    src=join(root_dir, 'src'),
+    'iv/SConscript',
+    variant_dir=join(root_dir, 'obj', 'iv'),
+    src=join(root_dir, 'iv'),
     duplicate=False,
     exports='root_dir context deps'
   )
@@ -65,7 +65,7 @@ def Build():
     BoolVariable('release', '', 0)
   )
   env = Environment(options=var, tools = ['default', TOOL_SUBST])
-  env.VariantDir(join(root_dir, 'obj'), join(root_dir, 'src'), 0)
+  env.VariantDir(join(root_dir, 'obj'), join(root_dir, 'iv'), 0)
 
   env.PrependENVPath('PATH', os.environ['PATH']) #especially MacPorts's /opt/local/bin
 
@@ -137,7 +137,7 @@ def Build():
       "-Wall", "-Wextra", '-pipe',
       "-Wno-unused-parameter", "-Wwrite-strings", "-Wreturn-type", "-Wpointer-arith",
       "-Wwrite-strings", "-Wno-long-long", "-Wno-missing-field-initializers"],
-    CPPPATH=[join(root_dir, 'src'), join(root_dir, 'obj', 'src')],
+    CPPPATH=root_dir,
     CPPDEFINES=[
       "_GNU_SOURCE",
       "__STDC_LIMIT_MACROS",

iv/aero/aero.h

@@ -0,0 +1,23 @@
+#ifndef IV_AERO_AERO_H_
+#define IV_AERO_AERO_H_
+
+#include <iv/aero/character.h>
+#include <iv/aero/escape.h>
+#include <iv/aero/ast_fwd.h>
+#include <iv/aero/visitor.h>
+#include <iv/aero/range.h>
+#include <iv/aero/range_builder.h>
+#include <iv/aero/ast.h>
+#include <iv/aero/parser.h>
+#include <iv/aero/disassembler.h>
+#include <iv/aero/dumper.h>
+#include <iv/aero/code.h>
+#include <iv/aero/compiler.h>
+#include <iv/aero/quick_check.h>
+#include <iv/aero/vm.h>
+
+namespace iv {
+namespace aero {
+
+} }  // namespace iv::lv5
+#endif  // IV_AERO_AERO_H_

src/aero/ast.h → iv/aero/ast.h

@@ -1,8 +1,8 @@
 #ifndef IV_AERO_AST_H_
 #define IV_AERO_AST_H_
-#include "space.h"
-#include "aero/visitor.h"
-#include "aero/range.h"
+#include <iv/space.h>
+#include <iv/aero/visitor.h>
+#include <iv/aero/range.h>
 namespace iv {
 namespace aero {
 

src/aero/captures.h → iv/aero/captures.h

@@ -1,7 +1,7 @@
 #ifndef IV_AERO_CAPTURES_H_
 #define IV_AERO_CAPTURES_H_
-#include "aero/visitor.h"
-#include "aero/ast.h"
+#include <iv/aero/visitor.h>
+#include <iv/aero/ast.h>
 namespace iv {
 namespace aero {
 

src/aero/character.h → iv/aero/character.h

@@ -1,6 +1,6 @@
 #ifndef IV_AERO_CHARACTER_H_
 #define IV_AERO_CHARACTER_H_
-#include "character.h"
+#include <iv/character.h>
 namespace iv {
 namespace aero {
 namespace character {

src/aero/compiler.h → iv/aero/compiler.h

@@ -1,16 +1,16 @@
 #ifndef IV_AERO_COMPILER_H_
 #define IV_AERO_COMPILER_H_
 #include <vector>
-#include "detail/cstdint.h"
-#include "detail/unordered_set.h"
-#include "noncopyable.h"
-#include "character.h"
-#include "debug.h"
-#include "aero/flags.h"
-#include "aero/op.h"
-#include "aero/code.h"
-#include "aero/captures.h"
-#include "aero/quick_check_fwd.h"
+#include <iv/detail/cstdint.h>
+#include <iv/detail/unordered_set.h>
+#include <iv/noncopyable.h>
+#include <iv/character.h>
+#include <iv/debug.h>
+#include <iv/aero/flags.h>
+#include <iv/aero/op.h>
+#include <iv/aero/code.h>
+#include <iv/aero/captures.h>
+#include <iv/aero/quick_check_fwd.h>
 namespace iv {
 namespace aero {
 

src/aero/disassembler.h → iv/aero/disassembler.h

@@ -4,13 +4,13 @@
 #include <sstream>
 #include <algorithm>
 #include <cstdio>
-#include "detail/array.h"
-#include "detail/cstdint.h"
-#include "noncopyable.h"
-#include "stringpiece.h"
-#include "aero/op.h"
-#include "aero/code.h"
-#include "aero/utility.h"
+#include <iv/detail/array.h>
+#include <iv/detail/cstdint.h>
+#include <iv/noncopyable.h>
+#include <iv/stringpiece.h>
+#include <iv/aero/op.h>
+#include <iv/aero/code.h>
+#include <iv/aero/utility.h>
 namespace iv {
 namespace aero {
 

src/aero/dumper.h → iv/aero/dumper.h

@@ -1,10 +1,10 @@
 // dumper for debug
 #ifndef IV_AERO_DUMPER_H_
 #define IV_AERO_DUMPER_H_
-#include "string_builder.h"
-#include "ustring.h"
-#include "aero/visitor.h"
-#include "aero/ast.h"
+#include <iv/string_builder.h>
+#include <iv/ustring.h>
+#include <iv/aero/visitor.h>
+#include <iv/aero/ast.h>
 namespace iv {
 namespace aero {
 

src/aero/escape.h → iv/aero/escape.h

@@ -1,8 +1,8 @@
 #ifndef IV_AERO_ESCAPE_H_
 #define IV_AERO_ESCAPE_H_
 #include <utility>
-#include "detail/array.h"
-#include "aero/range.h"
+#include <iv/detail/array.h>
+#include <iv/aero/range.h>
 namespace iv {
 namespace aero {
 

src/aero/op.h → iv/aero/op.h

@@ -4,7 +4,7 @@
 #ifndef IV_AERO_OP_H_
 #define IV_AERO_OP_H_
 #include <cstddef>
-#include "detail/array.h"
+#include <iv/detail/array.h>
 namespace iv {
 namespace aero {
 

src/aero/parser.h → iv/aero/parser.h

@@ -1,14 +1,14 @@
 #ifndef IV_AERO_PARSER_H_
 #define IV_AERO_PARSER_H_
-#include "detail/unordered_set.h"
-#include "ustringpiece.h"
-#include "character.h"
-#include "conversions.h"
-#include "space.h"
-#include "aero/range.h"
-#include "aero/flags.h"
-#include "aero/ast.h"
-#include "aero/range_builder.h"
+#include <iv/detail/unordered_set.h>
+#include <iv/ustringpiece.h>
+#include <iv/character.h>
+#include <iv/conversions.h>
+#include <iv/space.h>
+#include <iv/aero/range.h>
+#include <iv/aero/flags.h>
+#include <iv/aero/ast.h>
+#include <iv/aero/range_builder.h>
 namespace iv {
 namespace aero {
 

src/aero/quick_check.h → iv/aero/quick_check.h

@@ -1,7 +1,7 @@
 #ifndef IV_AERO_QUICK_CHECK_H_
 #define IV_AERO_QUICK_CHECK_H_
-#include "aero/quick_check_fwd.h"
-#include "aero/compiler.h"
+#include <iv/aero/quick_check_fwd.h>
+#include <iv/aero/compiler.h>
 namespace iv {
 namespace aero {
 

src/aero/quick_check_fwd.h → iv/aero/quick_check_fwd.h

@@ -1,8 +1,8 @@
 #ifndef IV_AERO_QUICK_CHECK_FWD_H_
 #define IV_AERO_QUICK_CHECK_FWD_H_
-#include "noncopyable.h"
-#include "bloom_filter.h"
-#include "aero/visitor.h"
+#include <iv/noncopyable.h>
+#include <iv/bloom_filter.h>
+#include <iv/aero/visitor.h>
 namespace iv {
 namespace aero {
 

src/aero/range_builder.h → iv/aero/range_builder.h

@@ -3,10 +3,10 @@
 #include <vector>
 #include <utility>
 #include <algorithm>
-#include "noncopyable.h"
-#include "character.h"
-#include "aero/range.h"
-#include "aero/escape.h"
+#include <iv/noncopyable.h>
+#include <iv/character.h>
+#include <iv/aero/range.h>
+#include <iv/aero/escape.h>
 namespace iv {
 namespace aero {
 

src/aero/visitor.h → iv/aero/visitor.h

@@ -1,6 +1,6 @@
 #ifndef IV_AERO_VISITOR_H_
 #define IV_AERO_VISITOR_H_
-#include "aero/ast_fwd.h"
+#include <iv/aero/ast_fwd.h>
 namespace iv {
 namespace aero {
 

src/aero/vm.h → iv/aero/vm.h

@@ -2,13 +2,13 @@
 #define IV_AERO_VM_H_
 #include <vector>
 #include <algorithm>
-#include "noncopyable.h"
-#include "ustringpiece.h"
-#include "scoped_ptr.h"
-#include "os_allocator.h"
-#include "aero/code.h"
-#include "aero/character.h"
-#include "aero/utility.h"
+#include <iv/noncopyable.h>
+#include <iv/ustringpiece.h>
+#include <iv/scoped_ptr.h>
+#include <iv/os_allocator.h>
+#include <iv/aero/code.h>
+#include <iv/aero/character.h>
+#include <iv/aero/utility.h>
 namespace iv {
 namespace aero {
 

src/alloc.h → iv/alloc.h

@@ -6,10 +6,10 @@
 #include <algorithm>
 #include <string>
 #include <limits>
-#include "detail/array.h"
-#include "static_assert.h"
-#include "utils.h"
-#include "noncopyable.h"
+#include <iv/detail/array.h>
+#include <iv/static_assert.h>
+#include <iv/utils.h>
+#include <iv/noncopyable.h>
 
 namespace iv {
 namespace core {

src/arith.h → iv/arith.h

@@ -1,8 +1,8 @@
 // arithmetic functions
 #ifndef IV_ARITH_H_
 #define IV_ARITH_H_
-#include "detail/array.h"
-#include "detail/cinttypes.h"
+#include <iv/detail/array.h>
+#include <iv/detail/cinttypes.h>
 namespace iv {
 namespace core {
 namespace detail {

src/ast.h → iv/ast.h

@@ -2,22 +2,22 @@
 #define IV_AST_H_
 #include <vector>
 #include <functional>
-#include "detail/unordered_map.h"
-#include "detail/tuple.h"
-#include "detail/cstdint.h"
-#include "detail/type_traits.h"
-#include "detail/functional.h"
-#include "noncopyable.h"
-#include "utils.h"
-#include "space.h"
-#include "maybe.h"
-#include "functor.h"
-#include "token.h"
-#include "ast_fwd.h"
-#include "ast_visitor.h"
-#include "location.h"
-#include "static_assert.h"
-#include "ustringpiece.h"
+#include <iv/detail/unordered_map.h>
+#include <iv/detail/tuple.h>
+#include <iv/detail/cstdint.h>
+#include <iv/detail/type_traits.h>
+#include <iv/detail/functional.h>
+#include <iv/noncopyable.h>
+#include <iv/utils.h>
+#include <iv/space.h>
+#include <iv/maybe.h>
+#include <iv/functor.h>
+#include <iv/token.h>
+#include <iv/ast_fwd.h>
+#include <iv/ast_visitor.h>
+#include <iv/location.h>
+#include <iv/static_assert.h>
+#include <iv/ustringpiece.h>
 
 namespace iv {
 namespace core {

src/ast_factory.h → iv/ast_factory.h

@@ -1,12 +1,12 @@
 #ifndef IV_AST_FACTORY_H_
 #define IV_AST_FACTORY_H_
-#include "detail/type_traits.h"
-#include "functor.h"
-#include "location.h"
-#include "ast.h"
-#include "alloc.h"
-#include "static_assert.h"
-#include "ustringpiece.h"
+#include <iv/detail/type_traits.h>
+#include <iv/functor.h>
+#include <iv/location.h>
+#include <iv/ast.h>
+#include <iv/alloc.h>
+#include <iv/static_assert.h>
+#include <iv/ustringpiece.h>
 
 namespace iv {
 namespace core {

src/ast_info.h → iv/ast_info.h

@@ -1,7 +1,7 @@
 #ifndef IV_AST_INFO_H_
 #define IV_AST_INFO_H_
-#include "ast.h"
-#include "space.h"
+#include <iv/ast.h>
+#include <iv/space.h>
 namespace iv {
 namespace core {
 namespace ast {