Skip to content

Commit

Permalink
chore: fix indentation
Browse files Browse the repository at this point in the history
  • Loading branch information
matteo-cristino committed Oct 2, 2024
1 parent f49f944 commit f8f49db
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 76 deletions.
144 changes: 76 additions & 68 deletions src/lua/spell.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@
-- http://norvig.com/spell-correct.html
-- Open source code under MIT license: http://www.opensource.org/licenses/mit-license.php

local yield,wrap = coroutine.yield,coroutine.wrap
local alphabet_str,alphabet = 'abcdefghijklmnopqrstuvwxyz',{}
for a in alphabet_str:gmatch(".") do alphabet[#alphabet+1] = a end
local yield, wrap = coroutine.yield, coroutine.wrap
local alphabet_str, alphabet = 'abcdefghijklmnopqrstuvwxyz', {}
for a in alphabet_str:gmatch(".") do alphabet[#alphabet + 1] = a end
spell = {}

local function list(w) return pairs{[w]=true} end
local function list(w) return pairs { [w] =true } end

function spell:max(...)
local arg,max,hyp = table.pack(...),0,nil
for w in table.unpack(arg) do
local p = self.model[w] or 1
if p>max or ( p==max and hyp<w ) then hyp,max=w,p end
end
return hyp
local arg, max, hyp = table.pack(...), 0, nil
for w in table.unpack(arg) do
local p = self.model[w] or 1
if p > max or (p == max and hyp < w) then
hyp, max = w, p
end
end
return hyp
end

-- local function words(text) return text:lower():gmatch("[a-z]+") end
Expand All @@ -31,75 +33,81 @@ end
-- local function init(filename) train(words(io.open(filename):read("*a"))) end

local function make_yield()
local set = {}
return function(w)
if not set[w] then
set[w] = true
yield(w)
end
end
local set = {}
return function(w)
if not set[w] then
set[w] = true
yield(w)
end
end
end

local function edits1(word_str, yield)
local yield = yield or make_yield()
return wrap(function()
local splits, word = {}, {}
for i=1,#word_str do
word[i],splits[i] = word_str:sub(i,i),{word_str:sub(1,i),word_str:sub(i)}
end
-- sentinels
splits[0], splits[#word_str+1] = { "", word_str }, { word_str, ""}
-- deletes
for i=1,#word_str do yield( splits[i-1][1]..splits[i+1][2] ) end
-- transposes
for i=1,#word_str-1 do
yield( splits[i-1][1]..word[i+1]..word[i]..splits[i+2][2] )
end
-- replaces
for i=1,#word_str do
for j=1,#alphabet do
yield( splits[i-1][1]..alphabet[j]..splits[i+1][2] )
end
end
-- inserts
for i=0,#word_str do
for j=1,#alphabet do
yield( splits[i][1]..alphabet[j]..splits[i+1][2] )
end
end
end)
local yield = yield or make_yield()
return wrap(function()
local splits, word = {}, {}
for i = 1, #word_str do
word[i], splits[i] = word_str:sub(i, i), {word_str:sub(1, i), word_str:sub(i)}
end
-- sentinels
splits[0], splits[#word_str + 1] = {"", word_str}, {word_str, ""}
-- deletes
for i = 1, #word_str do
yield(splits[i - 1][1] .. splits[i + 1][2])
end
-- transposes
for i = 1, #word_str - 1 do
yield(splits[i - 1][1] .. word[i + 1] .. word[i] .. splits[i + 2][2])
end
-- replaces
for i = 1, #word_str do
for j = 1, #alphabet do
yield(splits[i - 1][1] .. alphabet[j] .. splits[i + 1][2])
end
end
-- inserts
for i = 0, #word_str do
for j = 1, #alphabet do
yield(splits[i][1] .. alphabet[j] .. splits[i + 1][2])
end
end
end)
end

function spell:known_edits2(w, set)
local yield,yield2 = make_yield(),make_yield()
return wrap(function()
for e1 in edits1(w) do
for e2 in edits1(e1,yield2) do
if self.model[e2] then yield( e2 ) end
end
end
end)
local yield, yield2 = make_yield(), make_yield()
return wrap(function()
for e1 in edits1(w) do
for e2 in edits1(e1, yield2) do
if self.model[e2] then
yield(e2)
end
end
end
end)
end

function spell:known(list,aux)
return wrap(function()
for w in list,aux do
if self.model[w] then yield(w) end
end
end)
function spell:known(list, aux)
return wrap(function()
for w in list, aux do
if self.model[w] then
yield(w)
end
end
end)
end

function spell:correct(w)
local w = w:lower()
local result = self:max(self:known(list(w)))
or self:max(self:known(edits1(w)))
or self:max(self:known_edits2(w))
or self:max(list(w))
if result then
return result
else
return false,"No suggestion found for word: "..w
end
local w = w:lower()
local result = self:max(self:known(list(w)))
or self:max(self:known(edits1(w)))
or self:max(self:known_edits2(w))
or self:max(list(w))
if result then
return result
else
return false, "No suggestion found for word: " .. w
end
end

return spell
16 changes: 8 additions & 8 deletions src/zen_parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,14 @@ static int lua_strtok(lua_State* L) {
// list scenarios embedded at build time in lualibs_detected.c
extern const char* const zen_scenarios[];
static int lua_list_scenarios(lua_State* L) {
lua_newtable(L);
register int i;
for(i=0; zen_scenarios[i] != NULL; i++) {
lua_pushnumber(L, i + 1); // Lua arrays are 1-indexed
lua_pushstring(L, zen_scenarios[i]);
lua_settable(L, -3);
}
return 1;
lua_newtable(L);
register int i;
for (i = 0; zen_scenarios[i] != NULL; i++) {
lua_pushnumber(L, i + 1); // Lua arrays are 1-indexed
lua_pushstring(L, zen_scenarios[i]);
lua_settable(L, -3);
}
return 1;
}

void zen_add_parse(lua_State *L) {
Expand Down

0 comments on commit f8f49db

Please sign in to comment.