Make work in 0.6 #27

oxinabox · 2017-11-26T12:02:58Z

Ok this is building on #26 and #21

I'm not saying this is the prettiest code, but it passes all tests.

In a few places I got rid of inner constructors, and replaced them with outer constructors.
They are much more sensibly behaved, being just functions.
I'ld like to do that everywhere, but for now I am happy just to have it working.

I also drop all support for 0.5.
And remove Compat.
Its just easier to stop maintaining old versions (at least til 1.0) (In my opinion)
Particularly given this package is stable so the version to version difference is likely just deprecation fixes

oxinabox · 2017-11-26T12:03:36Z

@CarloLucibello @sbromberger @andrewcooke

coveralls · 2017-11-26T12:19:14Z

Coverage decreased (-3.03%) to 84.84% when pulling 3ea799e on oxinabox:oxff6 into a0c0da6 on andrewcooke:master.

CarloLucibello · 2017-11-26T12:08:58Z

README.md

@@ -36,7 +36,7 @@ using ParserCombinator

 # the AST nodes we will construct, with evaluation via calc()

-abstract Node
+abstract type Node node


Oh that looks like sed got away from me.

CarloLucibello · 2017-11-26T12:13:20Z

test/bug/deadlock.jl

@@ -1,10 +1,10 @@

 using AutoHashEquals

-abstract Graph
+@compat abstract type Graph end


compat here

CarloLucibello · 2017-11-26T12:14:04Z

test/core/debug.jl

@@ -18,7 +18,7 @@ parse_dbg("ab", Equal("a") + Trace(Dot()[0:end]) + Equal("b"))

 grammar = p"\d+" + Eos()
 debug, task = make(Debug, "123abc", grammar; delegate=NoCache)
-@test_throws ParserException once(task)
+#TODO @test_throws ParserException once(task)


could this be reactivated?

CarloLucibello · 2017-11-26T12:14:18Z

test/core/fix.jl

@@ -5,7 +5,7 @@ import Base: ==
 signed_prod(lst) = length(lst) == 1 ? lst[1] : Base.prod(lst)
 signed_sum(lst) = length(lst) == 1 ? lst[1] : Base.sum(lst)

-abstract Node
+@compat abstract type Node end


remove compat

CarloLucibello · 2017-11-26T12:14:38Z

test/core/sources.jl

@@ -20,7 +20,7 @@
 @test diagnostic(LineSource("abc"), LineIter(2, 1), "bad") == "bad at (2,1)\n[Not available]\n^\n"

 @test diagnostic(LineSource("l1\nl2"), LineIter(1, 2), "bad") == "bad at (1,2)\nl1\n ^\n"
-@test diagnostic(LineSource("l1\nl2"), LineIter(1, 3), "bad") == "bad at (1,3)\nl1\n  ^\n"
+#TODO @test diagnostic(LineSource("l1\nl2"), LineIter(1, 3), "bad") == "bad at (1,3)\nl1\n  ^\n"


CarloLucibello · 2017-11-26T12:14:44Z

test/core/stack.jl

@@ -16,7 +16,7 @@ stack(0, 10)
 @time println(stack(0, 100_000))
 # stack limit is somewhere around 100,000 (certainly less than 200,000)

-abstract Msg
+@compat abstract type Msg end


CarloLucibello · 2017-11-26T12:15:04Z

test/core/tests.jl

@@ -68,7 +68,7 @@ for i in 1:10
        m = match(r, s)
        println("$lo $hi $s $r")
        if m == nothing
-            @test_throws ParserException parse_one(s, Repeat(Equal("a"), lo, hi; greedy=greedy))
+            #TODO @test_throws ParserException parse_one(s, Repeat(Equal("a"), lo, hi; greedy=greedy))


CarloLucibello · 2017-11-26T12:15:07Z

test/core/tests.jl

@@ -52,7 +52,7 @@ m1.matcher = Nullable{ParserCombinator.Matcher}(Seq(Dot(), Opt(m1)))
 @test collect(parse_all("abc", Repeat(Fail(); flatten=false, greedy=false))) == Any[[]]
 @test parse_one("12c", Lookahead(p"\d") + PInt()) == [12]
 @test parse_one("12c", Lookahead(p"\d") + PInt() + Dot()) == [12, 'c']
-@test_throws ParserException parse_one("12c", Not(Lookahead(p"\d")) + PInt() + Dot())
+#TODO @test_throws ParserException parse_one("12c", Not(Lookahead(p"\d")) + PInt() + Dot())


CarloLucibello · 2017-11-26T12:15:10Z

test/core/tests.jl

@@ -42,7 +42,7 @@
 @test length(collect(parse_all("abc", p"."[1:2]))) == 2
 @test parse_one("abc", p"."[3] > tuple) == [("a", "b", "c")]
 @test parse_one("abc", p"."[3] > vcat) == Any[Any["a", "b", "c"]]
-@test_throws ParserException parse_one("abc", And(Equal("a"), Lookahead(Equal("c")), Equal("b")))
+#TODO @test_throws ParserException parse_one("abc", And(Equal("a"), Lookahead(Equal("c")), Equal("b")))


CarloLucibello · 2017-11-26T12:15:20Z

test/core/tests.jl

 @test parse_one("abc", Seq(p"."[1:2], p"."[1:2])) == ["a", "b", "c"]
 @test parse_one("abc", Seq(p"."[1:2,:&], p"."[1:2])) == Any[["a"], ["b"], "c"]
 @test parse_one("abc", Seq(p"."[1:2,:&,:?], p"."[1:2])) == Any[["a"], "b", "c"]
-@test_throws ErrorException parse_one("abc", Seq(p"."[1:2,:&,:?,:x], p"."[1:2]))
+#TODO @test_throws ErrorException parse_one("abc", Seq(p"."[1:2,:&,:?,:x], p"."[1:2]))


CarloLucibello · 2017-11-26T12:24:29Z

Hi, thanks for doing this, I got stucked at a certain point.

There are a few tests that cuold/shoud be reactivated (where you see TODO), and some @compat calls in test/ that could be removed

oxinabox · 2017-11-26T13:15:40Z

Thanks for the feedback.
I'll poke this tomorrow or so.
Huh, I didn't realize that the tests had compat nor that they were changed .(I guess they were changed in your PR)

coveralls · 2017-11-27T02:36:32Z

Coverage decreased (-2.8%) to 85.118% when pulling 2f7267f on oxinabox:oxff6 into a0c0da6 on andrewcooke:master.

oxinabox · 2017-12-06T09:47:43Z

Bump.
Looks like that worked, still losing a few lines on coverage though.

CarloLucibello · 2017-12-06T10:04:14Z

@andrewcooke could you grant write permissions to @oxinabox and me?

oxinabox · 2018-01-04T07:32:41Z

@CarloLucibello can you review and merge if ready?

CarloLucibello · 2018-01-05T06:52:42Z

tests are passing, although the output around this line looks not properly formatted. I don't know if it is just a problem with tests or we are really loosing something. If you manage to fix this good, otherwise let's just merge.

oxinabox · 2018-01-05T07:03:19Z

I can't see any changes that could have been causing that on a quick look.

But the last builds for the 0.5 current master don't screw up like that
https://travis-ci.org/andrewcooke/ParserCombinator.jl/jobs/152686452

oxinabox · 2018-06-22T02:43:39Z

Oh did this never get merged?

CarloLucibello · 2018-06-22T04:21:48Z

tests are passing and there are no warnings left. I think there are still some problems to be addressed though, some part of the tests' output looks incorrect:

/4        expr 3.0-4.0-4.0*(3.0*7.0+0.0-0.0)+6.0*3.0+2.0 
09-65.0 -65.0 
         calc okDepth
->one levelAlt

    66::ab        /4          0101  AltTrace->->divDot

    22::/4        b           110 0  div->TraceSeq<-
['a'] 
 multiple7 
:  4         2  :212ab        :  b           0 Seq00-> 0neg 
Trace ->Trace Dot->7
Depth:   :
4                       1300 0:    b         Alt ->Trace0Transform<-!!!
1
    Depth7->:Dot4         
  14  1    :Transform          -> Pattern0
1   :             Depth14<- ['b']    
Transform <-!!!
    :3          :           13  0   1Alt <-!!!
  Depth ->7Dot:

…matcher

oxinabox · 2018-06-22T04:46:47Z

src/gml/GML.jl

@@ -33,7 +26,7 @@ function mk_parser(string_input)
        comment = P"(#.*)?"

        # we need string input as we match multiple lines
-        if string_input && ParserCombinator.FAST_REGEX


@CarloLucibello Do you know why ParserCombinator.FAST_REGEX was removed from this line?

Ah becaue it is always true now

oxinabox · 2018-06-22T05:39:16Z

I can't workout (just from reading) what is causing all these extra displays.
I am tempted to try and mock STDOUT with something that will throw an exception at the point where the extra output is printed.

CarloLucibello and others added 17 commits January 30, 2017 15:50

add precompilation

0441b4b

drop julia 0.4 support

22dbcbc

remove FAST_REGEX

801c3d1

update travis

e90a9c9

fix some 0.6 warning and errors, tests not passing

cbae935

readline

698aa73

fix Port constructor

8b6af36

=fix core types

8ee8d0e

=immutable-> struct

6e67579

=more undeprecicating

ab9b4d5

=most deprcations fixed

5cfc53c

=almost working:w

c36c364

=up require remove compat

2793478

merge my 0.6 with Carlo's 0.5+

329fd46

=fix line change

5e26864

=remove I from Config

083c8b7

=make Cache etc use normal outer contructors

3c9a999

Travis for 0.6

3ea799e

CarloLucibello reviewed Nov 26, 2017

View reviewed changes

Lyndon White added 2 commits November 27, 2017 10:25

Remove compat

31f12d2

=enable all tests

93ebe12

oxinabox mentioned this pull request Dec 6, 2017

Looking for new maintainer #25

Closed

refactor to nto use sepetate function for inside of channel for print…

2f7267f

…matcher

oxinabox commented Jun 22, 2018

View reviewed changes

Don't need the FASTREGEX const it is always true and never read

84196d7

This was referenced Aug 31, 2018

Fixes for julia v0.7 and v1.0 jgoldfar/ParserCombinator.jl#1

Closed

Fixes for julia v0.7 and v1.0 #29

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make work in 0.6 #27

Make work in 0.6 #27

oxinabox commented Nov 26, 2017

oxinabox commented Nov 26, 2017

coveralls commented Nov 26, 2017 •

edited

Loading

CarloLucibello Nov 26, 2017

oxinabox Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello Nov 26, 2017

CarloLucibello commented Nov 26, 2017

oxinabox commented Nov 26, 2017

coveralls commented Nov 27, 2017 •

edited

Loading

oxinabox commented Dec 6, 2017 •

edited

Loading

CarloLucibello commented Dec 6, 2017

oxinabox commented Jan 4, 2018

CarloLucibello commented Jan 5, 2018 •

edited

Loading

oxinabox commented Jan 5, 2018

oxinabox commented Jun 22, 2018

CarloLucibello commented Jun 22, 2018

oxinabox Jun 22, 2018

oxinabox Jun 22, 2018

oxinabox commented Jun 22, 2018

Make work in 0.6 #27

Are you sure you want to change the base?

Make work in 0.6 #27

Conversation

oxinabox commented Nov 26, 2017

oxinabox commented Nov 26, 2017

coveralls commented Nov 26, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CarloLucibello commented Nov 26, 2017

oxinabox commented Nov 26, 2017

coveralls commented Nov 27, 2017 • edited Loading

oxinabox commented Dec 6, 2017 • edited Loading

CarloLucibello commented Dec 6, 2017

oxinabox commented Jan 4, 2018

CarloLucibello commented Jan 5, 2018 • edited Loading

oxinabox commented Jan 5, 2018

oxinabox commented Jun 22, 2018

CarloLucibello commented Jun 22, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oxinabox commented Jun 22, 2018

coveralls commented Nov 26, 2017 •

edited

Loading

coveralls commented Nov 27, 2017 •

edited

Loading

oxinabox commented Dec 6, 2017 •

edited

Loading

CarloLucibello commented Jan 5, 2018 •

edited

Loading