Skip to content

Commit 6d655f1

Browse files
pithubrupertlssmith
authored andcommitted
fixes elm#54
fixes elm#53 Fix bug in Elm.Kernel.Parser.findSubString
1 parent 02839df commit 6d655f1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Elm/Kernel/Parser.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ var _Parser_consumeBase16 = F2(function(offset, string)
119119

120120
var _Parser_findSubString = F5(function(smallString, offset, row, col, bigString)
121121
{
122-
var newOffset = bigString.indexOf(smallString, offset);
123-
var target = newOffset < 0 ? bigString.length : newOffset + smallString.length;
122+
var index = bigString.indexOf(smallString, offset);
123+
var target = index < 0 ? bigString.length : index + smallString.length;
124124

125125
while (offset < target)
126126
{
@@ -130,5 +130,5 @@ var _Parser_findSubString = F5(function(smallString, offset, row, col, bigString
130130
: ( col++, (code & 0xF800) === 0xD800 && offset++ )
131131
}
132132

133-
return __Utils_Tuple3(newOffset, row, col);
133+
return __Utils_Tuple3(index < 0 ? -1 : target, row, col);
134134
});

src/Parser/Advanced.elm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ chompUntilEndOr str =
910910
Parser <| \s ->
911911
let
912912
(newOffset, newRow, newCol) =
913-
Elm.Kernel.Parser.findSubString str s.offset s.row s.col s.src
913+
findSubString str s.offset s.row s.col s.src
914914

915915
adjustedOffset =
916916
if newOffset < 0 then String.length s.src else newOffset
@@ -1125,7 +1125,7 @@ isAsciiCode =
11251125
findSubString "42" offset row col "Is 42 the answer?"
11261126
--==> (newOffset, newRow, newCol)
11271127
1128-
If `offset = 0` we would get `(3, 1, 4)`
1128+
If `offset = 0` we would get `(5, 1, 6)`
11291129
If `offset = 7` we would get `(-1, 1, 18)`
11301130
-}
11311131
findSubString : String -> Int -> Int -> Int -> String -> (Int, Int, Int)

0 commit comments

Comments
 (0)