mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-01-06 09:11:38 +01:00
testing/lua-microlight: cleanup
those should never been there in first place
This commit is contained in:
Natanael Copa
parent
8a18107967
commit
e4fd785bb2
@ -1 +0,0 @@
|
||||
ref: refs/heads/master
|
||||
@ -1,6 +0,0 @@
|
||||
[core]
|
||||
repositoryformatversion = 0
|
||||
filemode = true
|
||||
bare = true
|
||||
[remote "origin"]
|
||||
url = git://github.com/stevedonovan/Microlight.git
|
||||
@ -1 +0,0 @@
|
||||
Unnamed repository; edit this file 'description' to name the repository.
|
||||
@ -1,15 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to check the commit log message taken by
|
||||
# applypatch from an e-mail message.
|
||||
#
|
||||
# The hook should exit with non-zero status after issuing an
|
||||
# appropriate message if it wants to stop the commit. The hook is
|
||||
# allowed to edit the commit message file.
|
||||
#
|
||||
# To enable this hook, rename this file to "applypatch-msg".
|
||||
|
||||
. git-sh-setup
|
||||
test -x "$GIT_DIR/hooks/commit-msg" &&
|
||||
exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
|
||||
:
|
||||
@ -1,24 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to check the commit log message.
|
||||
# Called by "git commit" with one argument, the name of the file
|
||||
# that has the commit message. The hook should exit with non-zero
|
||||
# status after issuing an appropriate message if it wants to stop the
|
||||
# commit. The hook is allowed to edit the commit message file.
|
||||
#
|
||||
# To enable this hook, rename this file to "commit-msg".
|
||||
|
||||
# Uncomment the below to add a Signed-off-by line to the message.
|
||||
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
||||
# hook is more suited to it.
|
||||
#
|
||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
||||
|
||||
# This example catches duplicate Signed-off-by lines.
|
||||
|
||||
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
||||
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
||||
echo >&2 Duplicate Signed-off-by lines.
|
||||
exit 1
|
||||
}
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to prepare a packed repository for use over
|
||||
# dumb transports.
|
||||
#
|
||||
# To enable this hook, rename this file to "post-update".
|
||||
|
||||
exec git update-server-info
|
||||
@ -1,14 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to verify what is about to be committed
|
||||
# by applypatch from an e-mail message.
|
||||
#
|
||||
# The hook should exit with non-zero status after issuing an
|
||||
# appropriate message if it wants to stop the commit.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-applypatch".
|
||||
|
||||
. git-sh-setup
|
||||
test -x "$GIT_DIR/hooks/pre-commit" &&
|
||||
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
|
||||
:
|
||||
@ -1,50 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to verify what is about to be committed.
|
||||
# Called by "git commit" with no arguments. The hook should
|
||||
# exit with non-zero status after issuing an appropriate message if
|
||||
# it wants to stop the commit.
|
||||
#
|
||||
# To enable this hook, rename this file to "pre-commit".
|
||||
|
||||
if git rev-parse --verify HEAD >/dev/null 2>&1
|
||||
then
|
||||
against=HEAD
|
||||
else
|
||||
# Initial commit: diff against an empty tree object
|
||||
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
||||
fi
|
||||
|
||||
# If you want to allow non-ascii filenames set this variable to true.
|
||||
allownonascii=$(git config hooks.allownonascii)
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
# Cross platform projects tend to avoid non-ascii filenames; prevent
|
||||
# them from being added to the repository. We exploit the fact that the
|
||||
# printable range starts at the space character and ends with tilde.
|
||||
if [ "$allownonascii" != "true" ] &&
|
||||
# Note that the use of brackets around a tr range is ok here, (it's
|
||||
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
||||
# the square bracket bytes happen to fall in the designated range.
|
||||
test $(git diff --cached --name-only --diff-filter=A -z $against |
|
||||
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
|
||||
then
|
||||
echo "Error: Attempt to add a non-ascii file name."
|
||||
echo
|
||||
echo "This can cause problems if you want to work"
|
||||
echo "with people on other platforms."
|
||||
echo
|
||||
echo "To be portable it is advisable to rename the file ..."
|
||||
echo
|
||||
echo "If you know what you are doing you can disable this"
|
||||
echo "check using:"
|
||||
echo
|
||||
echo " git config hooks.allownonascii true"
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# If there are whitespace errors, print the offending file names and fail.
|
||||
exec git diff-index --check --cached $against --
|
||||
@ -1,169 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006, 2008 Junio C Hamano
|
||||
#
|
||||
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
||||
# its job, and can prevent the command from running by exiting with
|
||||
# non-zero status.
|
||||
#
|
||||
# The hook is called with the following parameters:
|
||||
#
|
||||
# $1 -- the upstream the series was forked from.
|
||||
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
||||
#
|
||||
# This sample shows how to prevent topic branches that are already
|
||||
# merged to 'next' branch from getting rebased, because allowing it
|
||||
# would result in rebasing already published history.
|
||||
|
||||
publish=next
|
||||
basebranch="$1"
|
||||
if test "$#" = 2
|
||||
then
|
||||
topic="refs/heads/$2"
|
||||
else
|
||||
topic=`git symbolic-ref HEAD` ||
|
||||
exit 0 ;# we do not interrupt rebasing detached HEAD
|
||||
fi
|
||||
|
||||
case "$topic" in
|
||||
refs/heads/??/*)
|
||||
;;
|
||||
*)
|
||||
exit 0 ;# we do not interrupt others.
|
||||
;;
|
||||
esac
|
||||
|
||||
# Now we are dealing with a topic branch being rebased
|
||||
# on top of master. Is it OK to rebase it?
|
||||
|
||||
# Does the topic really exist?
|
||||
git show-ref -q "$topic" || {
|
||||
echo >&2 "No such branch $topic"
|
||||
exit 1
|
||||
}
|
||||
|
||||
# Is topic fully merged to master?
|
||||
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
||||
if test -z "$not_in_master"
|
||||
then
|
||||
echo >&2 "$topic is fully merged to master; better remove it."
|
||||
exit 1 ;# we could allow it, but there is no point.
|
||||
fi
|
||||
|
||||
# Is topic ever merged to next? If so you should not be rebasing it.
|
||||
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
||||
only_next_2=`git rev-list ^master ${publish} | sort`
|
||||
if test "$only_next_1" = "$only_next_2"
|
||||
then
|
||||
not_in_topic=`git rev-list "^$topic" master`
|
||||
if test -z "$not_in_topic"
|
||||
then
|
||||
echo >&2 "$topic is already up-to-date with master"
|
||||
exit 1 ;# we could allow it, but there is no point.
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
else
|
||||
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
||||
/usr/bin/perl -e '
|
||||
my $topic = $ARGV[0];
|
||||
my $msg = "* $topic has commits already merged to public branch:\n";
|
||||
my (%not_in_next) = map {
|
||||
/^([0-9a-f]+) /;
|
||||
($1 => 1);
|
||||
} split(/\n/, $ARGV[1]);
|
||||
for my $elem (map {
|
||||
/^([0-9a-f]+) (.*)$/;
|
||||
[$1 => $2];
|
||||
} split(/\n/, $ARGV[2])) {
|
||||
if (!exists $not_in_next{$elem->[0]}) {
|
||||
if ($msg) {
|
||||
print STDERR $msg;
|
||||
undef $msg;
|
||||
}
|
||||
print STDERR " $elem->[1]\n";
|
||||
}
|
||||
}
|
||||
' "$topic" "$not_in_next" "$not_in_master"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
################################################################
|
||||
|
||||
This sample hook safeguards topic branches that have been
|
||||
published from being rewound.
|
||||
|
||||
The workflow assumed here is:
|
||||
|
||||
* Once a topic branch forks from "master", "master" is never
|
||||
merged into it again (either directly or indirectly).
|
||||
|
||||
* Once a topic branch is fully cooked and merged into "master",
|
||||
it is deleted. If you need to build on top of it to correct
|
||||
earlier mistakes, a new topic branch is created by forking at
|
||||
the tip of the "master". This is not strictly necessary, but
|
||||
it makes it easier to keep your history simple.
|
||||
|
||||
* Whenever you need to test or publish your changes to topic
|
||||
branches, merge them into "next" branch.
|
||||
|
||||
The script, being an example, hardcodes the publish branch name
|
||||
to be "next", but it is trivial to make it configurable via
|
||||
$GIT_DIR/config mechanism.
|
||||
|
||||
With this workflow, you would want to know:
|
||||
|
||||
(1) ... if a topic branch has ever been merged to "next". Young
|
||||
topic branches can have stupid mistakes you would rather
|
||||
clean up before publishing, and things that have not been
|
||||
merged into other branches can be easily rebased without
|
||||
affecting other people. But once it is published, you would
|
||||
not want to rewind it.
|
||||
|
||||
(2) ... if a topic branch has been fully merged to "master".
|
||||
Then you can delete it. More importantly, you should not
|
||||
build on top of it -- other people may already want to
|
||||
change things related to the topic as patches against your
|
||||
"master", so if you need further changes, it is better to
|
||||
fork the topic (perhaps with the same name) afresh from the
|
||||
tip of "master".
|
||||
|
||||
Let's look at this example:
|
||||
|
||||
o---o---o---o---o---o---o---o---o---o "next"
|
||||
/ / / /
|
||||
/ a---a---b A / /
|
||||
/ / / /
|
||||
/ / c---c---c---c B /
|
||||
/ / / \ /
|
||||
/ / / b---b C \ /
|
||||
/ / / / \ /
|
||||
---o---o---o---o---o---o---o---o---o---o---o "master"
|
||||
|
||||
|
||||
A, B and C are topic branches.
|
||||
|
||||
* A has one fix since it was merged up to "next".
|
||||
|
||||
* B has finished. It has been fully merged up to "master" and "next",
|
||||
and is ready to be deleted.
|
||||
|
||||
* C has not merged to "next" at all.
|
||||
|
||||
We would want to allow C to be rebased, refuse A, and encourage
|
||||
B to be deleted.
|
||||
|
||||
To compute (1):
|
||||
|
||||
git rev-list ^master ^topic next
|
||||
git rev-list ^master next
|
||||
|
||||
if these match, topic has not merged in next at all.
|
||||
|
||||
To compute (2):
|
||||
|
||||
git rev-list master..topic
|
||||
|
||||
if this is empty, it is fully merged to "master".
|
||||
@ -1,36 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to prepare the commit log message.
|
||||
# Called by "git commit" with the name of the file that has the
|
||||
# commit message, followed by the description of the commit
|
||||
# message's source. The hook's purpose is to edit the commit
|
||||
# message file. If the hook fails with a non-zero status,
|
||||
# the commit is aborted.
|
||||
#
|
||||
# To enable this hook, rename this file to "prepare-commit-msg".
|
||||
|
||||
# This hook includes three examples. The first comments out the
|
||||
# "Conflicts:" part of a merge commit.
|
||||
#
|
||||
# The second includes the output of "git diff --name-status -r"
|
||||
# into the message, just before the "git status" output. It is
|
||||
# commented because it doesn't cope with --amend or with squashed
|
||||
# commits.
|
||||
#
|
||||
# The third example adds a Signed-off-by line to the message, that can
|
||||
# still be edited. This is rarely a good idea.
|
||||
|
||||
case "$2,$3" in
|
||||
merge,)
|
||||
/usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
|
||||
|
||||
# ,|template,)
|
||||
# /usr/bin/perl -i.bak -pe '
|
||||
# print "\n" . `git diff --cached --name-status -r`
|
||||
# if /^#/ && $first++ == 0' "$1" ;;
|
||||
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
||||
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
||||
@ -1,128 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# An example hook script to blocks unannotated tags from entering.
|
||||
# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
|
||||
#
|
||||
# To enable this hook, rename this file to "update".
|
||||
#
|
||||
# Config
|
||||
# ------
|
||||
# hooks.allowunannotated
|
||||
# This boolean sets whether unannotated tags will be allowed into the
|
||||
# repository. By default they won't be.
|
||||
# hooks.allowdeletetag
|
||||
# This boolean sets whether deleting tags will be allowed in the
|
||||
# repository. By default they won't be.
|
||||
# hooks.allowmodifytag
|
||||
# This boolean sets whether a tag may be modified after creation. By default
|
||||
# it won't be.
|
||||
# hooks.allowdeletebranch
|
||||
# This boolean sets whether deleting branches will be allowed in the
|
||||
# repository. By default they won't be.
|
||||
# hooks.denycreatebranch
|
||||
# This boolean sets whether remotely creating branches will be denied
|
||||
# in the repository. By default this is allowed.
|
||||
#
|
||||
|
||||
# --- Command line
|
||||
refname="$1"
|
||||
oldrev="$2"
|
||||
newrev="$3"
|
||||
|
||||
# --- Safety check
|
||||
if [ -z "$GIT_DIR" ]; then
|
||||
echo "Don't run this script from the command line." >&2
|
||||
echo " (if you want, you could supply GIT_DIR then run" >&2
|
||||
echo " $0 <ref> <oldrev> <newrev>)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
|
||||
echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# --- Config
|
||||
allowunannotated=$(git config --bool hooks.allowunannotated)
|
||||
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
|
||||
denycreatebranch=$(git config --bool hooks.denycreatebranch)
|
||||
allowdeletetag=$(git config --bool hooks.allowdeletetag)
|
||||
allowmodifytag=$(git config --bool hooks.allowmodifytag)
|
||||
|
||||
# check for no description
|
||||
projectdesc=$(sed -e '1q' "$GIT_DIR/description")
|
||||
case "$projectdesc" in
|
||||
"Unnamed repository"* | "")
|
||||
echo "*** Project description file hasn't been set" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- Check types
|
||||
# if $newrev is 0000...0000, it's a commit to delete a ref.
|
||||
zero="0000000000000000000000000000000000000000"
|
||||
if [ "$newrev" = "$zero" ]; then
|
||||
newrev_type=delete
|
||||
else
|
||||
newrev_type=$(git cat-file -t $newrev)
|
||||
fi
|
||||
|
||||
case "$refname","$newrev_type" in
|
||||
refs/tags/*,commit)
|
||||
# un-annotated tag
|
||||
short_refname=${refname##refs/tags/}
|
||||
if [ "$allowunannotated" != "true" ]; then
|
||||
echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
|
||||
echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/tags/*,delete)
|
||||
# delete tag
|
||||
if [ "$allowdeletetag" != "true" ]; then
|
||||
echo "*** Deleting a tag is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/tags/*,tag)
|
||||
# annotated tag
|
||||
if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
|
||||
then
|
||||
echo "*** Tag '$refname' already exists." >&2
|
||||
echo "*** Modifying a tag is not allowed in this repository." >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/heads/*,commit)
|
||||
# branch
|
||||
if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
|
||||
echo "*** Creating a branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/heads/*,delete)
|
||||
# delete branch
|
||||
if [ "$allowdeletebranch" != "true" ]; then
|
||||
echo "*** Deleting a branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
refs/remotes/*,commit)
|
||||
# tracking branch
|
||||
;;
|
||||
refs/remotes/*,delete)
|
||||
# delete tracking branch
|
||||
if [ "$allowdeletebranch" != "true" ]; then
|
||||
echo "*** Deleting a tracking branch is not allowed in this repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# Anything else (is there anything else?)
|
||||
echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# --- Finished
|
||||
exit 0
|
||||
@ -1,6 +0,0 @@
|
||||
# git ls-files --others --exclude-from=.git/info/exclude
|
||||
# Lines that start with '#' are comments.
|
||||
# For a project mostly in C, the following would be a good set of
|
||||
# exclude patterns (uncomment them if you want to use them):
|
||||
# *.[oa]
|
||||
# *~
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
||||
# pack-refs with: peeled
|
||||
dac3b125c5276ade4384eb95b40ec8d501a043ec refs/heads/master
|
||||
@ -1,543 +0,0 @@
|
||||
-----------------
|
||||
-- Microlight - a very compact Lua utilities module
|
||||
--
|
||||
-- Steve Donovan, 2012; License MIT
|
||||
-- @module ml
|
||||
|
||||
local ml = {}
|
||||
|
||||
--- String utilties.
|
||||
-- @section string
|
||||
|
||||
--- split a string into a list of strings separated by a delimiter.
|
||||
-- @param s The input string
|
||||
-- @param re A Lua string pattern; defaults to '%s+'
|
||||
-- @param n optional maximum number of splits
|
||||
-- @return a list
|
||||
function ml.split(s,re,n)
|
||||
local find,sub,append = string.find, string.sub, table.insert
|
||||
local i1,ls = 1,{}
|
||||
if not re then re = '%s+' end
|
||||
if re == '' then return {s} end
|
||||
while true do
|
||||
local i2,i3 = find(s,re,i1)
|
||||
if not i2 then
|
||||
local last = sub(s,i1)
|
||||
if last ~= '' then append(ls,last) end
|
||||
if #ls == 1 and ls[1] == '' then
|
||||
return {}
|
||||
else
|
||||
return ls
|
||||
end
|
||||
end
|
||||
append(ls,sub(s,i1,i2-1))
|
||||
if n and #ls == n then
|
||||
ls[#ls] = sub(s,i1)
|
||||
return ls
|
||||
end
|
||||
i1 = i3+1
|
||||
end
|
||||
end
|
||||
|
||||
--- escape any 'magic' characters in a string
|
||||
-- @param s The input string
|
||||
-- @return an escaped string
|
||||
function ml.escape(s)
|
||||
return (s:gsub('[%-%.%+%[%]%(%)%$%^%%%?%*]','%%%1'))
|
||||
end
|
||||
|
||||
--- expand a string containing any ${var} or $var.
|
||||
-- @param s the string
|
||||
-- @param subst either a table or a function (as in `string.gsub`)
|
||||
-- @return expanded string
|
||||
function ml.expand (s,subst)
|
||||
local res = s:gsub('%${([%w_]+)}',subst)
|
||||
return (res:gsub('%$([%w_]+)',subst))
|
||||
end
|
||||
|
||||
--- return the contents of a file as a string
|
||||
-- @param filename The file path
|
||||
-- @param is_bin open in binary mode, default false
|
||||
-- @return file contents
|
||||
function ml.readfile(filename,is_bin)
|
||||
local mode = is_bin and 'b' or ''
|
||||
local f,err = io.open(filename,'r'..mode)
|
||||
if not f then return nil,err end
|
||||
local res,err = f:read('*a')
|
||||
f:close()
|
||||
if not res then return nil,err end
|
||||
return res
|
||||
end
|
||||
|
||||
--- File and Path functions
|
||||
-- @section file
|
||||
|
||||
--~ exists(filename)
|
||||
--- Does a file exist?
|
||||
-- @param filename a file path
|
||||
-- @return the file path, otherwise nil
|
||||
-- @usage exists 'readme' or exists 'readme.txt' or exists 'readme.md'
|
||||
function ml.exists (filename)
|
||||
local f = io.open(filename)
|
||||
if not f then
|
||||
return nil
|
||||
else
|
||||
f:close()
|
||||
return filename
|
||||
end
|
||||
end
|
||||
|
||||
local sep, other_sep = package.config:sub(1,1),'/'
|
||||
|
||||
|
||||
--- split a file path.
|
||||
-- if there's no directory part, the first value will be the empty string
|
||||
-- @param P A file path
|
||||
-- @return the directory part
|
||||
-- @return the file part
|
||||
function ml.splitpath(P)
|
||||
local i = #P
|
||||
local ch = P:sub(i,i)
|
||||
while i > 0 and ch ~= sep and ch ~= other_sep do
|
||||
i = i - 1
|
||||
ch = P:sub(i,i)
|
||||
end
|
||||
if i == 0 then
|
||||
return '',P
|
||||
else
|
||||
return P:sub(1,i-1), P:sub(i+1)
|
||||
end
|
||||
end
|
||||
|
||||
--- given a path, return the root part and the extension part.
|
||||
-- if there's no extension part, the second value will be empty
|
||||
-- @param P A file path
|
||||
-- @return the name part
|
||||
-- @return the extension
|
||||
function ml.splitext(P)
|
||||
local i = #P
|
||||
local ch = P:sub(i,i)
|
||||
while i > 0 and ch ~= '.' do
|
||||
if ch == sep or ch == other_sep then
|
||||
return P,''
|
||||
end
|
||||
i = i - 1
|
||||
ch = P:sub(i,i)
|
||||
end
|
||||
if i == 0 then
|
||||
return P,''
|
||||
else
|
||||
return P:sub(1,i-1),P:sub(i)
|
||||
end
|
||||
end
|
||||
|
||||
--- Extended table functions.
|
||||
-- 'list' here is shorthand for 'list-like table'; these functions
|
||||
-- only operate over the numeric `1..#t` range of a table and are
|
||||
-- particularly efficient for this purpose.
|
||||
-- @section table
|
||||
|
||||
local function quote (v)
|
||||
if type(v) == 'string' then
|
||||
return ('%q'):format(v)
|
||||
else
|
||||
return tostring(v)
|
||||
end
|
||||
end
|
||||
|
||||
local tbuff
|
||||
function tbuff (t,buff,k)
|
||||
buff[k] = "{"
|
||||
k = k + 1
|
||||
for key,value in pairs(t) do
|
||||
key = quote(key)
|
||||
if type(value) ~= 'table' then
|
||||
value = quote(value)
|
||||
buff[k] = ('[%s]=%s'):format(key,value)
|
||||
k = k + 1
|
||||
if buff.limit and k > buff.limit then
|
||||
buff[k] = "..."
|
||||
error("buffer overrun")
|
||||
end
|
||||
else
|
||||
if not buff.tables then buff.tables = {} end
|
||||
if not buff.tables[value] then
|
||||
k = tbuff(value,buff,k)
|
||||
buff.tables[value] = true
|
||||
else
|
||||
buff[k] = "<cycle>"
|
||||
k = k + 1
|
||||
end
|
||||
end
|
||||
buff[k] = ","
|
||||
k = k + 1
|
||||
end
|
||||
if buff[k-1] == "," then k = k - 1 end
|
||||
buff[k] = "}"
|
||||
k = k + 1
|
||||
return k
|
||||
end
|
||||
|
||||
--- return a string representation of a Lua table.
|
||||
-- Cycles are detected, and a limit on number of items can be imposed.
|
||||
-- @param t the table
|
||||
-- @param limit the limit on items, default 1000
|
||||
-- @return a string
|
||||
function ml.tstring (t,limit)
|
||||
local buff = {limit = limit or 1000}
|
||||
pcall(tbuff,t,buff,1)
|
||||
return table.concat(buff)
|
||||
end
|
||||
|
||||
--- dump a Lua table to a file object.
|
||||
-- @param t the table
|
||||
-- @param f the file object (anything supporting f.write)
|
||||
function ml.tdump(t,...)
|
||||
local f = select('#',...) > 0 and select(1,...) or io.stdout
|
||||
f:write(ml.tstring(t),'\n')
|
||||
end
|
||||
|
||||
--- map a function over a list.
|
||||
-- The output must always be the same length as the input, so
|
||||
-- any `nil` values are mapped to `false`.
|
||||
-- @param f a function of one or more arguments
|
||||
-- @param t the table
|
||||
-- @param ... any extra arguments to the function
|
||||
-- @return a list with elements `f(t[i])`
|
||||
function ml.imap(f,t,...)
|
||||
f = ml.function_arg(f)
|
||||
local res = {}
|
||||
for i = 1,#t do
|
||||
local val = f(t[i],...)
|
||||
if val == nil then val = false end
|
||||
res[i] = val
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- filter a list using a predicate.
|
||||
-- @param t a table
|
||||
-- @param pred the predicate function
|
||||
-- @param ... any extra arguments to the predicate
|
||||
-- @return a list such that `pred(t[i])` is true
|
||||
function ml.ifilter(t,pred,...)
|
||||
local res,k = {},1
|
||||
pred = ml.function_arg(pred)
|
||||
for i = 1,#t do
|
||||
if pred(t[i],...) then
|
||||
res[k] = t[i]
|
||||
k = k + 1
|
||||
end
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- find an item in a list using a predicate.
|
||||
-- @param t the list
|
||||
-- @param pred a function of at least one argument
|
||||
-- @param ... any extra arguments
|
||||
-- @return the item value
|
||||
function ml.ifind(t,pred,...)
|
||||
pred = ml.function_arg(pred)
|
||||
for i = 1,#t do
|
||||
if pred(t[i],...) then
|
||||
return t[i]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
--- return the index of an item in a list.
|
||||
-- @param t the list
|
||||
-- @param value item value
|
||||
-- @return index, otherwise `nil`
|
||||
function ml.index (t,value)
|
||||
for i = 1,#t do
|
||||
if t[i] == value then return i end
|
||||
end
|
||||
end
|
||||
|
||||
--- return a slice of a list.
|
||||
-- Like string.sub, the end index may be negative.
|
||||
-- @param t the list
|
||||
-- @param i1 the start index
|
||||
-- @param i2 the end index, default #t
|
||||
function ml.sub(t,i1,i2)
|
||||
if not i2 or i2 > #t then
|
||||
i2 = #t
|
||||
elseif i2 < 0 then
|
||||
i2 = #t + i2 + 1
|
||||
end
|
||||
local res,k = {},1
|
||||
for i = i1,i2 do
|
||||
res[k] = t[i]
|
||||
k = k + 1
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- map a function over a Lua table.
|
||||
-- @param f a function of one or more arguments
|
||||
-- @param t the table
|
||||
-- @param ... any optional arguments to the function
|
||||
function ml.tmap(f,t,...)
|
||||
f = ml.function_arg(f)
|
||||
local res = {}
|
||||
for k,v in pairs(t) do
|
||||
res[k] = f(v,...)
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- filter a table using a predicate.
|
||||
-- @param t a table
|
||||
-- @param pred the predicate function
|
||||
-- @param ... any extra arguments to the predicate
|
||||
-- @usage tfilter({a=1,b='boo'},tonumber) == {a=1}
|
||||
function ml.tfilter (t,pred,...)
|
||||
local res = {}
|
||||
pred = ml.function_arg(pred)
|
||||
for k,v in pairs(t) do
|
||||
if pred(v,...) then
|
||||
res[k] = v
|
||||
end
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- add the key/value pairs of `other` to `t`.
|
||||
-- For sets, this is their union. For the same keys,
|
||||
-- the values from the first table will be overwritten
|
||||
-- @param t table to be updated
|
||||
-- @param other table
|
||||
-- @return the updated table
|
||||
function ml.update(t,other)
|
||||
for k,v in pairs(other) do
|
||||
t[k] = v
|
||||
end
|
||||
return t
|
||||
end
|
||||
|
||||
--- extend a list using values from another.
|
||||
-- @param t the list to be extended
|
||||
-- @param other a list
|
||||
-- @return the extended list
|
||||
function ml.extend(t,other)
|
||||
local n = #t
|
||||
for i = 1,#other do
|
||||
t[n+i] = other[i]
|
||||
end
|
||||
return t
|
||||
end
|
||||
|
||||
--- make a set from a list.
|
||||
-- @param t a list of values
|
||||
-- @return a table where the keys are the values
|
||||
-- @usage set{'one','two'} == {one=true,two=true}
|
||||
function ml.set(t)
|
||||
local res = {}
|
||||
for i = 1,#t do
|
||||
res[t[i]] = true
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- extract the keys of a table as a list.
|
||||
-- This is the opposite operation to tset
|
||||
-- @param t a table
|
||||
-- @param a list of keys
|
||||
function ml.keys(t)
|
||||
local res,k = {},1
|
||||
for key in pairs(t) do
|
||||
res[k] = key
|
||||
k = k + 1
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- is `other` a subset of `t`?
|
||||
-- @param t a set
|
||||
-- @param other a possible subset
|
||||
-- @return true or false
|
||||
function ml.subset(t,other)
|
||||
for k,v in pairs(other) do
|
||||
if t[k] ~= v then return false end
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
--- are these two tables equal?
|
||||
-- This is shallow equality.
|
||||
-- @param t a table
|
||||
-- @param other a table
|
||||
-- @return true or false
|
||||
function ml.tequal(t,other)
|
||||
return ml.subset(t,other) and ml.subset(other,t)
|
||||
end
|
||||
|
||||
--- the intersection of two tables.
|
||||
-- Works as expected for sets, otherwise note that the first
|
||||
-- table's values are preseved
|
||||
-- @param t a table
|
||||
-- @param other a table
|
||||
-- @return the intersection of the tables
|
||||
function ml.intersect(t,other)
|
||||
local res = {}
|
||||
for k,v in pairs(t) do
|
||||
if other[k] then
|
||||
res[k] = v
|
||||
end
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- collect the values of an iterator into a list.
|
||||
-- @param iter a single or double-valued iterator
|
||||
-- @param count an optional number of values to collect
|
||||
-- @return a list of values.
|
||||
-- @usage collect(ipairs{10,20}) == {{1,10},{2,20}}
|
||||
function ml.collect (iter, count)
|
||||
local res,k = {},1
|
||||
local v1,v2 = iter()
|
||||
local dbl = v2 ~= nil
|
||||
while v1 do
|
||||
if dbl then v1 = {v1,v2} end
|
||||
res[k] = v1
|
||||
k = k + 1
|
||||
if count and k > count then break end
|
||||
v1,v2 = iter()
|
||||
end
|
||||
return res
|
||||
end
|
||||
|
||||
--- Functional helpers.
|
||||
-- @section function
|
||||
|
||||
--- create a function which will throw an error on failure.
|
||||
-- @param f a function that returns nil,err if it fails
|
||||
-- @return an equivalent function that raises an error
|
||||
function ml.throw(f)
|
||||
f = ml.function_arg(f)
|
||||
return function(...)
|
||||
local res,err = f(...)
|
||||
if err then error(err) end
|
||||
return res
|
||||
end
|
||||
end
|
||||
|
||||
--- create a function which will never throw an error.
|
||||
-- This is the opposite situation to throw; if the
|
||||
-- original function throws an error e, then this
|
||||
-- function will return nil,e.
|
||||
-- @param f a function which can throw an error
|
||||
-- @return a function which returns nil,error when it fails
|
||||
function ml.safe(f)
|
||||
f = ml.function_arg(f)
|
||||
return function(...)
|
||||
local ok,r1,r2,r3 = pcall(f,...)
|
||||
if ok then return r1,r2,r3
|
||||
else
|
||||
return nil,r1
|
||||
end
|
||||
end
|
||||
end
|
||||
--memoize(f)
|
||||
|
||||
--- bind the value `v` to the first argument of function `f`.
|
||||
-- @param f a function of at least one argument
|
||||
-- @param v a value
|
||||
-- @return a function of one less argument
|
||||
-- @usage (bind1(string.match,'hello')('^hell') == 'hell'
|
||||
function ml.bind1(f,v)
|
||||
f = ml.function_arg(f)
|
||||
return function(...)
|
||||
return f(v,...)
|
||||
end
|
||||
end
|
||||
|
||||
--- compose two functions.
|
||||
-- For instance, `printf` can be defined as `compose(io.write,string.format)`
|
||||
-- @param f1 a function
|
||||
-- @param f2 a function
|
||||
-- @return f1(f2(...))
|
||||
function ml.compose(f1,f2)
|
||||
f1 = ml.function_arg(f1)
|
||||
f2 = ml.function_arg(f2)
|
||||
return function(...)
|
||||
return f1(f2(...))
|
||||
end
|
||||
end
|
||||
|
||||
--- is the object either a function or a callable object?.
|
||||
-- @param obj Object to check.
|
||||
-- @return true if callable
|
||||
function ml.callable (obj)
|
||||
return type(obj) == 'function' or getmetatable(obj) and getmetatable(obj).__call
|
||||
end
|
||||
|
||||
function ml.function_arg(f)
|
||||
assert(ml.callable(f),"expecting a function or callable object")
|
||||
return f
|
||||
end
|
||||
|
||||
--- Classes.
|
||||
-- @section class
|
||||
|
||||
--- create a class with an optional base class.
|
||||
-- The resulting table has a new() function for invoking
|
||||
-- the constructor, which must be named `_init`. If the base
|
||||
-- class has a constructor, you can call it as the `super()` method.
|
||||
-- The `__tostring` metamethod is also inherited, but others need
|
||||
-- to be brought in explicitly.
|
||||
-- @param base optional base class
|
||||
-- @return the metatable representing the class
|
||||
function ml.class(base)
|
||||
local klass, base_ctor = {}
|
||||
klass.__index = klass
|
||||
if base then
|
||||
setmetatable(klass,base)
|
||||
klass._base = base
|
||||
base_ctor = rawget(base,'_init')
|
||||
klass.__tostring = base.__tostring
|
||||
end
|
||||
function klass.new(...)
|
||||
local self = setmetatable({},klass)
|
||||
if rawget(klass,'_init') then
|
||||
klass.super = base_ctor -- make super available for ctor
|
||||
klass._init(self,...)
|
||||
elseif base_ctor then -- call base ctor automatically
|
||||
base_ctor(self,...)
|
||||
end
|
||||
return self
|
||||
end
|
||||
return klass
|
||||
end
|
||||
|
||||
--- is an object derived from a class?
|
||||
-- @param self the object
|
||||
-- @param klass a class created with `class`
|
||||
-- @return true or false
|
||||
function ml.is_a(self,klass)
|
||||
local m = getmetatable(self)
|
||||
if not m then return false end --*can't be an object!
|
||||
while m do
|
||||
if m == klass then return true end
|
||||
m = rawget(m,'_base')
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
local _type = type
|
||||
|
||||
--- extended type of an object.
|
||||
-- The type of a table is its metatable, otherwise works like standard type()
|
||||
-- @param obj a value
|
||||
-- @return the type, either a string or the metatable
|
||||
function ml.type (obj)
|
||||
if _type(obj) == 'table' then
|
||||
return getmetatable(obj) or 'table'
|
||||
else
|
||||
return _type(obj)
|
||||
end
|
||||
end
|
||||
|
||||
return ml
|
||||
Loading…
x
Reference in New Issue
Block a user