remove old files; reorg file structure

guillermooo · Apr 9, 2015 · 99fbede · 99fbede
1 parent 6cdaa08
commit 99fbede
Show file tree

Hide file tree

Showing 68 changed files with 53 additions and 54 deletions.
diff --git a/ex/parsers/__init__.py → ex/parser/__init__.py b/ex/parsers/__init__.py → ex/parser/__init__.py
diff --git a/ex/parsers/new/nodes.py → ex/parser/nodes.py b/ex/parsers/new/nodes.py → ex/parser/nodes.py
@@ -1,13 +1,13 @@
 from Vintageous.ex.ex_error import ERR_NO_RANGE_ALLOWED
 from Vintageous.ex.ex_error import VimError
-from Vintageous.ex.parsers.new.tokens import TokenDigits
-from Vintageous.ex.parsers.new.tokens import TokenDot
-from Vintageous.ex.parsers.new.tokens import TokenMark
-from Vintageous.ex.parsers.new.tokens import TokenOffset
-from Vintageous.ex.parsers.new.tokens import TokenOfSearch
-from Vintageous.ex.parsers.new.tokens import TokenPercent
-from Vintageous.ex.parsers.new.tokens import TokenSearchBackward
-from Vintageous.ex.parsers.new.tokens import TokenSearchForward
+from Vintageous.ex.parser.tokens import TokenDigits
+from Vintageous.ex.parser.tokens import TokenDot
+from Vintageous.ex.parser.tokens import TokenMark
+from Vintageous.ex.parser.tokens import TokenOffset
+from Vintageous.ex.parser.tokens import TokenOfSearch
+from Vintageous.ex.parser.tokens import TokenPercent
+from Vintageous.ex.parser.tokens import TokenSearchBackward
+from Vintageous.ex.parser.tokens import TokenSearchForward
 from Vintageous.vi.search import reverse_search_by_pt
 from Vintageous.vi.utils import first_sel
 from Vintageous.vi.utils import R

diff --git a/ex/parsers/new/parser.py → ex/parser/parser.py b/ex/parsers/new/parser.py → ex/parser/parser.py
diff --git a/ex/parsers/new/scanner.py → ex/parser/scanner.py b/ex/parsers/new/scanner.py → ex/parser/scanner.py
diff --git a/ex/parsers/new/scanner_command_abbreviate.py → ex/parser/scanner_command_abbreviate.py b/ex/parsers/new/scanner_command_abbreviate.py → ex/parser/scanner_command_abbreviate.py
diff --git a/ex/parsers/new/scanner_command_browse.py → ex/parser/scanner_command_browse.py b/ex/parsers/new/scanner_command_browse.py → ex/parser/scanner_command_browse.py
diff --git a/ex/parsers/new/scanner_command_buffers.py → ex/parser/scanner_command_buffers.py b/ex/parsers/new/scanner_command_buffers.py → ex/parser/scanner_command_buffers.py
diff --git a/ex/parsers/new/scanner_command_cd_command.py → ex/parser/scanner_command_cd_command.py b/ex/parsers/new/scanner_command_cd_command.py → ex/parser/scanner_command_cd_command.py
diff --git a/...arsers/new/scanner_command_cdd_command.py → ex/parser/scanner_command_cdd_command.py b/...arsers/new/scanner_command_cdd_command.py → ex/parser/scanner_command_cdd_command.py
diff --git a/ex/parsers/new/scanner_command_copy.py → ex/parser/scanner_command_copy.py b/ex/parsers/new/scanner_command_copy.py → ex/parser/scanner_command_copy.py
diff --git a/ex/parsers/new/scanner_command_cquit.py → ex/parser/scanner_command_cquit.py b/ex/parsers/new/scanner_command_cquit.py → ex/parser/scanner_command_cquit.py
diff --git a/ex/parsers/new/scanner_command_delete.py → ex/parser/scanner_command_delete.py b/ex/parsers/new/scanner_command_delete.py → ex/parser/scanner_command_delete.py
diff --git a/...s/new/scanner_command_double_ampersand.py → ...arser/scanner_command_double_ampersand.py b/...s/new/scanner_command_double_ampersand.py → ...arser/scanner_command_double_ampersand.py
diff --git a/ex/parsers/new/scanner_command_edit.py → ex/parser/scanner_command_edit.py b/ex/parsers/new/scanner_command_edit.py → ex/parser/scanner_command_edit.py
diff --git a/ex/parsers/new/scanner_command_exit.py → ex/parser/scanner_command_exit.py b/ex/parsers/new/scanner_command_exit.py → ex/parser/scanner_command_exit.py
diff --git a/ex/parsers/new/scanner_command_file.py → ex/parser/scanner_command_file.py b/ex/parsers/new/scanner_command_file.py → ex/parser/scanner_command_file.py
diff --git a/ex/parsers/new/scanner_command_global.py → ex/parser/scanner_command_global.py b/ex/parsers/new/scanner_command_global.py → ex/parser/scanner_command_global.py
diff --git a/ex/parsers/new/scanner_command_goto.py → ex/parser/scanner_command_goto.py b/ex/parsers/new/scanner_command_goto.py → ex/parser/scanner_command_goto.py
diff --git a/ex/parsers/new/scanner_command_let.py → ex/parser/scanner_command_let.py b/ex/parsers/new/scanner_command_let.py → ex/parser/scanner_command_let.py
diff --git a/ex/parsers/new/scanner_command_map.py → ex/parser/scanner_command_map.py b/ex/parsers/new/scanner_command_map.py → ex/parser/scanner_command_map.py
diff --git a/ex/parsers/new/scanner_command_move.py → ex/parser/scanner_command_move.py b/ex/parsers/new/scanner_command_move.py → ex/parser/scanner_command_move.py
diff --git a/ex/parsers/new/scanner_command_new.py → ex/parser/scanner_command_new.py b/ex/parsers/new/scanner_command_new.py → ex/parser/scanner_command_new.py
diff --git a/ex/parsers/new/scanner_command_nmap.py → ex/parser/scanner_command_nmap.py b/ex/parsers/new/scanner_command_nmap.py → ex/parser/scanner_command_nmap.py
diff --git a/ex/parsers/new/scanner_command_nunmap.py → ex/parser/scanner_command_nunmap.py b/ex/parsers/new/scanner_command_nunmap.py → ex/parser/scanner_command_nunmap.py
diff --git a/ex/parsers/new/scanner_command_omap.py → ex/parser/scanner_command_omap.py b/ex/parsers/new/scanner_command_omap.py → ex/parser/scanner_command_omap.py
diff --git a/ex/parsers/new/scanner_command_only.py → ex/parser/scanner_command_only.py b/ex/parsers/new/scanner_command_only.py → ex/parser/scanner_command_only.py
diff --git a/ex/parsers/new/scanner_command_ounmap.py → ex/parser/scanner_command_ounmap.py b/ex/parsers/new/scanner_command_ounmap.py → ex/parser/scanner_command_ounmap.py
diff --git a/ex/parsers/new/scanner_command_print.py → ex/parser/scanner_command_print.py b/ex/parsers/new/scanner_command_print.py → ex/parser/scanner_command_print.py
diff --git a/.../new/scanner_command_print_working_dir.py → ...rser/scanner_command_print_working_dir.py b/.../new/scanner_command_print_working_dir.py → ...rser/scanner_command_print_working_dir.py
diff --git a/...s/new/scanner_command_quit_all_command.py → ...arser/scanner_command_quit_all_command.py b/...s/new/scanner_command_quit_all_command.py → ...arser/scanner_command_quit_all_command.py
diff --git a/...rsers/new/scanner_command_quit_command.py → ex/parser/scanner_command_quit_command.py b/...rsers/new/scanner_command_quit_command.py → ex/parser/scanner_command_quit_command.py
diff --git a/...ers/new/scanner_command_read_shell_out.py → ex/parser/scanner_command_read_shell_out.py b/...ers/new/scanner_command_read_shell_out.py → ex/parser/scanner_command_read_shell_out.py
diff --git a/ex/parsers/new/scanner_command_register.py → ex/parser/scanner_command_register.py b/ex/parsers/new/scanner_command_register.py → ex/parser/scanner_command_register.py
diff --git a/ex/parsers/new/scanner_command_set.py → ex/parser/scanner_command_set.py b/ex/parsers/new/scanner_command_set.py → ex/parser/scanner_command_set.py
diff --git a/ex/parsers/new/scanner_command_set_local.py → ex/parser/scanner_command_set_local.py b/ex/parsers/new/scanner_command_set_local.py → ex/parser/scanner_command_set_local.py
diff --git a/ex/parsers/new/scanner_command_shell.py → ex/parser/scanner_command_shell.py b/ex/parsers/new/scanner_command_shell.py → ex/parser/scanner_command_shell.py
diff --git a/ex/parsers/new/scanner_command_shell_out.py → ex/parser/scanner_command_shell_out.py b/ex/parsers/new/scanner_command_shell_out.py → ex/parser/scanner_command_shell_out.py
diff --git a/ex/parsers/new/scanner_command_substitute.py → ex/parser/scanner_command_substitute.py b/ex/parsers/new/scanner_command_substitute.py → ex/parser/scanner_command_substitute.py
diff --git a/.../new/scanner_command_tab_first_command.py → ...rser/scanner_command_tab_first_command.py b/.../new/scanner_command_tab_first_command.py → ...rser/scanner_command_tab_first_command.py
diff --git a/...s/new/scanner_command_tab_last_command.py → ...arser/scanner_command_tab_last_command.py b/...s/new/scanner_command_tab_last_command.py → ...arser/scanner_command_tab_last_command.py
diff --git a/...s/new/scanner_command_tab_next_command.py → ...arser/scanner_command_tab_next_command.py b/...s/new/scanner_command_tab_next_command.py → ...arser/scanner_command_tab_next_command.py
diff --git a/...s/new/scanner_command_tab_only_command.py → ...arser/scanner_command_tab_only_command.py b/...s/new/scanner_command_tab_only_command.py → ...arser/scanner_command_tab_only_command.py
diff --git a/...s/new/scanner_command_tab_open_command.py → ...arser/scanner_command_tab_open_command.py b/...s/new/scanner_command_tab_open_command.py → ...arser/scanner_command_tab_open_command.py
diff --git a/...s/new/scanner_command_tab_prev_command.py → ...arser/scanner_command_tab_prev_command.py b/...s/new/scanner_command_tab_prev_command.py → ...arser/scanner_command_tab_prev_command.py
diff --git a/...rsers/new/scanner_command_unabbreviate.py → ex/parser/scanner_command_unabbreviate.py b/...rsers/new/scanner_command_unabbreviate.py → ex/parser/scanner_command_unabbreviate.py
diff --git a/ex/parsers/new/scanner_command_unmap.py → ex/parser/scanner_command_unmap.py b/ex/parsers/new/scanner_command_unmap.py → ex/parser/scanner_command_unmap.py
diff --git a/ex/parsers/new/scanner_command_unvsplit.py → ex/parser/scanner_command_unvsplit.py b/ex/parsers/new/scanner_command_unvsplit.py → ex/parser/scanner_command_unvsplit.py
diff --git a/ex/parsers/new/scanner_command_vmap.py → ex/parser/scanner_command_vmap.py b/ex/parsers/new/scanner_command_vmap.py → ex/parser/scanner_command_vmap.py
diff --git a/ex/parsers/new/scanner_command_vsplit.py → ex/parser/scanner_command_vsplit.py b/ex/parsers/new/scanner_command_vsplit.py → ex/parser/scanner_command_vsplit.py
diff --git a/ex/parsers/new/scanner_command_vunmap.py → ex/parser/scanner_command_vunmap.py b/ex/parsers/new/scanner_command_vunmap.py → ex/parser/scanner_command_vunmap.py
diff --git a/ex/parsers/new/scanner_command_write.py → ex/parser/scanner_command_write.py b/ex/parsers/new/scanner_command_write.py → ex/parser/scanner_command_write.py
diff --git a/ex/parsers/new/scanner_command_write_all.py → ex/parser/scanner_command_write_all.py b/ex/parsers/new/scanner_command_write_all.py → ex/parser/scanner_command_write_all.py
diff --git a/...scanner_command_write_and_quit_command.py → ...scanner_command_write_and_quit_command.py b/...scanner_command_write_and_quit_command.py → ...scanner_command_write_and_quit_command.py
diff --git a/ex/parsers/new/scanner_command_write_file.py → ex/parser/scanner_command_write_file.py b/ex/parsers/new/scanner_command_write_file.py → ex/parser/scanner_command_write_file.py
diff --git a/ex/parsers/new/scanner_command_yank.py → ex/parser/scanner_command_yank.py b/ex/parsers/new/scanner_command_yank.py → ex/parser/scanner_command_yank.py
diff --git a/ex/parsers/new/state.py → ex/parser/state.py b/ex/parsers/new/state.py → ex/parser/state.py
diff --git a/ex/parsers/new/subscanners.py → ex/parser/subscanners.py b/ex/parsers/new/subscanners.py → ex/parser/subscanners.py
diff --git a/ex/parsers/new/tokens.py → ex/parser/tokens.py b/ex/parsers/new/tokens.py → ex/parser/tokens.py
diff --git a/ex/parsers/new/tokens_base.py → ex/parser/tokens_base.py b/ex/parsers/new/tokens_base.py → ex/parser/tokens_base.py
diff --git a/ex/parsers/new/__init__.py b/ex/parsers/new/__init__.py
diff --git a/ex_commands.py b/ex_commands.py
@@ -19,7 +19,7 @@
 from Vintageous.ex.ex_error import ERR_READONLY_FILE
 from Vintageous.ex.ex_error import handle_not_implemented
 from Vintageous.ex.ex_error import VimError
-from Vintageous.ex.parsers.new.parser import parse_ex_command
+from Vintageous.ex.parser.parser import parse_ex_command
 from Vintageous.ex.plat.windows import get_oem_cp
 from Vintageous.ex.plat.windows import get_startup_info
 from Vintageous.state import State

diff --git a/ex_main.py b/ex_main.py
@@ -12,8 +12,8 @@
 from Vintageous.ex.completions import wants_setting_completions
 from Vintageous.ex.ex_error import display_error2
 from Vintageous.ex.ex_error import VimError
-from Vintageous.ex.parsers.new.parser import parse_ex_command
-from Vintageous.ex.parsers.new.scanner_command_goto import TokenCommandGoto
+from Vintageous.ex.parser.parser import parse_ex_command
+from Vintageous.ex.parser.scanner_command_goto import TokenCommandGoto
 from Vintageous.state import State
 from Vintageous.vi.settings import iter_settings
 from Vintageous.vi.sublime import show_ipanel

diff --git a/manifest.json b/manifest.json
@@ -20,8 +20,7 @@
 			["./tests/commands/*.py", []],
 			["./vi/*.py", []],
 			["./ex/*.py", []],
-			["./ex/parsers/*.py", []],
-			["./ex/parsers/new/*.py", []],
+			["./ex/parser/*.py", []],
 			["./plugins/*.py", []],
 			["./ex/plat/*.py", []],
 

diff --git a/tests/ex/parsers/new/test_nodes.py b/tests/ex/parsers/new/test_nodes.py
@@ -1,15 +1,15 @@
 import unittest
 
-from Vintageous.ex.parsers.new.nodes import RangeNode
-from Vintageous.ex.parsers.new.nodes import CommandLineNode
-from Vintageous.ex.parsers.new.tokens import TokenDot
-from Vintageous.ex.parsers.new.tokens import TokenDigits
-from Vintageous.ex.parsers.new.tokens import TokenSearchForward
-from Vintageous.ex.parsers.new.tokens import TokenSearchBackward
-from Vintageous.ex.parsers.new.tokens import TokenPercent
-from Vintageous.ex.parsers.new.tokens import TokenOffset
-from Vintageous.ex.parsers.new.tokens import TokenMark
-from Vintageous.ex.parsers.new.scanner_command_substitute import TokenCommandSubstitute
+from Vintageous.ex.parser.nodes import RangeNode
+from Vintageous.ex.parser.nodes import CommandLineNode
+from Vintageous.ex.parser.tokens import TokenDot
+from Vintageous.ex.parser.tokens import TokenDigits
+from Vintageous.ex.parser.tokens import TokenSearchForward
+from Vintageous.ex.parser.tokens import TokenSearchBackward
+from Vintageous.ex.parser.tokens import TokenPercent
+from Vintageous.ex.parser.tokens import TokenOffset
+from Vintageous.ex.parser.tokens import TokenMark
+from Vintageous.ex.parser.scanner_command_substitute import TokenCommandSubstitute
 
 from Vintageous.tests import ViewTest
 

diff --git a/tests/ex/parsers/new/test_parser.py b/tests/ex/parsers/new/test_parser.py
@@ -1,17 +1,17 @@
 import unittest
 
-from Vintageous.ex.parsers.new.parser import parse_ex_command
-from Vintageous.ex.parsers.new.scanner import Scanner
-from Vintageous.ex.parsers.new.tokens import TokenDot
-from Vintageous.ex.parsers.new.tokens import TokenSearchForward
-from Vintageous.ex.parsers.new.tokens import TokenSearchBackward
-from Vintageous.ex.parsers.new.tokens import TokenDollar
-from Vintageous.ex.parsers.new.tokens import TokenDigits
-from Vintageous.ex.parsers.new.tokens import TokenPercent
-from Vintageous.ex.parsers.new.tokens import TokenMark
-from Vintageous.ex.parsers.new.tokens import TokenOffset
-from Vintageous.ex.parsers.new.tokens import TokenComma
-from Vintageous.ex.parsers.new.tokens import TokenSemicolon
+from Vintageous.ex.parser.parser import parse_ex_command
+from Vintageous.ex.parser.scanner import Scanner
+from Vintageous.ex.parser.tokens import TokenDot
+from Vintageous.ex.parser.tokens import TokenSearchForward
+from Vintageous.ex.parser.tokens import TokenSearchBackward
+from Vintageous.ex.parser.tokens import TokenDollar
+from Vintageous.ex.parser.tokens import TokenDigits
+from Vintageous.ex.parser.tokens import TokenPercent
+from Vintageous.ex.parser.tokens import TokenMark
+from Vintageous.ex.parser.tokens import TokenOffset
+from Vintageous.ex.parser.tokens import TokenComma
+from Vintageous.ex.parser.tokens import TokenSemicolon
 
 
 class parse_line_ref_Tests(unittest.TestCase):

diff --git a/tests/ex/parsers/new/test_parser_state.py b/tests/ex/parsers/new/test_parser_state.py
@@ -1,6 +1,6 @@
 import unittest
 
-from Vintageous.ex.parsers.new.parser import ParserState
+from Vintageous.ex.parser.parser import ParserState
 
 
 class ParserState_Tests(unittest.TestCase):

diff --git a/tests/ex/parsers/new/test_scanner.py b/tests/ex/parsers/new/test_scanner.py
@@ -1,20 +1,20 @@
 import unittest
 
-from Vintageous.ex.parsers.new.scanner import Scanner
-from Vintageous.ex.parsers.new.scanner_command_substitute import TokenCommandSubstitute
-from Vintageous.ex.parsers.new.scanner_command_write import TokenCommandWrite
-from Vintageous.ex.parsers.new.state import EOF
-from Vintageous.ex.parsers.new.tokens import TokenComma
-from Vintageous.ex.parsers.new.tokens import TokenDigits
-from Vintageous.ex.parsers.new.tokens import TokenDollar
-from Vintageous.ex.parsers.new.tokens import TokenDot
-from Vintageous.ex.parsers.new.tokens import TokenEof
-from Vintageous.ex.parsers.new.tokens import TokenMark
-from Vintageous.ex.parsers.new.tokens import TokenOffset
-from Vintageous.ex.parsers.new.tokens import TokenPercent
-from Vintageous.ex.parsers.new.tokens import TokenSearchBackward
-from Vintageous.ex.parsers.new.tokens import TokenSearchForward
-from Vintageous.ex.parsers.new.tokens import TokenSemicolon
+from Vintageous.ex.parser.scanner import Scanner
+from Vintageous.ex.parser.scanner_command_substitute import TokenCommandSubstitute
+from Vintageous.ex.parser.scanner_command_write import TokenCommandWrite
+from Vintageous.ex.parser.state import EOF
+from Vintageous.ex.parser.tokens import TokenComma
+from Vintageous.ex.parser.tokens import TokenDigits
+from Vintageous.ex.parser.tokens import TokenDollar
+from Vintageous.ex.parser.tokens import TokenDot
+from Vintageous.ex.parser.tokens import TokenEof
+from Vintageous.ex.parser.tokens import TokenMark
+from Vintageous.ex.parser.tokens import TokenOffset
+from Vintageous.ex.parser.tokens import TokenPercent
+from Vintageous.ex.parser.tokens import TokenSearchBackward
+from Vintageous.ex.parser.tokens import TokenSearchForward
+from Vintageous.ex.parser.tokens import TokenSemicolon
 
 
 class ScannerTests(unittest.TestCase):

diff --git a/tests/ex/parsers/new/test_scanner_state.py b/tests/ex/parsers/new/test_scanner_state.py
@@ -1,8 +1,8 @@
 import unittest
 
-from Vintageous.ex.parsers.new.state import State
-from Vintageous.ex.parsers.new.state import EOF
-from Vintageous.ex.parsers.new.tokens import TOKEN_UNKNOWN
+from Vintageous.ex.parser.state import State
+from Vintageous.ex.parser.state import EOF
+from Vintageous.ex.parser.tokens import TOKEN_UNKNOWN
 
 
 class ScannerTests(unittest.TestCase):