Code

Merge 1.0.x to master#87

Code

Merged

gourlaysama merged 28 commits intoscala:masterscala/scala-parser-combinators:masterfrom

gourlaysama:merge-1.0.x-mastergourlaysama/scala-parser-combinators:merge-1.0.x-masterCopy head branch name to clipboard

Oct 27, 2016

Commits

Commits on Jul 3, 2015

• Speed up line/column in OffsetPosition

  Show description for b8b0f87
  liskin

  committed
  b8b0f87

  Copy full SHA for b8b0f87

Commits on Aug 4, 2015

• Fix packrat caching with PagedSeqReader

  Show description for f809b06
  liskin

  committed
  f809b06

  Copy full SHA for f809b06

Commits on Aug 6, 2015

• Use a thread local WeakHashMap instead of synchronized

  Show description for b6ee1f6
  liskin

  committed
  b6ee1f6

  Copy full SHA for b6ee1f6

Commits on Aug 8, 2015

• Add test for #45

  liskin

  committed
  0345e49

  Copy full SHA for 0345e49

Commits on Sep 8, 2015

• Merge pull request #65 from liskin/pagedseqreader-packrat

  Show description for 895a882
  gourlaysama

  committed
  895a882

  Copy full SHA for 895a882

Commits on Sep 9, 2015

• [backport] add maintenance status on README, remove link to JIRA

  Show description for aa52548
  gourlaysama

  committed
  aa52548

  Copy full SHA for aa52548

• Merge pull request #67 from gourlaysama/readme

  Show description for 29960ad
  gourlaysama

  committed
  29960ad

  Copy full SHA for 29960ad

Commits on Sep 11, 2015

• Fix binary incompatibilities in object OffsetPosition

  liskin

  committed
  ab6e080

  Copy full SHA for ab6e080

• Merge pull request #68 from liskin/offsetposition-index-cache

  Show description for 4600c5a
  gourlaysama

  committed
  4600c5a

  Copy full SHA for 4600c5a

Commits on Sep 15, 2015

• Fix whitespace in Parsers.phrase

  liskin

  committed
  057730a

  Copy full SHA for 057730a

• Fix lastNoSuccessVar memory leak

  Show description for 72ea0d7
  liskin

  committed
  72ea0d7

  Copy full SHA for 72ea0d7

• Add test for SI-9010

  Show description for 01c5bac
  liskin

  committed
  01c5bac

  Copy full SHA for 01c5bac

Commits on Feb 10, 2016

• Merge pull request #69 from liskin/lastnosuccess-memleak

  Show description for ee2708e
  gourlaysama

  committed
  ee2708e

  Copy full SHA for ee2708e

• Fixes OffsetPosition.lineContents so that it doesn't grab a newline at the end of the line. Includes tests.

  

  toddobryan-amazon

  authored and

  gourlaysama

  committed
  3eef456

  Copy full SHA for 3eef456

• Add Travis workaround based on both hostname and /etc/hosts

  Show description for 51d69b4
  

  toddobryan-amazon

  authored and

  gourlaysama

  committed
  51d69b4

  Copy full SHA for 51d69b4

• Merge pull request #77 from gourlaysama/issues/56-offsetposition-linecontent2

  Show description for 845d5ab
  gourlaysama

  committed
  845d5ab

  Copy full SHA for 845d5ab

Commits on Feb 12, 2016

• bump scala, sbt and scala-module-plugin versions

  Show description for 26d36ac
  gourlaysama

  committed
  26d36ac

  Copy full SHA for 26d36ac

Commits on Feb 13, 2016

• Merge pull request #79 from gourlaysama/bump2

  Show description for 4d9cb2c
  gourlaysama

  committed
  4d9cb2c

  Copy full SHA for 4d9cb2c

Commits on Sep 4, 2016

• Change apostrophe in error message

  Show description for 3dd55dd
  egulias

  committed
  3dd55dd

  Copy full SHA for 3dd55dd

Commits on Sep 9, 2016

• fix travis-ci hosts

  egulias

  committed
  ac7c33f

  Copy full SHA for ac7c33f

Commits on Sep 19, 2016

• Merge pull request #81 from egulias/patch-1

  Show description for 6582a95
  gourlaysama

  authored
  6582a95

  Copy full SHA for 6582a95

Commits on Sep 20, 2016

• [backport] Scala.js support for 1.0.x

  Show description for ad63597
  gourlaysama

  committed
  ad63597

  Copy full SHA for ad63597

Commits on Sep 21, 2016

• Merge pull request #83 from gourlaysama/backports1

  Show description for 151ef0d
  gourlaysama

  authored
  151ef0d

  Copy full SHA for 151ef0d

• bump sbt, scala & dependency versions to latest

  gourlaysama

  committed
  5df662c

  Copy full SHA for 5df662c

Commits on Sep 22, 2016

• Merge pull request #84 from gourlaysama/bump3

  Show description for 0b01f43
  gourlaysama

  authored
  0b01f43

  Copy full SHA for 0b01f43

Commits on Oct 4, 2016

• Redo how cross-version publishing works

  Show description for cdfba62
  gourlaysama

  committed
  cdfba62

  Copy full SHA for cdfba62

Commits on Oct 6, 2016

• Merge pull request #86 from gourlaysama/publishing

  Show description for b71f12e
  SethTisue

  authored
  b71f12e

  Copy full SHA for b71f12e

Commits on Oct 8, 2016

• Merge branch '1.0.x' into merge-1.0.x-master

  Show description for f65fbe7
  gourlaysama

  committed
  f65fbe7

  Copy full SHA for f65fbe7