Skip to content

Commit 87cafc6

Browse files
committed
Consolidate source of Tokenize.jl into main src dir
This will help integrate the two codebases a bit more consistently. Tokenize is still a separate module for now.
1 parent c279c8e commit 87cafc6

File tree

8 files changed

+4
-6
lines changed

8 files changed

+4
-6
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The JuliaSyntax.jl package is licensed under the MIT "Expat" License:
2020
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2121
> SOFTWARE.
2222
23-
The code in src/Tokenize and test/lexer.jl is derived from the Tokenize.jl
23+
The code in src/tokenize*.jl and test/tokenize.jl is derived from the Tokenize.jl
2424
package and is also licensed under the MIT "Expat" License:
2525

2626
> Copyright (c) 2016: Kristoffer Carlsson.

src/JuliaSyntax.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include("utils.jl")
88
include("kinds.jl")
99

1010
# Lexing uses a significantly modified version of Tokenize.jl
11-
include("Tokenize/Tokenize.jl")
11+
include("tokenize.jl")
1212
using .Tokenize: Token
1313

1414
# Source and diagnostics

src/Tokenize/Tokenize.jl

Lines changed: 0 additions & 2 deletions
This file was deleted.

src/Tokenize/token.jl

Whitespace-only changes.

src/Tokenize/lexer.jl renamed to src/tokenize.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import ..JuliaSyntax: kind,
99

1010
import Base.eof
1111

12-
include("utilities.jl")
12+
include("tokenize_utils.jl")
1313

1414
#-------------------------------------------------------------------------------
1515
# Tokens
File renamed without changes.

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ using JuliaSyntax: GreenNode, SyntaxNode,
88
children, child, setchild!, SyntaxHead
99

1010
@testset "Tokenize" begin
11-
include("lexer.jl")
11+
include("tokenize.jl")
1212
end
1313

1414
include("test_utils.jl")
File renamed without changes.

0 commit comments

Comments
 (0)