diff --git a/ex/parsers/__init__.py b/ex/parser/__init__.py similarity index 100% rename from ex/parsers/__init__.py rename to ex/parser/__init__.py diff --git a/ex/parsers/new/nodes.py b/ex/parser/nodes.py similarity index 92% rename from ex/parsers/new/nodes.py rename to ex/parser/nodes.py index 803615d..3257967 100644 --- a/ex/parsers/new/nodes.py +++ b/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 b/ex/parser/parser.py similarity index 100% rename from ex/parsers/new/parser.py rename to ex/parser/parser.py diff --git a/ex/parsers/new/scanner.py b/ex/parser/scanner.py similarity index 100% rename from ex/parsers/new/scanner.py rename to ex/parser/scanner.py diff --git a/ex/parsers/new/scanner_command_abbreviate.py b/ex/parser/scanner_command_abbreviate.py similarity index 100% rename from ex/parsers/new/scanner_command_abbreviate.py rename to ex/parser/scanner_command_abbreviate.py diff --git a/ex/parsers/new/scanner_command_browse.py b/ex/parser/scanner_command_browse.py similarity index 100% rename from ex/parsers/new/scanner_command_browse.py rename to ex/parser/scanner_command_browse.py diff --git a/ex/parsers/new/scanner_command_buffers.py b/ex/parser/scanner_command_buffers.py similarity index 100% rename from ex/parsers/new/scanner_command_buffers.py rename to ex/parser/scanner_command_buffers.py diff --git a/ex/parsers/new/scanner_command_cd_command.py b/ex/parser/scanner_command_cd_command.py similarity index 100% rename from ex/parsers/new/scanner_command_cd_command.py rename to ex/parser/scanner_command_cd_command.py diff --git a/ex/parsers/new/scanner_command_cdd_command.py b/ex/parser/scanner_command_cdd_command.py similarity index 100% rename from ex/parsers/new/scanner_command_cdd_command.py rename to ex/parser/scanner_command_cdd_command.py diff --git a/ex/parsers/new/scanner_command_copy.py b/ex/parser/scanner_command_copy.py similarity index 100% rename from ex/parsers/new/scanner_command_copy.py rename to ex/parser/scanner_command_copy.py diff --git a/ex/parsers/new/scanner_command_cquit.py b/ex/parser/scanner_command_cquit.py similarity index 100% rename from ex/parsers/new/scanner_command_cquit.py rename to ex/parser/scanner_command_cquit.py diff --git a/ex/parsers/new/scanner_command_delete.py b/ex/parser/scanner_command_delete.py similarity index 100% rename from ex/parsers/new/scanner_command_delete.py rename to ex/parser/scanner_command_delete.py diff --git a/ex/parsers/new/scanner_command_double_ampersand.py b/ex/parser/scanner_command_double_ampersand.py similarity index 100% rename from ex/parsers/new/scanner_command_double_ampersand.py rename to ex/parser/scanner_command_double_ampersand.py diff --git a/ex/parsers/new/scanner_command_edit.py b/ex/parser/scanner_command_edit.py similarity index 100% rename from ex/parsers/new/scanner_command_edit.py rename to ex/parser/scanner_command_edit.py diff --git a/ex/parsers/new/scanner_command_exit.py b/ex/parser/scanner_command_exit.py similarity index 100% rename from ex/parsers/new/scanner_command_exit.py rename to ex/parser/scanner_command_exit.py diff --git a/ex/parsers/new/scanner_command_file.py b/ex/parser/scanner_command_file.py similarity index 100% rename from ex/parsers/new/scanner_command_file.py rename to ex/parser/scanner_command_file.py diff --git a/ex/parsers/new/scanner_command_global.py b/ex/parser/scanner_command_global.py similarity index 100% rename from ex/parsers/new/scanner_command_global.py rename to ex/parser/scanner_command_global.py diff --git a/ex/parsers/new/scanner_command_goto.py b/ex/parser/scanner_command_goto.py similarity index 100% rename from ex/parsers/new/scanner_command_goto.py rename to ex/parser/scanner_command_goto.py diff --git a/ex/parsers/new/scanner_command_let.py b/ex/parser/scanner_command_let.py similarity index 100% rename from ex/parsers/new/scanner_command_let.py rename to ex/parser/scanner_command_let.py diff --git a/ex/parsers/new/scanner_command_map.py b/ex/parser/scanner_command_map.py similarity index 100% rename from ex/parsers/new/scanner_command_map.py rename to ex/parser/scanner_command_map.py diff --git a/ex/parsers/new/scanner_command_move.py b/ex/parser/scanner_command_move.py similarity index 100% rename from ex/parsers/new/scanner_command_move.py rename to ex/parser/scanner_command_move.py diff --git a/ex/parsers/new/scanner_command_new.py b/ex/parser/scanner_command_new.py similarity index 100% rename from ex/parsers/new/scanner_command_new.py rename to ex/parser/scanner_command_new.py diff --git a/ex/parsers/new/scanner_command_nmap.py b/ex/parser/scanner_command_nmap.py similarity index 100% rename from ex/parsers/new/scanner_command_nmap.py rename to ex/parser/scanner_command_nmap.py diff --git a/ex/parsers/new/scanner_command_nunmap.py b/ex/parser/scanner_command_nunmap.py similarity index 100% rename from ex/parsers/new/scanner_command_nunmap.py rename to ex/parser/scanner_command_nunmap.py diff --git a/ex/parsers/new/scanner_command_omap.py b/ex/parser/scanner_command_omap.py similarity index 100% rename from ex/parsers/new/scanner_command_omap.py rename to ex/parser/scanner_command_omap.py diff --git a/ex/parsers/new/scanner_command_only.py b/ex/parser/scanner_command_only.py similarity index 100% rename from ex/parsers/new/scanner_command_only.py rename to ex/parser/scanner_command_only.py diff --git a/ex/parsers/new/scanner_command_ounmap.py b/ex/parser/scanner_command_ounmap.py similarity index 100% rename from ex/parsers/new/scanner_command_ounmap.py rename to ex/parser/scanner_command_ounmap.py diff --git a/ex/parsers/new/scanner_command_print.py b/ex/parser/scanner_command_print.py similarity index 100% rename from ex/parsers/new/scanner_command_print.py rename to ex/parser/scanner_command_print.py diff --git a/ex/parsers/new/scanner_command_print_working_dir.py b/ex/parser/scanner_command_print_working_dir.py similarity index 100% rename from ex/parsers/new/scanner_command_print_working_dir.py rename to ex/parser/scanner_command_print_working_dir.py diff --git a/ex/parsers/new/scanner_command_quit_all_command.py b/ex/parser/scanner_command_quit_all_command.py similarity index 100% rename from ex/parsers/new/scanner_command_quit_all_command.py rename to ex/parser/scanner_command_quit_all_command.py diff --git a/ex/parsers/new/scanner_command_quit_command.py b/ex/parser/scanner_command_quit_command.py similarity index 100% rename from ex/parsers/new/scanner_command_quit_command.py rename to ex/parser/scanner_command_quit_command.py diff --git a/ex/parsers/new/scanner_command_read_shell_out.py b/ex/parser/scanner_command_read_shell_out.py similarity index 100% rename from ex/parsers/new/scanner_command_read_shell_out.py rename to ex/parser/scanner_command_read_shell_out.py diff --git a/ex/parsers/new/scanner_command_register.py b/ex/parser/scanner_command_register.py similarity index 100% rename from ex/parsers/new/scanner_command_register.py rename to ex/parser/scanner_command_register.py diff --git a/ex/parsers/new/scanner_command_set.py b/ex/parser/scanner_command_set.py similarity index 100% rename from ex/parsers/new/scanner_command_set.py rename to ex/parser/scanner_command_set.py diff --git a/ex/parsers/new/scanner_command_set_local.py b/ex/parser/scanner_command_set_local.py similarity index 100% rename from ex/parsers/new/scanner_command_set_local.py rename to ex/parser/scanner_command_set_local.py diff --git a/ex/parsers/new/scanner_command_shell.py b/ex/parser/scanner_command_shell.py similarity index 100% rename from ex/parsers/new/scanner_command_shell.py rename to ex/parser/scanner_command_shell.py diff --git a/ex/parsers/new/scanner_command_shell_out.py b/ex/parser/scanner_command_shell_out.py similarity index 100% rename from ex/parsers/new/scanner_command_shell_out.py rename to ex/parser/scanner_command_shell_out.py diff --git a/ex/parsers/new/scanner_command_substitute.py b/ex/parser/scanner_command_substitute.py similarity index 100% rename from ex/parsers/new/scanner_command_substitute.py rename to ex/parser/scanner_command_substitute.py diff --git a/ex/parsers/new/scanner_command_tab_first_command.py b/ex/parser/scanner_command_tab_first_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_first_command.py rename to ex/parser/scanner_command_tab_first_command.py diff --git a/ex/parsers/new/scanner_command_tab_last_command.py b/ex/parser/scanner_command_tab_last_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_last_command.py rename to ex/parser/scanner_command_tab_last_command.py diff --git a/ex/parsers/new/scanner_command_tab_next_command.py b/ex/parser/scanner_command_tab_next_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_next_command.py rename to ex/parser/scanner_command_tab_next_command.py diff --git a/ex/parsers/new/scanner_command_tab_only_command.py b/ex/parser/scanner_command_tab_only_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_only_command.py rename to ex/parser/scanner_command_tab_only_command.py diff --git a/ex/parsers/new/scanner_command_tab_open_command.py b/ex/parser/scanner_command_tab_open_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_open_command.py rename to ex/parser/scanner_command_tab_open_command.py diff --git a/ex/parsers/new/scanner_command_tab_prev_command.py b/ex/parser/scanner_command_tab_prev_command.py similarity index 100% rename from ex/parsers/new/scanner_command_tab_prev_command.py rename to ex/parser/scanner_command_tab_prev_command.py diff --git a/ex/parsers/new/scanner_command_unabbreviate.py b/ex/parser/scanner_command_unabbreviate.py similarity index 100% rename from ex/parsers/new/scanner_command_unabbreviate.py rename to ex/parser/scanner_command_unabbreviate.py diff --git a/ex/parsers/new/scanner_command_unmap.py b/ex/parser/scanner_command_unmap.py similarity index 100% rename from ex/parsers/new/scanner_command_unmap.py rename to ex/parser/scanner_command_unmap.py diff --git a/ex/parsers/new/scanner_command_unvsplit.py b/ex/parser/scanner_command_unvsplit.py similarity index 100% rename from ex/parsers/new/scanner_command_unvsplit.py rename to ex/parser/scanner_command_unvsplit.py diff --git a/ex/parsers/new/scanner_command_vmap.py b/ex/parser/scanner_command_vmap.py similarity index 100% rename from ex/parsers/new/scanner_command_vmap.py rename to ex/parser/scanner_command_vmap.py diff --git a/ex/parsers/new/scanner_command_vsplit.py b/ex/parser/scanner_command_vsplit.py similarity index 100% rename from ex/parsers/new/scanner_command_vsplit.py rename to ex/parser/scanner_command_vsplit.py diff --git a/ex/parsers/new/scanner_command_vunmap.py b/ex/parser/scanner_command_vunmap.py similarity index 100% rename from ex/parsers/new/scanner_command_vunmap.py rename to ex/parser/scanner_command_vunmap.py diff --git a/ex/parsers/new/scanner_command_write.py b/ex/parser/scanner_command_write.py similarity index 100% rename from ex/parsers/new/scanner_command_write.py rename to ex/parser/scanner_command_write.py diff --git a/ex/parsers/new/scanner_command_write_all.py b/ex/parser/scanner_command_write_all.py similarity index 100% rename from ex/parsers/new/scanner_command_write_all.py rename to ex/parser/scanner_command_write_all.py diff --git a/ex/parsers/new/scanner_command_write_and_quit_command.py b/ex/parser/scanner_command_write_and_quit_command.py similarity index 100% rename from ex/parsers/new/scanner_command_write_and_quit_command.py rename to ex/parser/scanner_command_write_and_quit_command.py diff --git a/ex/parsers/new/scanner_command_write_file.py b/ex/parser/scanner_command_write_file.py similarity index 100% rename from ex/parsers/new/scanner_command_write_file.py rename to ex/parser/scanner_command_write_file.py diff --git a/ex/parsers/new/scanner_command_yank.py b/ex/parser/scanner_command_yank.py similarity index 100% rename from ex/parsers/new/scanner_command_yank.py rename to ex/parser/scanner_command_yank.py diff --git a/ex/parsers/new/state.py b/ex/parser/state.py similarity index 100% rename from ex/parsers/new/state.py rename to ex/parser/state.py diff --git a/ex/parsers/new/subscanners.py b/ex/parser/subscanners.py similarity index 100% rename from ex/parsers/new/subscanners.py rename to ex/parser/subscanners.py diff --git a/ex/parsers/new/tokens.py b/ex/parser/tokens.py similarity index 100% rename from ex/parsers/new/tokens.py rename to ex/parser/tokens.py diff --git a/ex/parsers/new/tokens_base.py b/ex/parser/tokens_base.py similarity index 100% rename from ex/parsers/new/tokens_base.py rename to ex/parser/tokens_base.py diff --git a/ex/parsers/new/__init__.py b/ex/parsers/new/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ex_commands.py b/ex_commands.py index e01978a..bbf61b9 100755 --- 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 index 2c3449f..4c07a99 100644 --- 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 index c117528..ee83987 100644 --- 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 index f43f22e..d2f9cba 100644 --- 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 index 390fe3f..44ecf40 100644 --- 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 index d0b7fda..6424583 100644 --- 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 index 8780703..ca9910e 100644 --- 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 index 0545df3..624eccf 100644 --- 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):