Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor parser for modularity #333

Merged
merged 5 commits into from
Jan 2, 2024
Merged

Refactor parser for modularity #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c223f0
refactor(parser): new directory structure
gnikit Oct 21, 2023
f763118
refactor(parser): move Use AST node
gnikit Oct 21, 2023
61f73ae
refactor(parser): move FortranObj AST node
gnikit Oct 21, 2023
f1ce000
refactor(parser): move Diagnostic AST node
gnikit Oct 21, 2023
df9f621
refactor(parser): move all remaining AST nodes
gnikit Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion fortls/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from __future__ import annotations

import json
import os
import pprint
Expand All @@ -8,7 +10,7 @@
from .interface import cli
from .jsonrpc import JSONRPC2Connection, ReadWriter, path_from_uri
from .langserver import LangServer
from .parse_fortran import FortranFile
from .parsers.internal.parser import FortranFile
from .version import __version__

__all__ = ["__version__"]
Expand Down
20 changes: 10 additions & 10 deletions fortls/langserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@
resolve_globs,
set_keyword_ordering,
)
from fortls.intrinsics import (
from fortls.json_templates import change_json, symbol_json, uri_json
from fortls.jsonrpc import JSONRPC2Connection, path_from_uri, path_to_uri
from fortls.parsers.internal.ast import FortranAST
from fortls.parsers.internal.imports import Import
from fortls.parsers.internal.intrinsics import (
Intrinsic,
get_intrinsic_keywords,
load_intrinsics,
set_lowercase_intrinsics,
)
from fortls.json_templates import change_json, symbol_json, uri_json
from fortls.jsonrpc import JSONRPC2Connection, path_from_uri, path_to_uri
from fortls.objects import (
FortranAST,
Import,
Scope,
Use,
Variable,
from fortls.parsers.internal.parser import FortranFile, get_line_context
from fortls.parsers.internal.scope import Scope
from fortls.parsers.internal.use import Use
from fortls.parsers.internal.utilities import (
climb_type_tree,
find_in_scope,
find_in_workspace,
get_use_tree,
)
from fortls.parse_fortran import FortranFile, get_line_context
from fortls.parsers.internal.variable import Variable
from fortls.regex_patterns import create_src_file_exts_str
from fortls.version import __version__

Expand Down
Loading