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.

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

Update to Syntax 0.6 #69

Merged

stasm merged 29 commits into master from feature/syntax-0.6

Jul 24, 2018

Member

stasm commented Jul 11, 2018

Based on projectfluent/fluent.js#253.

stasm and others added some commits Jul 11, 2018


      Update ast.py

2a00bc7


      Disable Travis notifications

973363a


      Port changes from ast.js. Only minor changes. Expression(SyntaxNode) …

…implementation removed in ast.js, but left functional in this commit.

2db755b


      Port from errors.js. Errors 21-26

e21bafc


      Expression doesn't need any impl

6e9b7de


      Remove semicolons from errors

c7989b0


      Port ftlstream.py

11f810f


      Port parser.py

473dae2


      Port serializer.py


      Tests WIP

585e9e4


      Skip section in 0.4-style comments

74e5dd9


      Clarify a BaseNode.equals test

fe11a32


      Re-enable Travis

3b262c0


      Remaining fixtures_behavior/ files

8f960ae


      Fix span.start for Messages/Terms with Comments.

Port of projectfluent/fluent.js#255

Move the message.span.start logic from the wrapper to the point
where the comment is hooked up to the message.
As the message already has the span when it gets there, the
wrapper refuses to do it again.

6e9b97d


      Revert "Remaining fixtures_behavior/ files"

This reverts commit 8f960ae.

9c553ec


      Fix Comment span to include the terminal line break

Port of projectfluent/fluent.js#257.

Comments' content includes the terminal line break and the span should
reflect it. The end span should be the offset of the beginning of the
next line following the Comment, not the offset of the Comment's
terminal line break.

This also means that we can remvoe the special case in skipBlankLines.
The meaning changes slightly: skipBlankLines now return the number of
all line breaks skipped, regardless of whether they belonged to
fully-blank lines or not. This is OK for our use-case, however.

4b3b072


      Include the EOL in spans of Sections

1b60b79


      Include the line end in spans of Messages and Terms

Port of projectfluent/fluent.js#258

This is similar to the change made to Comments except here it doesn't
affect the values, just the spans. The EBNF defines Message and Term as:

    Message ::= Comment? Identifier inline_space? "=" inline_space? ((Pattern Attribute*) | (Attribute+)) line_end
    Term ::= Comment? TermIdentifier inline_space? "=" inline_space? Value Attribute* line_end

09ddf8d


      test_entry.py

c5c58ac


      test_entry.py function colons

48ae9e5


      test_entry.py try to fix test_simple_message

c360f4b


      test_entry.py try to fix test_return_junk

ffc11a5


      test_entry.py try to fix test_return_junk

c9e5084


      test_entry.py try to fix rest of tests

b5b26ec


      test_entry.py missing comma

40786fd


      Don't include the terminal newline in Entries

Port of projectfluent/fluent.js#259

Revert earlier changes which added the trailing newline to the spans of
the Message, Term and Comment, as well as to the content of Comments.
The trailing line break should not be part of the span nor the content.

Make Junk subclass SyntaxNode directly, rather than Entry. Entry is now
an abstract class for useful AST nodes carrying content: Messages, Terms
and Comments.

Remove the annotations field from Entry togather with the add_annotation
method and move it directly onto Junk.

2158cdb


      fix quotation marks

022ae7f


      Fix flake8 complaints

2f598d4

stasm merged commit `468fe28` into master Jul 24, 2018
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed

Details

continuous-integration/travis-ci/push The Travis CI build passed

Details

projectfluent/python-fluent

Update to Syntax 0.6 #69

stasm commented Jul 11, 2018

stasm and others added some commits Jul 11, 2018

stasm merged commit `468fe28` into master Jul 24, 2018
2 checks passed

2 checks passed

stasm deleted the feature/syntax-0.6 branch Jul 24, 2018

projectfluent/python-fluent

Join GitHub today

Update to Syntax 0.6 #69

Conversation

stasm commented Jul 11, 2018

stasm and others added some commits Jul 11, 2018

Hide details View details stasm merged commit 468fe28 into master Jul 24, 2018 2 checks passed

2 checks passed

stasm deleted the feature/syntax-0.6 branch Jul 24, 2018

stasm merged commit `468fe28` into master Jul 24, 2018
2 checks passed