rename compiler/ to gypsum/; vm/ to codeswitch/

Remove remaining copyright notices
jayconrod · Jan 22, 2017 · c0e9635 · c0e9635
1 parent 5a364ab
commit c0e9635
Show file tree

Hide file tree

Showing 211 changed files with 147 additions and 140 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,11 +1,12 @@
 Copyright 2014-2017, Jay Conrod. All rights reserved.
 
-The Gypsum bootstrap compiler in the `compiler` directory is licensed
+The Gypsum bootstrap compiler in the `gypsum` directory is licensed
 under the GNU General Public License v3, which can be found in
-compiler/LICENSE.txt.
+gypsum/LICENSE.txt.
 
-The CodeSwitch virtual machine in the `vm` directory is licensed under
-a 3-clause BSD license, which can be found in vm/LICENSE.txt.
+The CodeSwitch virtual machine in the `codeswitch` directory is
+licensed under a 3-clause BSD license, which can be found in
+codeswitch/LICENSE.txt.
 
 gypsum-mode.el is licensed under a 3-clause BSD license, which can be
 found in tools/gypsum-mode.el itself.

diff --git a/vm/LICENSE.txt → codeswitch/LICENSE.txt b/vm/LICENSE.txt → codeswitch/LICENSE.txt
diff --git a/vm/Makefile → codeswitch/Makefile b/vm/Makefile → codeswitch/Makefile
diff --git a/vm/include/Doxyfile → codeswitch/include/Doxyfile b/vm/include/Doxyfile → codeswitch/include/Doxyfile
diff --git a/vm/include/README.md → codeswitch/include/README.md b/vm/include/README.md → codeswitch/include/README.md
diff --git a/vm/include/codeswitch.h → codeswitch/include/codeswitch.h b/vm/include/codeswitch.h → codeswitch/include/codeswitch.h
diff --git a/vm/include/native.md → codeswitch/include/native.md b/vm/include/native.md → codeswitch/include/native.md
diff --git a/vm/include/typesignatures.md → codeswitch/include/typesignatures.md b/vm/include/typesignatures.md → codeswitch/include/typesignatures.md
diff --git a/vm/programs/driver.cpp → codeswitch/programs/driver.cpp b/vm/programs/driver.cpp → codeswitch/programs/driver.cpp
diff --git a/vm/src/api.cpp → codeswitch/src/api.cpp b/vm/src/api.cpp → codeswitch/src/api.cpp
diff --git a/vm/src/api.h → codeswitch/src/api.h b/vm/src/api.h → codeswitch/src/api.h
diff --git a/vm/src/array.cpp → codeswitch/src/array.cpp b/vm/src/array.cpp → codeswitch/src/array.cpp
diff --git a/vm/src/array.h → codeswitch/src/array.h b/vm/src/array.h → codeswitch/src/array.h
diff --git a/vm/src/bitmap.cpp → codeswitch/src/bitmap.cpp b/vm/src/bitmap.cpp → codeswitch/src/bitmap.cpp
diff --git a/vm/src/bitmap.h → codeswitch/src/bitmap.h b/vm/src/bitmap.h → codeswitch/src/bitmap.h
diff --git a/vm/src/block-visitor.h → codeswitch/src/block-visitor.h b/vm/src/block-visitor.h → codeswitch/src/block-visitor.h
diff --git a/vm/src/block.cpp → codeswitch/src/block.cpp b/vm/src/block.cpp → codeswitch/src/block.cpp
diff --git a/vm/src/block.h → codeswitch/src/block.h b/vm/src/block.h → codeswitch/src/block.h
diff --git a/vm/src/bytecode.cpp → codeswitch/src/bytecode.cpp b/vm/src/bytecode.cpp → codeswitch/src/bytecode.cpp
diff --git a/vm/src/bytecode.h → codeswitch/src/bytecode.h b/vm/src/bytecode.h → codeswitch/src/bytecode.h
diff --git a/vm/src/class.cpp → codeswitch/src/class.cpp b/vm/src/class.cpp → codeswitch/src/class.cpp
diff --git a/vm/src/class.h → codeswitch/src/class.h b/vm/src/class.h → codeswitch/src/class.h
diff --git a/vm/src/defnid.cpp → codeswitch/src/defnid.cpp b/vm/src/defnid.cpp → codeswitch/src/defnid.cpp
diff --git a/vm/src/defnid.h → codeswitch/src/defnid.h b/vm/src/defnid.h → codeswitch/src/defnid.h
diff --git a/vm/src/error.h → codeswitch/src/error.h b/vm/src/error.h → codeswitch/src/error.h
diff --git a/vm/src/field.cpp → codeswitch/src/field.cpp b/vm/src/field.cpp → codeswitch/src/field.cpp
diff --git a/vm/src/field.h → codeswitch/src/field.h b/vm/src/field.h → codeswitch/src/field.h
diff --git a/vm/src/function.cpp → codeswitch/src/function.cpp b/vm/src/function.cpp → codeswitch/src/function.cpp
diff --git a/vm/src/function.h → codeswitch/src/function.h b/vm/src/function.h → codeswitch/src/function.h
diff --git a/vm/src/gc.cpp → codeswitch/src/gc.cpp b/vm/src/gc.cpp → codeswitch/src/gc.cpp
diff --git a/vm/src/gc.h → codeswitch/src/gc.h b/vm/src/gc.h → codeswitch/src/gc.h
diff --git a/vm/src/gen_builtins_h.py → codeswitch/src/gen_builtins_h.py b/vm/src/gen_builtins_h.py → codeswitch/src/gen_builtins_h.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2014 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/src/gen_flags_h.py → codeswitch/src/gen_flags_h.py b/vm/src/gen_flags_h.py → codeswitch/src/gen_flags_h.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2014-2015 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/src/gen_opcodes.py → codeswitch/src/gen_opcodes.py b/vm/src/gen_opcodes.py → codeswitch/src/gen_opcodes.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2014 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/src/gen_roots_builtins_cpp.py → codeswitch/src/gen_roots_builtins_cpp.py b/vm/src/gen_roots_builtins_cpp.py → codeswitch/src/gen_roots_builtins_cpp.py
diff --git a/vm/src/global.cpp → codeswitch/src/global.cpp b/vm/src/global.cpp → codeswitch/src/global.cpp
diff --git a/vm/src/global.h → codeswitch/src/global.h b/vm/src/global.h → codeswitch/src/global.h
diff --git a/vm/src/handle.cpp → codeswitch/src/handle.cpp b/vm/src/handle.cpp → codeswitch/src/handle.cpp
diff --git a/vm/src/handle.h → codeswitch/src/handle.h b/vm/src/handle.h → codeswitch/src/handle.h
diff --git a/vm/src/hash-table.h → codeswitch/src/hash-table.h b/vm/src/hash-table.h → codeswitch/src/hash-table.h
diff --git a/vm/src/heap.cpp → codeswitch/src/heap.cpp b/vm/src/heap.cpp → codeswitch/src/heap.cpp
diff --git a/vm/src/heap.h → codeswitch/src/heap.h b/vm/src/heap.h → codeswitch/src/heap.h
diff --git a/vm/src/index.cpp → codeswitch/src/index.cpp b/vm/src/index.cpp → codeswitch/src/index.cpp
diff --git a/vm/src/index.h → codeswitch/src/index.h b/vm/src/index.h → codeswitch/src/index.h
diff --git a/vm/src/interpreter.cpp → codeswitch/src/interpreter.cpp b/vm/src/interpreter.cpp → codeswitch/src/interpreter.cpp
diff --git a/vm/src/interpreter.h → codeswitch/src/interpreter.h b/vm/src/interpreter.h → codeswitch/src/interpreter.h
diff --git a/vm/src/linux-x64/glue-linux-x64.s → codeswitch/src/linux-x64/glue-linux-x64.s b/vm/src/linux-x64/glue-linux-x64.s → codeswitch/src/linux-x64/glue-linux-x64.s
@@ -1,4 +1,4 @@
-# Copyright 2016 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/src/linux/platform-linux.cpp → codeswitch/src/linux/platform-linux.cpp b/vm/src/linux/platform-linux.cpp → codeswitch/src/linux/platform-linux.cpp
diff --git a/vm/src/memory.cpp → codeswitch/src/memory.cpp b/vm/src/memory.cpp → codeswitch/src/memory.cpp
diff --git a/vm/src/memory.h → codeswitch/src/memory.h b/vm/src/memory.h → codeswitch/src/memory.h
diff --git a/vm/src/name.cpp → codeswitch/src/name.cpp b/vm/src/name.cpp → codeswitch/src/name.cpp
diff --git a/vm/src/name.h → codeswitch/src/name.h b/vm/src/name.h → codeswitch/src/name.h
diff --git a/vm/src/object-type-defn.cpp → codeswitch/src/object-type-defn.cpp b/vm/src/object-type-defn.cpp → codeswitch/src/object-type-defn.cpp
diff --git a/vm/src/object-type-defn.h → codeswitch/src/object-type-defn.h b/vm/src/object-type-defn.h → codeswitch/src/object-type-defn.h
diff --git a/vm/src/object.cpp → codeswitch/src/object.cpp b/vm/src/object.cpp → codeswitch/src/object.cpp
diff --git a/vm/src/object.h → codeswitch/src/object.h b/vm/src/object.h → codeswitch/src/object.h
diff --git a/vm/src/osx-x64/glue-osx-x64.s → codeswitch/src/osx-x64/glue-osx-x64.s b/vm/src/osx-x64/glue-osx-x64.s → codeswitch/src/osx-x64/glue-osx-x64.s
@@ -1,4 +1,4 @@
-# Copyright 2016 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/src/osx/platform-osx.cpp → codeswitch/src/osx/platform-osx.cpp b/vm/src/osx/platform-osx.cpp → codeswitch/src/osx/platform-osx.cpp
diff --git a/vm/src/package.cpp → codeswitch/src/package.cpp b/vm/src/package.cpp → codeswitch/src/package.cpp
diff --git a/vm/src/package.h → codeswitch/src/package.h b/vm/src/package.h → codeswitch/src/package.h
diff --git a/vm/src/platform.h → codeswitch/src/platform.h b/vm/src/platform.h → codeswitch/src/platform.h
diff --git a/vm/src/posix/platform-posix.cpp → codeswitch/src/posix/platform-posix.cpp b/vm/src/posix/platform-posix.cpp → codeswitch/src/posix/platform-posix.cpp
diff --git a/vm/src/prefix.h → codeswitch/src/prefix.h b/vm/src/prefix.h → codeswitch/src/prefix.h
diff --git a/vm/src/ptr.h → codeswitch/src/ptr.h b/vm/src/ptr.h → codeswitch/src/ptr.h
diff --git a/vm/src/roots.cpp → codeswitch/src/roots.cpp b/vm/src/roots.cpp → codeswitch/src/roots.cpp
diff --git a/vm/src/roots.h → codeswitch/src/roots.h b/vm/src/roots.h → codeswitch/src/roots.h
diff --git a/vm/src/stack.cpp → codeswitch/src/stack.cpp b/vm/src/stack.cpp → codeswitch/src/stack.cpp
diff --git a/vm/src/stack.h → codeswitch/src/stack.h b/vm/src/stack.h → codeswitch/src/stack.h
diff --git a/vm/src/string.cpp → codeswitch/src/string.cpp b/vm/src/string.cpp → codeswitch/src/string.cpp
diff --git a/vm/src/string.h → codeswitch/src/string.h b/vm/src/string.h → codeswitch/src/string.h
diff --git a/vm/src/tagged.h → codeswitch/src/tagged.h b/vm/src/tagged.h → codeswitch/src/tagged.h
diff --git a/vm/src/thread-bindle.cpp → codeswitch/src/thread-bindle.cpp b/vm/src/thread-bindle.cpp → codeswitch/src/thread-bindle.cpp
diff --git a/vm/src/thread-bindle.h → codeswitch/src/thread-bindle.h b/vm/src/thread-bindle.h → codeswitch/src/thread-bindle.h
diff --git a/vm/src/trait.cpp → codeswitch/src/trait.cpp b/vm/src/trait.cpp → codeswitch/src/trait.cpp
diff --git a/vm/src/trait.h → codeswitch/src/trait.h b/vm/src/trait.h → codeswitch/src/trait.h
diff --git a/vm/src/type-parameter.cpp → codeswitch/src/type-parameter.cpp b/vm/src/type-parameter.cpp → codeswitch/src/type-parameter.cpp
diff --git a/vm/src/type-parameter.h → codeswitch/src/type-parameter.h b/vm/src/type-parameter.h → codeswitch/src/type-parameter.h
diff --git a/vm/src/type.cpp → codeswitch/src/type.cpp b/vm/src/type.cpp → codeswitch/src/type.cpp
diff --git a/vm/src/type.h → codeswitch/src/type.h b/vm/src/type.h → codeswitch/src/type.h
diff --git a/vm/src/utils.cpp → codeswitch/src/utils.cpp b/vm/src/utils.cpp → codeswitch/src/utils.cpp
diff --git a/vm/src/utils.h → codeswitch/src/utils.h b/vm/src/utils.h → codeswitch/src/utils.h
diff --git a/vm/src/vm.cpp → codeswitch/src/vm.cpp b/vm/src/vm.cpp → codeswitch/src/vm.cpp
diff --git a/vm/src/vm.h → codeswitch/src/vm.h b/vm/src/vm.h → codeswitch/src/vm.h
diff --git a/vm/src/x64/platform-x64.cpp → codeswitch/src/x64/platform-x64.cpp b/vm/src/x64/platform-x64.cpp → codeswitch/src/x64/platform-x64.cpp
diff --git a/vm/test/ApiByName/ApiByName.cpp → codeswitch/test/ApiByName/ApiByName.cpp b/vm/test/ApiByName/ApiByName.cpp → codeswitch/test/ApiByName/ApiByName.cpp
diff --git a/vm/test/ApiByName/ApiByName.gy → codeswitch/test/ApiByName/ApiByName.gy b/vm/test/ApiByName/ApiByName.gy → codeswitch/test/ApiByName/ApiByName.gy
diff --git a/vm/test/ApiByName/Makefile → codeswitch/test/ApiByName/Makefile b/vm/test/ApiByName/Makefile → codeswitch/test/ApiByName/Makefile
diff --git a/vm/test/ApiElements/ApiElements.cpp → codeswitch/test/ApiElements/ApiElements.cpp b/vm/test/ApiElements/ApiElements.cpp → codeswitch/test/ApiElements/ApiElements.cpp
diff --git a/vm/test/ApiElements/ApiElements.gy → codeswitch/test/ApiElements/ApiElements.gy b/vm/test/ApiElements/ApiElements.gy → codeswitch/test/ApiElements/ApiElements.gy
diff --git a/vm/test/ApiElements/Makefile → codeswitch/test/ApiElements/Makefile b/vm/test/ApiElements/Makefile → codeswitch/test/ApiElements/Makefile
diff --git a/...naryCompatibility/BinaryCompatibility.cpp → ...naryCompatibility/BinaryCompatibility.cpp b/...naryCompatibility/BinaryCompatibility.cpp → ...naryCompatibility/BinaryCompatibility.cpp
diff --git a/vm/test/BinaryCompatibility/Makefile → codeswitch/test/BinaryCompatibility/Makefile b/vm/test/BinaryCompatibility/Makefile → codeswitch/test/BinaryCompatibility/Makefile
diff --git a/vm/test/BinaryCompatibility/bar-1.gy → codeswitch/test/BinaryCompatibility/bar-1.gy b/vm/test/BinaryCompatibility/bar-1.gy → codeswitch/test/BinaryCompatibility/bar-1.gy
diff --git a/vm/test/BinaryCompatibility/bar-2.gy → codeswitch/test/BinaryCompatibility/bar-2.gy b/vm/test/BinaryCompatibility/bar-2.gy → codeswitch/test/BinaryCompatibility/bar-2.gy
diff --git a/vm/test/BinaryCompatibility/foo.gy → codeswitch/test/BinaryCompatibility/foo.gy b/vm/test/BinaryCompatibility/foo.gy → codeswitch/test/BinaryCompatibility/foo.gy
diff --git a/vm/test/NativeCalls/Makefile → codeswitch/test/NativeCalls/Makefile b/vm/test/NativeCalls/Makefile → codeswitch/test/NativeCalls/Makefile
diff --git a/vm/test/NativeCalls/NativeCalls.cpp → codeswitch/test/NativeCalls/NativeCalls.cpp b/vm/test/NativeCalls/NativeCalls.cpp → codeswitch/test/NativeCalls/NativeCalls.cpp
diff --git a/vm/test/NativeCalls/registered.gy → codeswitch/test/NativeCalls/registered.gy b/vm/test/NativeCalls/registered.gy → codeswitch/test/NativeCalls/registered.gy
diff --git a/vm/test/NativeCalls/sharedlib.cpp → codeswitch/test/NativeCalls/sharedlib.cpp b/vm/test/NativeCalls/sharedlib.cpp → codeswitch/test/NativeCalls/sharedlib.cpp
diff --git a/vm/test/NativeCalls/sharedlib.gy → codeswitch/test/NativeCalls/sharedlib.gy b/vm/test/NativeCalls/sharedlib.gy → codeswitch/test/NativeCalls/sharedlib.gy
diff --git a/vm/test/NativeCalls/staticlib.cpp → codeswitch/test/NativeCalls/staticlib.cpp b/vm/test/NativeCalls/staticlib.cpp → codeswitch/test/NativeCalls/staticlib.cpp
diff --git a/vm/test/NativeCalls/staticlib.gy → codeswitch/test/NativeCalls/staticlib.gy b/vm/test/NativeCalls/staticlib.gy → codeswitch/test/NativeCalls/staticlib.gy
diff --git a/vm/test/arithmetic-evaluation-example.gy → ...tch/test/arithmetic-evaluation-example.gy b/vm/test/arithmetic-evaluation-example.gy → ...tch/test/arithmetic-evaluation-example.gy
diff --git a/vm/test/array-elements.gy → codeswitch/test/array-elements.gy b/vm/test/array-elements.gy → codeswitch/test/array-elements.gy
diff --git a/vm/test/bitset-example.gy → codeswitch/test/bitset-example.gy b/vm/test/bitset-example.gy → codeswitch/test/bitset-example.gy
diff --git a/vm/test/box-example.gy → codeswitch/test/box-example.gy b/vm/test/box-example.gy → codeswitch/test/box-example.gy
diff --git a/vm/test/box-subclass.gy → codeswitch/test/box-subclass.gy b/vm/test/box-subclass.gy → codeswitch/test/box-subclass.gy
diff --git a/vm/test/counter-example.gy → codeswitch/test/counter-example.gy b/vm/test/counter-example.gy → codeswitch/test/counter-example.gy
diff --git a/vm/test/covariant-list-example.gy → codeswitch/test/covariant-list-example.gy b/vm/test/covariant-list-example.gy → codeswitch/test/covariant-list-example.gy
diff --git a/vm/test/dict.gy → codeswitch/test/dict.gy b/vm/test/dict.gy → codeswitch/test/dict.gy
diff --git a/vm/test/factorial-8bit-example.gy → codeswitch/test/factorial-8bit-example.gy b/vm/test/factorial-8bit-example.gy → codeswitch/test/factorial-8bit-example.gy
diff --git a/vm/test/factorial-example.gy → codeswitch/test/factorial-example.gy b/vm/test/factorial-example.gy → codeswitch/test/factorial-example.gy
diff --git a/vm/test/finally-exception-in-catch.gy → ...switch/test/finally-exception-in-catch.gy b/vm/test/finally-exception-in-catch.gy → ...switch/test/finally-exception-in-catch.gy
diff --git a/vm/test/ftoi.gy → codeswitch/test/ftoi.gy b/vm/test/ftoi.gy → codeswitch/test/ftoi.gy
diff --git a/vm/test/global-access.gy → codeswitch/test/global-access.gy b/vm/test/global-access.gy → codeswitch/test/global-access.gy
diff --git a/vm/test/id.gy → codeswitch/test/id.gy b/vm/test/id.gy → codeswitch/test/id.gy
diff --git a/vm/test/import-match-append.gy → codeswitch/test/import-match-append.gy b/vm/test/import-match-append.gy → codeswitch/test/import-match-append.gy
diff --git a/vm/test/invoke-builtin-gc.gy → codeswitch/test/invoke-builtin-gc.gy b/vm/test/invoke-builtin-gc.gy → codeswitch/test/invoke-builtin-gc.gy
diff --git a/vm/test/large-alloc.gy → codeswitch/test/large-alloc.gy b/vm/test/large-alloc.gy → codeswitch/test/large-alloc.gy
diff --git a/vm/test/list-example.gy → codeswitch/test/list-example.gy b/vm/test/list-example.gy → codeswitch/test/list-example.gy
diff --git a/vm/test/list-sort-example.gy → codeswitch/test/list-sort-example.gy b/vm/test/list-sort-example.gy → codeswitch/test/list-sort-example.gy
diff --git a/vm/test/load-uninitialized.gy → codeswitch/test/load-uninitialized.gy b/vm/test/load-uninitialized.gy → codeswitch/test/load-uninitialized.gy
diff --git a/vm/test/map-list-example.gy → codeswitch/test/map-list-example.gy b/vm/test/map-list-example.gy → codeswitch/test/map-list-example.gy
diff --git a/vm/test/match-static-dynamic.gy → codeswitch/test/match-static-dynamic.gy b/vm/test/match-static-dynamic.gy → codeswitch/test/match-static-dynamic.gy
diff --git a/vm/test/match.gy → codeswitch/test/match.gy b/vm/test/match.gy → codeswitch/test/match.gy
diff --git a/vm/test/mktest.py → codeswitch/test/mktest.py b/vm/test/mktest.py → codeswitch/test/mktest.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2014-2016 Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 
 # This file is part of CodeSwitch. Use of this source code is governed by
 # the 3-clause BSD license that can be found in the LICENSE.txt file.

diff --git a/vm/test/object-to-string.gy → codeswitch/test/object-to-string.gy b/vm/test/object-to-string.gy → codeswitch/test/object-to-string.gy
diff --git a/vm/test/pi-approximation.gy → codeswitch/test/pi-approximation.gy b/vm/test/pi-approximation.gy → codeswitch/test/pi-approximation.gy
diff --git a/vm/test/primitives-to-string.gy → codeswitch/test/primitives-to-string.gy b/vm/test/primitives-to-string.gy → codeswitch/test/primitives-to-string.gy
diff --git a/vm/test/result.gy → codeswitch/test/result.gy b/vm/test/result.gy → codeswitch/test/result.gy
diff --git a/vm/test/return-nested-finally.gy → codeswitch/test/return-nested-finally.gy b/vm/test/return-nested-finally.gy → codeswitch/test/return-nested-finally.gy
diff --git a/vm/test/set.gy → codeswitch/test/set.gy b/vm/test/set.gy → codeswitch/test/set.gy
diff --git a/vm/test/std-io-length.gy → codeswitch/test/std-io-length.gy b/vm/test/std-io-length.gy → codeswitch/test/std-io-length.gy
diff --git a/vm/test/string-access.gy → codeswitch/test/string-access.gy b/vm/test/string-access.gy → codeswitch/test/string-access.gy
diff --git a/vm/test/string-compare-concat.gy → codeswitch/test/string-compare-concat.gy b/vm/test/string-compare-concat.gy → codeswitch/test/string-compare-concat.gy
diff --git a/vm/test/test-bitmap.cpp → codeswitch/test/test-bitmap.cpp b/vm/test/test-bitmap.cpp → codeswitch/test/test-bitmap.cpp
diff --git a/vm/test/test-block-visitor.cpp → codeswitch/test/test-block-visitor.cpp b/vm/test/test-block-visitor.cpp → codeswitch/test/test-block-visitor.cpp
diff --git a/vm/test/test-builtin-classes.cpp → codeswitch/test/test-builtin-classes.cpp b/vm/test/test-builtin-classes.cpp → codeswitch/test/test-builtin-classes.cpp
diff --git a/vm/test/test-bytecode.cpp → codeswitch/test/test-bytecode.cpp b/vm/test/test-bytecode.cpp → codeswitch/test/test-bytecode.cpp
diff --git a/vm/test/test-driver.cpp → codeswitch/test/test-driver.cpp b/vm/test/test-driver.cpp → codeswitch/test/test-driver.cpp
diff --git a/vm/test/test-gc.cpp → codeswitch/test/test-gc.cpp b/vm/test/test-gc.cpp → codeswitch/test/test-gc.cpp
diff --git a/vm/test/test-handle.cpp → codeswitch/test/test-handle.cpp b/vm/test/test-handle.cpp → codeswitch/test/test-handle.cpp
diff --git a/vm/test/test-hash-table.cpp → codeswitch/test/test-hash-table.cpp b/vm/test/test-hash-table.cpp → codeswitch/test/test-hash-table.cpp
diff --git a/vm/test/test-heap.cpp → codeswitch/test/test-heap.cpp b/vm/test/test-heap.cpp → codeswitch/test/test-heap.cpp
diff --git a/vm/test/test-mangling.cpp → codeswitch/test/test-mangling.cpp b/vm/test/test-mangling.cpp → codeswitch/test/test-mangling.cpp
diff --git a/vm/test/test-memory.cpp → codeswitch/test/test-memory.cpp b/vm/test/test-memory.cpp → codeswitch/test/test-memory.cpp
diff --git a/vm/test/test-name.cpp → codeswitch/test/test-name.cpp b/vm/test/test-name.cpp → codeswitch/test/test-name.cpp
diff --git a/vm/test/test-object.cpp → codeswitch/test/test-object.cpp b/vm/test/test-object.cpp → codeswitch/test/test-object.cpp
diff --git a/vm/test/test-package.cpp → codeswitch/test/test-package.cpp b/vm/test/test-package.cpp → codeswitch/test/test-package.cpp
diff --git a/vm/test/test-string.cpp → codeswitch/test/test-string.cpp b/vm/test/test-string.cpp → codeswitch/test/test-string.cpp
diff --git a/vm/test/test-type.cpp → codeswitch/test/test-type.cpp b/vm/test/test-type.cpp → codeswitch/test/test-type.cpp
diff --git a/vm/test/test-utils.cpp → codeswitch/test/test-utils.cpp b/vm/test/test-utils.cpp → codeswitch/test/test-utils.cpp
diff --git a/vm/test/test.cpp → codeswitch/test/test.cpp b/vm/test/test.cpp → codeswitch/test/test.cpp
diff --git a/vm/test/test.h → codeswitch/test/test.h b/vm/test/test.h → codeswitch/test/test.h
diff --git a/vm/test/trait-call.gy → codeswitch/test/trait-call.gy b/vm/test/trait-call.gy → codeswitch/test/trait-call.gy
diff --git a/vm/test/trunc-ext.gy → codeswitch/test/trunc-ext.gy b/vm/test/trunc-ext.gy → codeswitch/test/trunc-ext.gy
diff --git a/vm/test/uninitialized-global.gy → codeswitch/test/uninitialized-global.gy b/vm/test/uninitialized-global.gy → codeswitch/test/uninitialized-global.gy
diff --git a/vm/test/vector-example.gy → codeswitch/test/vector-example.gy b/vm/test/vector-example.gy → codeswitch/test/vector-example.gy
diff --git a/compiler/driver.py b/compiler/driver.py
diff --git a/compiler/LICENSE.txt → gypsum/LICENSE.txt b/compiler/LICENSE.txt → gypsum/LICENSE.txt
diff --git a/compiler/Makefile → gypsum/Makefile b/compiler/Makefile → gypsum/Makefile
diff --git a/gypsum/__init__.py b/gypsum/__init__.py
@@ -0,0 +1,135 @@
+# Copyright Jay Conrod. All rights reserved.
+#
+# This file is part of Gypsum. Use of this source code is governed by
+# the GPL license that can be found in the LICENSE.txt file.
+
+
+import argparse
+import os
+import os.path
+import re
+import sys
+
+import ast
+from compile_info import CompileInfo, STD_NAME
+from compiler import compile
+from errors import CompileException
+from externalization import externalize
+from ids import AstId, TARGET_PACKAGE_ID
+from inheritance_analysis import analyzeInheritance
+from ir import Package, PackageVersion, PackageDependency, Name
+from layout import layout
+from lexer import *
+from location import NoLoc
+from package_loader import PackageLoader
+from parser import *
+from scope_analysis import *
+from serialize import serialize
+from tok import NEWLINE, SPACE, COMMENT
+from type_analysis import analyzeTypeDeclarations, analyzeTypes
+
+
+def main():
+    sys.setrecursionlimit(10000)
+
+    PackageName = lambda s: Name.fromString(s, isPackageName=True)
+    cmdline = argparse.ArgumentParser(description="Compile source files into CodeSwitch packages")
+    cmdline.add_argument("sources", metavar="source", type=str, nargs="+",
+                         help="Source file names")
+    cmdline.add_argument("-p", "--package-name", action="store", type=PackageName,
+                         default=PackageName("default"),
+                         help="Name of the package being compiled")
+    cmdline.add_argument("-v", "--package-version", action="store", type=PackageVersion.fromString,
+                         default=PackageVersion([0]),
+                         help="Version of the package being compiled")
+    cmdline.add_argument("-d", "--depends", action="append", type=PackageDependency.fromString,
+                         default=[],
+                         help="Additional package dependencies")
+    cmdline.add_argument("--no-std", action="store_true",
+                         help="Do not add a dependency on the standard library")
+    cmdline.add_argument("-P", "--package-path", action="append", type=str, default=[],
+                         help="Directories containing packages that could be imported")
+    cmdline.add_argument("-o", "--output", action="store",
+                         default="out.csp",
+                         help="Name of the output file")
+    cmdline.add_argument("--print-tokens", action="store_true",
+                         help="Print raw tokens after lexical analysis")
+    cmdline.add_argument("--no-layout", action="store_true",
+                         help="Disable layout analysis")
+    cmdline.add_argument("--print-layout", action="store_true",
+                         help="Print layout tokens after layout analysis")
+    cmdline.add_argument("--print-ast", action="store_true",
+                         help="Print abstract syntax tree after syntax analysis")
+    cmdline.add_argument("--print-scope", action="store_true",
+                         help="Print scope info after scope analysis")
+    cmdline.add_argument("--print-types", action="store_true",
+                         help="Print types after type analysis")
+    cmdline.add_argument("--print-ir", action="store_true",
+                         help="Print intermediate representation after compilation")
+    cmdline.add_argument("--print-stack", action="store_true",
+                         help="Print compiler stack on error")
+    args = cmdline.parse_args()
+
+    loader = PackageLoader(args.package_path if len(args.package_path) > 0 else None)
+
+    try:
+        astModules = []
+        for sourceFileName in args.sources:
+            with open(sourceFileName) as inFile:
+                source = inFile.read()
+            rawTokens = lex(sourceFileName, source)
+            if args.print_tokens:
+                for tok in rawTokens:
+                    sys.stdout.write(str(tok) + "\n")
+            if args.no_layout:
+                layoutTokens = filter(lambda tok: tok.tag not in [NEWLINE, SPACE, COMMENT], rawTokens)
+            else:
+                layoutTokens = layout(rawTokens)
+            if args.print_layout:
+                for tok in layoutTokens:
+                    sys.stdout.write(str(tok) + "\n")
+            astModule = parse(sourceFileName, layoutTokens)
+            if args.print_ast:
+                printer = ast.Printer(sys.stdout)
+                printer.visit(astModule)
+            astModules.append(astModule)
+        astPackage = ast.Package(astModules, NoLoc)
+        astPackage.id = AstId(-1)
+
+        package = Package(TARGET_PACKAGE_ID, args.package_name, args.package_version)
+        package.dependencies.extend(args.depends)
+        isUsingStd = not args.no_std
+        if isUsingStd:
+            stdPackage = loader.loadPackage(STD_NAME, NoLoc)
+            package.ensureDependency(stdPackage)
+        info = CompileInfo(astPackage, package, loader, isUsingStd=isUsingStd)
+
+        analyzeDeclarations(info)
+        if args.print_scope:
+            sys.stderr.write("--print-scope not supported right now\n")
+        analyzeTypeDeclarations(info)
+        analyzeInheritance(info)
+        analyzeTypes(info)
+        if args.print_types:
+            sys.stderr.write("--print-types not supported right now\n")
+        convertClosures(info)
+        externalize(info)
+        compile(info)
+
+        package = info.package
+        if args.print_ir:
+            sys.stdout.write("%s\n" % str(package))
+        serialize(package, args.output)
+
+    except (CompileException, IOError) as err:
+        if args.print_stack:
+            raise
+        if isinstance(err, CompileException):
+            sys.stderr.write("%s\n" % str(err))
+        else:
+            sys.stderr.write("%s: error: %s\n" % (sourceFileName, str(err)))
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/compiler/ast.py → gypsum/ast.py b/compiler/ast.py → gypsum/ast.py
diff --git a/compiler/builtins.py → gypsum/builtins.py b/compiler/builtins.py → gypsum/builtins.py
diff --git a/compiler/bytecode.py → gypsum/bytecode.py b/compiler/bytecode.py → gypsum/bytecode.py
diff --git a/compiler/combinators.py → gypsum/combinators.py b/compiler/combinators.py → gypsum/combinators.py
diff --git a/compiler/compile_info.py → gypsum/compile_info.py b/compiler/compile_info.py → gypsum/compile_info.py
diff --git a/compiler/compiler.py → gypsum/compiler.py b/compiler/compiler.py → gypsum/compiler.py
diff --git a/compiler/compiler.spec → gypsum/compiler.spec b/compiler/compiler.spec → gypsum/compiler.spec
diff --git a/compiler/data.py → gypsum/data.py b/compiler/data.py → gypsum/data.py
diff --git a/compiler/equality.py → gypsum/equality.py b/compiler/equality.py → gypsum/equality.py
diff --git a/compiler/errors.py → gypsum/errors.py b/compiler/errors.py → gypsum/errors.py
diff --git a/compiler/externalization.py → gypsum/externalization.py b/compiler/externalization.py → gypsum/externalization.py
diff --git a/compiler/flags.py → gypsum/flags.py b/compiler/flags.py → gypsum/flags.py
diff --git a/compiler/graph.py → gypsum/graph.py b/compiler/graph.py → gypsum/graph.py
diff --git a/compiler/ids.py → gypsum/ids.py b/compiler/ids.py → gypsum/ids.py
diff --git a/compiler/inheritance_analysis.py → gypsum/inheritance_analysis.py b/compiler/inheritance_analysis.py → gypsum/inheritance_analysis.py
diff --git a/compiler/ir.py → gypsum/ir.py b/compiler/ir.py → gypsum/ir.py
diff --git a/compiler/ir_instructions.py → gypsum/ir_instructions.py b/compiler/ir_instructions.py → gypsum/ir_instructions.py
diff --git a/compiler/ir_types.py → gypsum/ir_types.py b/compiler/ir_types.py → gypsum/ir_types.py
diff --git a/compiler/ir_values.py → gypsum/ir_values.py b/compiler/ir_values.py → gypsum/ir_values.py
diff --git a/compiler/layout.py → gypsum/layout.py b/compiler/layout.py → gypsum/layout.py
diff --git a/compiler/lexer.py → gypsum/lexer.py b/compiler/lexer.py → gypsum/lexer.py
diff --git a/compiler/location.py → gypsum/location.py b/compiler/location.py → gypsum/location.py
diff --git a/compiler/name.py → gypsum/name.py b/compiler/name.py → gypsum/name.py
diff --git a/compiler/package_loader.py → gypsum/package_loader.py b/compiler/package_loader.py → gypsum/package_loader.py
diff --git a/compiler/parser.py → gypsum/parser.py b/compiler/parser.py → gypsum/parser.py
diff --git a/compiler/run-tests → gypsum/run-tests b/compiler/run-tests → gypsum/run-tests
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.7
 # -*- mode: python; -*-
 
-# Copyright 2015, Jay Conrod. All rights reserved.
+# Copyright Jay Conrod. All rights reserved.
 #
 # This file is part of Gypsum. Use of this source code is governed by
 # the GPL license that can be found in the LICENSE.txt file.

diff --git a/compiler/scope_analysis.py → gypsum/scope_analysis.py b/compiler/scope_analysis.py → gypsum/scope_analysis.py
diff --git a/compiler/serialize.py → gypsum/serialize.py b/compiler/serialize.py → gypsum/serialize.py
diff --git a/compiler/test_closure_conversion.py → gypsum/test_closure_conversion.py b/compiler/test_closure_conversion.py → gypsum/test_closure_conversion.py
diff --git a/compiler/test_combinators.py → gypsum/test_combinators.py b/compiler/test_combinators.py → gypsum/test_combinators.py
diff --git a/compiler/test_compiler.py → gypsum/test_compiler.py b/compiler/test_compiler.py → gypsum/test_compiler.py
diff --git a/compiler/test_declaration_analysis.py → gypsum/test_declaration_analysis.py b/compiler/test_declaration_analysis.py → gypsum/test_declaration_analysis.py
diff --git a/compiler/test_externalization.py → gypsum/test_externalization.py b/compiler/test_externalization.py → gypsum/test_externalization.py
diff --git a/compiler/test_graph.py → gypsum/test_graph.py b/compiler/test_graph.py → gypsum/test_graph.py
diff --git a/compiler/test_inheritance_analysis.py → gypsum/test_inheritance_analysis.py b/compiler/test_inheritance_analysis.py → gypsum/test_inheritance_analysis.py
diff --git a/compiler/test_ir.py → gypsum/test_ir.py b/compiler/test_ir.py → gypsum/test_ir.py
diff --git a/compiler/test_ir_types.py → gypsum/test_ir_types.py b/compiler/test_ir_types.py → gypsum/test_ir_types.py
diff --git a/compiler/test_layout.py → gypsum/test_layout.py b/compiler/test_layout.py → gypsum/test_layout.py
diff --git a/compiler/test_lexer.py → gypsum/test_lexer.py b/compiler/test_lexer.py → gypsum/test_lexer.py
diff --git a/compiler/test_parser.py → gypsum/test_parser.py b/compiler/test_parser.py → gypsum/test_parser.py
diff --git a/compiler/test_serialize.py → gypsum/test_serialize.py b/compiler/test_serialize.py → gypsum/test_serialize.py
diff --git a/compiler/test_type_analysis.py → gypsum/test_type_analysis.py b/compiler/test_type_analysis.py → gypsum/test_type_analysis.py
diff --git a/compiler/test_use_analysis.py → gypsum/test_use_analysis.py b/compiler/test_use_analysis.py → gypsum/test_use_analysis.py
diff --git a/compiler/test_utils.py → gypsum/test_utils.py b/compiler/test_utils.py → gypsum/test_utils.py
diff --git a/compiler/tok.py → gypsum/tok.py b/compiler/tok.py → gypsum/tok.py
diff --git a/compiler/type_analysis.py → gypsum/type_analysis.py b/compiler/type_analysis.py → gypsum/type_analysis.py
diff --git a/compiler/utils.py → gypsum/utils.py b/compiler/utils.py → gypsum/utils.py
diff --git a/compiler/utils_test.py → gypsum/utils_test.py b/compiler/utils_test.py → gypsum/utils_test.py
diff --git a/compiler/visitor.py → gypsum/visitor.py b/compiler/visitor.py → gypsum/visitor.py