Draft of Version 1.0 #925

erezsh · 2021-06-27T21:29:30Z

Changes so far

Removed deprecated code
Removed most of the code for Python 2 compatibility.

codecov-commenter · 2021-06-27T21:29:37Z

Codecov Report

Merging #925 (77b07bb) into master (82ad512) will increase coverage by 0.51%.
The diff coverage is 92.72%.

@@            Coverage Diff             @@
##           master     #925      +/-   ##
==========================================
+ Coverage   87.12%   87.63%   +0.51%     
==========================================
  Files          50       49       -1     
  Lines        6804     6893      +89     
==========================================
+ Hits         5928     6041     +113     
+ Misses        876      852      -24

Flag	Coverage Δ
unittests	`87.63% <92.72%> (+0.51%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
lark/ast_utils.py	`0.00% <0.00%> (ø)`
lark/parsers/lalr_interactive_parser.py	`77.77% <ø> (-0.69%)`	⬇️
setup.py	`0.00% <ø> (ø)`
lark/indenter.py	`87.67% <81.81%> (-5.67%)`	⬇️
lark/tree.py	`65.89% <84.37%> (+3.17%)`	⬆️
lark/exceptions.py	`86.00% <88.00%> (+0.70%)`	⬆️
lark/lark.py	`83.72% <89.65%> (+1.93%)`	⬆️
lark/common.py	`95.34% <93.33%> (+4.17%)`	⬆️
lark/lexer.py	`93.35% <96.62%> (+1.30%)`	⬆️
lark/__init__.py	`100.00% <100.00%> (ø)`
... and 13 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 82ad512...77b07bb. Read the comment docs.

erezsh · 2021-06-27T21:44:18Z

Tasks remaining:

Merge .pyi files into the code, and remove them.
Update the interface to be more self-consistent (ideas?)
Improve the code with Python3 features, where possible (optional/low priority)
Anything else?

MegaIng

A few initial comments. I will take another look or too and maybe even just implement everything mentioned here in my own commits.

.github/workflows/tests.yml

MegaIng · 2021-06-27T23:11:52Z

lark/exceptions.py

@@ -193,7 +191,7 @@ def __init__(self, token, expected, considered_rules=None, state=None, interacti
 # TODO considered_rules and expected can be figured out using state
 self.line = getattr(token, 'line', '?')
 self.column = getattr(token, 'column', '?')
- self.pos_in_stream = getattr(token, 'pos_in_stream', None)
+ self.pos_in_stream = getattr(token, 'start_pos', None)


We can just rename the attribute.

You mean, in the exceptions?

I'm less concerned about that (and anyway, start_pos wouldn't be a good name in this case). But I'm open to suggestions.

Fair enough. Keep pos_in_stream

lark/lark.py

lark/tools/standalone.py

lark/utils.py

ast_utils, grammar, and indenter

ThatXliner · 2021-06-28T17:15:54Z

About the type-merging, you can possibly use https:/ilevkivskyi/com2ann to convert type comments to type annotations. I remember finding a repo that can merge type annotations... I'll get back when I remember it

MegaIng · 2021-06-28T17:17:18Z

@ThatXliner We are not using Type comments. We have separate stub files.

ThatXliner · 2021-06-28T17:23:51Z

@ThatXliner We are not using Type comments. We have separate stub files.

Oh right. My bad.

I found https:/ambv/retype but it wasn't what I remembered. Hope it helps, though

MegaIng

(I think setup.py also needs to be updated for py36)

load_grammar, reconstruct, and visitors

exceptions, lark, and tree

__init__, lexer, and parsers/__init__

chanicpanic · 2021-08-17T19:02:09Z

Here is a list of compatibility/deprecated code I have come across in case you want to remove some of it.

visitors.py:81: __visit_tokens__ backwards compatibility
lark.py:306: Python 2.7 compatibility
lark.py:371: Old resolve__antiscore_sum check
lark.py:403: Possible deprecation of lexer callbacks
exceptions.py:92: Default value of use_accepts is for backwards compatibility
exceptions.py:233: Possible deprecation of UnexpectedToken.expected
load_grammar.py:819: Python 2.7 code?
load_grammar.py:1070: Python 2.7 compatibility
utils.py:127: Issue with wraps in 2.7

More updates to v1.0

erezsh · 2021-09-12T19:50:17Z

Fixes some of the items @chanicpanic mentioned in this PR - #993

Regarding

__visit_tokens__ - To be honest I'm not sure why it bothered us. I think it can stay the way it is.
deprecation of lexer callbacks - I used to think that maybe the transformer parameter should be enough, since we added support for tokens. But it's still useful for going over ignored tokens, so unless we let transformer run on ignored tokens too, I think we should leave it.
UnexpectedToken.expected - Maybe it's still worth keeping? I have no strong opinion atm

erezsh · 2021-09-12T19:51:51Z

Btw, @chanicpanic & @MegaIng,

I think we should just merge this, and continue work over the master branch. Any objections?

MegaIng · 2021-09-12T19:53:43Z

That would mean that we are not going to release any other version before 1.0, not even a 0.12.1 release. But that would be fine with me.

erezsh · 2021-09-12T19:56:57Z

We can always continue working on a 0.12 branch. But I'm not sure that we need to.

MegaIng · 2021-09-12T19:57:40Z

Fair enough. Merge is good IMO. (Or do we also want to rename to main in the process?)

erezsh · 2021-09-12T20:01:07Z

Or do we also want to rename to main in the process?

Seems pointless to me

MegaIng · 2021-09-12T20:07:38Z

Seems pointless to me

Fair enough. I dont have a strong opinion either, but this would be a prime opportunity.

chanicpanic · 2021-09-12T20:33:29Z

No objections to merging from me.

erezsh · 2021-09-12T20:49:29Z

Alright. I'll do it tomorrow then.

erezsh · 2021-09-13T08:14:38Z

Lark master is now officially Python 3 only!

erezsh added 4 commits June 27, 2021 23:31

Removed some of the Python2 compatibility code

8a00284

Removed deprecated code

eb45324

Remove tests for Python 2

8d082b5

Remove tests for Python 2

d54f685

Remove tests for Python 2

def06db

MegaIng suggested changes Jun 27, 2021

View reviewed changes

erezsh and others added 2 commits June 28, 2021 14:35

Remove more Python 2 code

ff686fc

Start merging .pyi files

8d0cdee

ast_utils, grammar, and indenter

Removed code relevant to versions below 3.6

9b77270

MegaIng reviewed Jun 28, 2021

View reviewed changes

Continue merging .pyi files

d7b819e

load_grammar, reconstruct, and visitors

chanicpanic and others added 13 commits June 28, 2021 15:56

More .pyi merging

089bc2b

exceptions, lark, and tree

Small fix to setup.py

a5f3ec4

Last batch of .pyi files

433adee

__init__, lexer, and parsers/__init__

Merge the Literal types

be76059

Declare instance variable types at class level

bca7c79

Update mypy workflow

1c4af01

Corrections for PR and some mypy errors

4bc9445

Remove default values on type declarations and mark ClassVars

804114d

Merge branch 'master' into 1.0a

9c975d9

Small fix

ead7a04

Fixup: change typehint to Sequence

d0f2598

Remove tests for versions below 3.6

ee75166

Fixup: moved import to standalone.

8aa4bfb

erezsh added 7 commits August 17, 2021 13:53

Merge pull request #959 from lark-parser/v1.0-merge-master

b79c449

Merge remote-tracking branch 'origin/v1.0' into 1.0b

554835f

Merge branch 'v1.0' into master_tmp

9f05a37

Merge pull request #963 from lark-parser/v1.0-merge-master2

be3be18

Merge branch 'v1.0' into 1.0b

f83fd6b

Changed sequence to collection

a8900c1

NotImplemented -> NotImplmementedError

343c22e

Merge pull request #964 from lark-parser/1.0b

c3fc3fa

More updates to v1.0

antoniotejada mentioned this pull request Aug 29, 2021

Using the LALR file cache on Python 2.7 fails with "unbound method exists() must be called with FS instance as first argument (got str instance instead)" #977

Closed

erezsh added 2 commits September 12, 2021 20:43

Various backwards incompatible fixes for v1.0

4e96b96

Remove old comment

5eecb7f

Added CHANGELOG.md

5eb3484

Fix tests for PR

19b2aa9

Merge pull request #993 from lark-parser/v1.0_fixes

7c569f3

erezsh added 2 commits September 12, 2021 21:50

Token priority is now 0 by default

36c9575

Merge pull request #994 from lark-parser/v1.0_fixes2

77b07bb

erezsh merged commit efc881a into master Sep 13, 2021

erezsh deleted the v1.0 branch September 16, 2021 14:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Draft of Version 1.0 #925

Draft of Version 1.0 #925

erezsh commented Jun 27, 2021

codecov-commenter commented Jun 27, 2021 •

edited

Loading

erezsh commented Jun 27, 2021

MegaIng left a comment

MegaIng Jun 27, 2021

erezsh Jun 28, 2021

MegaIng Jun 28, 2021

ThatXliner commented Jun 28, 2021 •

edited

Loading

MegaIng commented Jun 28, 2021

ThatXliner commented Jun 28, 2021

MegaIng left a comment

chanicpanic commented Aug 17, 2021

erezsh commented Sep 12, 2021

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021 •

edited

Loading

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021

chanicpanic commented Sep 12, 2021

erezsh commented Sep 12, 2021

erezsh commented Sep 13, 2021

Draft of Version 1.0 #925

Draft of Version 1.0 #925

Conversation

erezsh commented Jun 27, 2021

codecov-commenter commented Jun 27, 2021 • edited Loading

Codecov Report

erezsh commented Jun 27, 2021

MegaIng left a comment

Choose a reason for hiding this comment

MegaIng Jun 27, 2021

Choose a reason for hiding this comment

erezsh Jun 28, 2021

Choose a reason for hiding this comment

MegaIng Jun 28, 2021

Choose a reason for hiding this comment

ThatXliner commented Jun 28, 2021 • edited Loading

MegaIng commented Jun 28, 2021

ThatXliner commented Jun 28, 2021

MegaIng left a comment

Choose a reason for hiding this comment

chanicpanic commented Aug 17, 2021

erezsh commented Sep 12, 2021

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021 • edited Loading

erezsh commented Sep 12, 2021

MegaIng commented Sep 12, 2021

chanicpanic commented Sep 12, 2021

erezsh commented Sep 12, 2021

erezsh commented Sep 13, 2021

codecov-commenter commented Jun 27, 2021 •

edited

Loading

ThatXliner commented Jun 28, 2021 •

edited

Loading

MegaIng commented Sep 12, 2021 •

edited

Loading