Upgrade to 2.1.1

This commit is contained in:
li-long315 2023-02-28 09:35:30 +08:00
parent 284127a8d9
commit 0ef8c8d8c3
5 changed files with 5 additions and 63 deletions

View File

@ -1,39 +0,0 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Thu, 31 Mar 2016 08:49:49 +0300
Subject: [PATCH] Remove support for erlang packages.
Erlang "packages" were abandoned long time ago. Remaining support was
dropped in erlang/otp@8e32c07940d9cd1c325d052bded3729333920f81.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/src/lfe_trans.erl b/src/lfe_trans.erl
index d2d21b2..628e4eb 100644
--- a/src/lfe_trans.erl
+++ b/src/lfe_trans.erl
@@ -139,8 +139,6 @@ from_expr({record_field,_,E,R,{atom,_,F}}, Vt0, St0) -> %We KNOW!
RF = list_to_atom(atom_to_list(R) ++ "-" ++ atom_to_list(F)),
{Le,Vt1,St1} = from_expr(E, Vt0, St0),
{[RF,Le],Vt1,St1};
-from_expr({record_field,_,_,_}=M, Vt, St) -> %Pre R16 packages
- from_package_module(M, Vt, St);
%% Function calls.
from_expr({call,_,{remote,_,M,F},As}, Vt0, St0) -> %Remote function call
{Lm,Vt1,St1} = from_expr(M, Vt0, St0),
@@ -367,16 +365,6 @@ from_rec_fields([{record_field,_,{var,_,F},E}|Fs], Vt0, St0) -> %special case!!
{[F,Le|Lfs],Vt2,St2};
from_rec_fields([], Vt, St) -> {[],Vt,St}.
-%% from_package_module(Module, VarTable, State) -> {Module,VarTable,State}.
-%% We must handle the special case where in pre-R16 you could have
-%% packages with a dotted module path. It used a special record_field
-%% tuple. This does not work in R16 and later!
-
-from_package_module({record_field,_,_,_}=M, Vt, St) ->
- Segs = erl_parse:package_segments(M),
- A = list_to_atom(packages:concat(Segs)),
- {?Q(A),Vt,St}.
-
from_maybe(_, []) -> [];
from_maybe(Tag, Es) -> [[Tag|Es]].

View File

@ -1,19 +0,0 @@
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 20 Jun 2017 18:24:11 +0300
Subject: [PATCH] Convert to proper UTF-8
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/examples/core-macros.lfe b/examples/core-macros.lfe
index e76148a..3cac342 100644
--- a/examples/core-macros.lfe
+++ b/examples/core-macros.lfe
@@ -96,7 +96,7 @@
(() `'false)))
;; This version of backquote is almost an exact copy of a quasiquote
-;; expander for Scheme by André van Tonder. It is very compact and
+;; expander for Scheme by André van Tonder. It is very compact and
;; with some cons/append optimisations we have added produces quite
;; reasonable code.

View File

@ -6,15 +6,14 @@
%global debug_package %{nil}
%endif
Name: erlang-%{realname}
Version: 1.3
Version: 2.1.1
Release: 1
Summary: Lisp Flavoured Erlang
License: BSD
URL: https://github.com/%{upstream}/%{realname}
VCS: scm:git:https://github.com/%{upstream}/%{realname}.git
Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}-%{version}.tar.gz
Patch1: erlang-lfe-0001-Remove-support-for-erlang-packages.patch
Patch2: erlang-lfe-0002-Convert-to-proper-UTF-8.patch
%if 0%{?need_bootstrap}
BuildRequires: erlang-erts erlang-rpm-macros
%else
@ -32,8 +31,6 @@ code. An LFE evaluator and shell is also included.
%prep
%setup -q -n %{realname}-%{version}
%patch1 -p1 -b .no_erl_packages
%patch2 -p1 -b .proper_utf8
%build
%if 0%{?need_bootstrap}
@ -88,5 +85,8 @@ echo "No tests during bootstrapping"
%{_emacs_sitestartdir}/lfe-start.el
%changelog
* Tue Feb 28 2023 lilong <lilong@kylinos.cn> - 2.1.1-1
- Upgrade to 2.1.1
* Sat Aug 29 2020 wangyue <wangyue92@huawei.com> - 1.3-1
- package init

Binary file not shown.

BIN
lfe-2.1.1.tar.gz Normal file

Binary file not shown.