Skip to content

Commit 772b25e

Browse files
committed
Merge branch 'develop', this is 1.5.1
2 parents 8fa4cbf + 8756287 commit 772b25e

8 files changed

Lines changed: 39 additions & 22 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## [1.5.1]
11+
12+
### Fixed
13+
14+
- badges and logo in documentation
15+
- illegal_token displaying integer value instead of characters
16+
1017
## [1.5.0]
1118

1219
### Changed

README.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
*An implementation of Lua in Erlang*
44

5-
[![Build Status][gh-actions-badge]][gh-actions]
6-
[![Luerl Versions][luerl-badge]][luerl]
7-
[![Erlang Versions][erlang-badge]][versions]
8-
[![Tag][github-tag-badge]][github-tag]
5+
[![Build Status](https://github.com/rvirding/luerl/workflows/Test/badge.svg)](https://github.com/rvirding/luerl/actions)
6+
[![Luerl Versions](https://img.shields.io/badge/luerl-1.1-blue.svg)](https://github.com/rvirding/luerl)
7+
[![Erlang Versions](https://img.shields.io/badge/erlang-24%20to%2026-blue.svg)](https://github.com/rvirding/luerl/blob/master/.github/workflows/ci.yml)
8+
[![Tag](https://img.shields.io/github/tag/rvirding/luerl.svg)](https://github.com/rvirding/luerl/tags)
99

10-
[![Project Logo][logo]][logo-large]
10+
[![Project Logo]( https://github.com/rvirding/luerl/blob/develop/priv/images/logo.png?raw=true)](https://github.com/rvirding/luerl/priv/images/logo-large.png)
1111

1212
**Alert**: The migration from Lua 5.2 to 5.3 is very much Work-In-Progress. Please test it but there are as yet no guarantees.
1313

@@ -33,15 +33,3 @@ Luerl is implemented as a library, written in clean Erlang/OTP. For more informa
3333

3434
Luerl embraces both [#Erlang](https://twitter.com/hashtag/erlang?src=hash) and [#LuaLang](https://twitter.com/hashtag/lualang?src=hash) communities and ecosystems.
3535

36-
[//]: ---Named-Links---
37-
38-
[logo]: priv/images/logo.png
39-
[logo-large]: priv/images/logo-large.png
40-
[gh-actions-badge]: https://github.com/rvirding/luerl/workflows/Test/badge.svg
41-
[gh-actions]: https://github.com/rvirding/luerl/actions
42-
[luerl]: https://github.com/rvirding/luerl
43-
[luerl-badge]: https://img.shields.io/badge/luerl-1.1-blue.svg
44-
[erlang-badge]: https://img.shields.io/badge/erlang-24%20to%2026-blue.svg
45-
[versions]: https://github.com/rvirding/luerl/blob/master/.github/workflows/ci.yml
46-
[github-tag]: https://github.com/rvirding/luerl/tags
47-
[github-tag-badge]: https://img.shields.io/github/tag/rvirding/luerl.svg

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.0
1+
1.5.1

ebin/luerl.app

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{application,luerl,
22
[{description,"Luerl - an implementation of Lua on Erlang"},
3-
{vsn,"1.5.0"},
3+
{vsn,"1.5.1"},
44
{modules,['Elixir.Luerl.New','Elixir.Luerl',luerl,luerl_anno,
55
luerl_app,luerl_comp,luerl_comp_cg,luerl_comp_env,
66
luerl_comp_lint,luerl_comp_locf,luerl_comp_normalise,

rebar.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{apps, [luerl]}
88
]}.
99

10-
{relx, [{release, {luerl, "1.5.0"},
10+
{relx, [{release, {luerl, "1.5.1"},
1111
[kernel,
1212
stdlib,
1313
sasl,
@@ -47,6 +47,7 @@
4747
{source_url, <<"https://github.com/rvirding/luerl">>},
4848
{extras, ["README.md", "CHANGELOG.md", "LICENSE"]},
4949
{main, "readme"},
50+
{logo, "priv/images/logo.png"},
5051
{skip_undefined_reference_warnings_on, ["luerl_parse", "luerl_scan"]},
5152
{groups_for_modules, [
5253
{"Core API", [

rebar.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[].

src/luerl_scan.xrl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ Erlang code.
161161
%% Generate a more Lua compatible error message.
162162
163163
illegal_token(Chars, _Line) ->
164-
C = hd(Chars),
165-
{error,"syntax error near '<\\" ++ integer_to_list(C) ++ ">'"}.
164+
{error,"syntax error near '" ++ Chars ++ "'"}.
166165
167166
%% name_token(Chars, Line) ->
168167
%% {token,{'NAME',Line,Symbol}} | {Name,Line} | {error,E}.

test/luerl_scan_tests.erl

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
%% Copyright (C) 2025 Robert Virding, Dave Lucia
2+
%%
3+
%% Licensed under the Apache License, Version 2.0 (the "License");
4+
%% you may not use this file except in compliance with the License.
5+
%% You may obtain a copy of the License at
6+
%%
7+
%% http://www.apache.org/licenses/LICENSE-2.0
8+
%%
9+
%% Unless required by applicable law or agreed to in writing, software
10+
%% distributed under the License is distributed on an "AS IS" BASIS,
11+
%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
%% See the License for the specific language governing permissions and
13+
%% limitations under the License.
14+
15+
-module(luerl_scan_tests).
16+
17+
-include_lib("eunit/include/eunit.hrl").
18+
19+
syntax_error_test() ->
20+
State = luerl:init(),
21+
?assertMatch({error, [{1,luerl_scan, {user,"syntax error near '\"'"}}], []}, luerl:do(<<"print(\"hi)">>, State)).

0 commit comments

Comments
 (0)