Merge branch 'master' of github.com:ChrisCochrun/.dotfiles
This commit is contained in:
commit
68489d3fb0
2 changed files with 107 additions and 46 deletions
132
awesome/fennelview.fnl
Normal file → Executable file
132
awesome/fennelview.fnl
Normal file → Executable file
|
|
@ -1,13 +1,13 @@
|
|||
;; A pretty-printer that outputs tables in Fennel syntax.
|
||||
;; Loosely based on inspect.lua: http://github.com/kikito/inspect.lua
|
||||
|
||||
(local view-quote (fn [str] (.. '"' (: str :gsub '"' '\\"') '"')))
|
||||
(fn view-quote [str] (.. "\"" (: str :gsub "\"" "\\\"") "\""))
|
||||
|
||||
(local short-control-char-escapes
|
||||
{"\a" "\\a" "\b" "\\b" "\f" "\\f" "\n" "\\n"
|
||||
"\r" "\\r" "\t" "\\t" "\v" "\\v"})
|
||||
|
||||
(local long-control-char-esapes
|
||||
(local long-control-char-escapes
|
||||
(let [long {}]
|
||||
(for [i 0 31]
|
||||
(let [ch (string.char i)]
|
||||
|
|
@ -17,9 +17,10 @@
|
|||
long))
|
||||
|
||||
(fn escape [str]
|
||||
(let [str (: str :gsub "\\" "\\\\")
|
||||
str (: str :gsub "(%c)%f[0-9]" long-control-char-esapes)]
|
||||
(: str :gsub "%c" short-control-char-escapes)))
|
||||
(-> str
|
||||
(: :gsub "\\" "\\\\")
|
||||
(: :gsub "(%c)%f[0-9]" long-control-char-escapes)
|
||||
(: :gsub "%c" short-control-char-escapes)))
|
||||
|
||||
(fn sequence-key? [k len]
|
||||
(and (= (type k) "number")
|
||||
|
|
@ -32,7 +33,7 @@
|
|||
|
||||
(fn sort-keys [a b]
|
||||
(let [ta (type a) tb (type b)]
|
||||
(if (and (= ta tb) (~= ta "boolean")
|
||||
(if (and (= ta tb)
|
||||
(or (= ta "string") (= ta "number")))
|
||||
(< a b)
|
||||
(let [dta (. type-order a)
|
||||
|
|
@ -58,13 +59,12 @@
|
|||
(values keys sequence-length)))
|
||||
|
||||
(fn count-table-appearances [t appearances]
|
||||
(if (= (type t) "table")
|
||||
(when (not (. appearances t))
|
||||
(tset appearances t 1)
|
||||
(each [k v (pairs t)]
|
||||
(count-table-appearances k appearances)
|
||||
(count-table-appearances v appearances)))
|
||||
(when (and t (= t t)) ; no nans please
|
||||
(when (= (type t) "table")
|
||||
(if (not (. appearances t))
|
||||
(do (tset appearances t 1)
|
||||
(each [k v (pairs t)]
|
||||
(count-table-appearances k appearances)
|
||||
(count-table-appearances v appearances)))
|
||||
(tset appearances t (+ (or (. appearances t) 0) 1))))
|
||||
appearances)
|
||||
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
|
||||
(fn tabify [self] (puts self "\n" (: self.indent :rep self.level)))
|
||||
|
||||
(fn already-visited? [self v] (~= (. self.ids v) nil))
|
||||
(fn already-visited? [self v] (not= (. self.ids v) nil))
|
||||
|
||||
(fn get-id [self v]
|
||||
(var id (. self.ids v))
|
||||
|
|
@ -89,49 +89,65 @@
|
|||
(tset self.ids v id)))
|
||||
(tostring id))
|
||||
|
||||
(fn put-sequential-table [self t length]
|
||||
(fn put-sequential-table [self t len]
|
||||
(puts self "[")
|
||||
(set self.level (+ self.level 1))
|
||||
(for [i 1 length]
|
||||
(puts self " ")
|
||||
(for [i 1 len]
|
||||
(when (< 1 i (+ 1 len))
|
||||
(puts self " "))
|
||||
(put-value self (. t i)))
|
||||
(set self.level (- self.level 1))
|
||||
(puts self " ]"))
|
||||
(puts self "]"))
|
||||
|
||||
(fn put-key [self k]
|
||||
(if (and (= (type k) "string")
|
||||
(: k :find "^[-%w?\\^_`!#$%&*+./@~:|<=>]+$"))
|
||||
(: k :find "^[-%w?\\^_!$%&*+./@:|<=>]+$"))
|
||||
(puts self ":" k)
|
||||
(put-value self k)))
|
||||
|
||||
(fn put-kv-table [self t]
|
||||
(fn put-kv-table [self t ordered-keys]
|
||||
(puts self "{")
|
||||
(set self.level (+ self.level 1))
|
||||
(each [k v (pairs t)]
|
||||
(tabify self)
|
||||
;; first, output sorted nonsequential keys
|
||||
(each [i k (ipairs ordered-keys)]
|
||||
(when (or self.table-edges (not= i 1))
|
||||
(tabify self))
|
||||
(put-key self k)
|
||||
(puts self " ")
|
||||
(put-value self (. t k)))
|
||||
;; next, output any sequential keys
|
||||
(each [i v (ipairs t)]
|
||||
(tabify self)
|
||||
(put-key self i)
|
||||
(puts self " ")
|
||||
(put-value self v))
|
||||
(set self.level (- self.level 1))
|
||||
(tabify self)
|
||||
(when self.table-edges
|
||||
(tabify self))
|
||||
(puts self "}"))
|
||||
|
||||
(fn put-table [self t]
|
||||
(if (already-visited? self t)
|
||||
(puts self "#<table " (get-id self t) ">")
|
||||
(>= self.level self.depth)
|
||||
(puts self "{...}")
|
||||
:else
|
||||
(let [(non-seq-keys length) (get-nonsequential-keys t)
|
||||
id (get-id self t)]
|
||||
(if (> (. self.appearances t) 1)
|
||||
(puts self "#<" id ">")
|
||||
(and (= (# non-seq-keys) 0) (= (# t) 0))
|
||||
(puts self "{}")
|
||||
(= (# non-seq-keys) 0)
|
||||
(put-sequential-table self t length)
|
||||
:else
|
||||
(put-kv-table self t)))))
|
||||
(let [metamethod (and self.metamethod? (-?> t getmetatable (. :__fennelview)))]
|
||||
(if (and (already-visited? self t) self.detect-cycles?)
|
||||
(puts self "#<table @" (get-id self t) ">")
|
||||
(>= self.level self.depth)
|
||||
(puts self "{...}")
|
||||
metamethod
|
||||
(puts self (metamethod t self.fennelview))
|
||||
:else
|
||||
(let [(non-seq-keys len) (get-nonsequential-keys t)
|
||||
id (get-id self t)]
|
||||
;; fancy metatable stuff can result in self.appearances not including
|
||||
;; a table, so if it's not found, assume we haven't seen it; we can't
|
||||
;; do cycle detection in that case.
|
||||
(when (and (< 1 (or (. self.appearances t) 0)) self.detect-cycles?)
|
||||
(puts self "@" id))
|
||||
(if (and (= (length non-seq-keys) 0) (= (length t) 0))
|
||||
(puts self (if self.empty-as-square "[]" "{}"))
|
||||
(= (length non-seq-keys) 0)
|
||||
(put-sequential-table self t len)
|
||||
:else
|
||||
(put-kv-table self t non-seq-keys))))))
|
||||
|
||||
(set put-value (fn [self v]
|
||||
(let [tv (type v)]
|
||||
|
|
@ -146,11 +162,41 @@
|
|||
|
||||
|
||||
|
||||
(fn fennelview [root options]
|
||||
(fn one-line [str]
|
||||
;; save return value as local to ignore gsub's extra return value
|
||||
(let [ret (-> str
|
||||
(: :gsub "\n" " ")
|
||||
(: :gsub "%[ " "[") (: :gsub " %]" "]")
|
||||
(: :gsub "%{ " "{") (: :gsub " %}" "}")
|
||||
(: :gsub "%( " "(") (: :gsub " %)" ")"))]
|
||||
ret))
|
||||
|
||||
(fn fennelview [x options]
|
||||
"Return a string representation of x.
|
||||
|
||||
Can take an options table with these keys:
|
||||
* :one-line (boolean: default: false) keep the output string as a one-liner
|
||||
* :depth (number, default: 128) limit how many levels to go (default: 128)
|
||||
* :indent (string, default: \" \") use this string to indent each level
|
||||
* :detect-cycles? (boolean, default: true) don't try to traverse a looping table
|
||||
* :metamethod? (boolean: default: true) use the __fennelview metamethod if found
|
||||
* :table-edges (boolean: default: true) put {} table brackets on their own line
|
||||
* :empty-as-square (boolean: default: false) render empty tables as [], not {}
|
||||
|
||||
The __fennelview metamethod should take the table being serialized as its first
|
||||
argument and a function as its second arg which can be used on table elements to
|
||||
continue the fennelview process on them.
|
||||
"
|
||||
(let [options (or options {})
|
||||
inspector {:appearances (count-table-appearances root {})
|
||||
inspector {:appearances (count-table-appearances x {})
|
||||
:depth (or options.depth 128)
|
||||
:level 0 :buffer {} :ids {} :max-ids {}
|
||||
:indent (or options.indent " ")}]
|
||||
(put-value inspector root)
|
||||
(table.concat inspector.buffer)))
|
||||
:indent (or options.indent (if options.one-line "" " "))
|
||||
:detect-cycles? (not (= false options.detect-cycles?))
|
||||
:metamethod? (not (= false options.metamethod?))
|
||||
:fennelview #(fennelview $1 options)
|
||||
:table-edges (not= options.table-edges false)
|
||||
:empty-as-square options.empty-as-square}]
|
||||
(put-value inspector x)
|
||||
(let [str (table.concat inspector.buffer)]
|
||||
(if options.one-line (one-line str) str))))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,22 @@
|
|||
pcall(require, "luarocks.loader")
|
||||
-- pcall(require, "luarocks.loader")
|
||||
fennel = require("fennel")
|
||||
local gears = require("gears")
|
||||
fennel.path = fennel.path .. ";.config/awesome/?.fnl"
|
||||
table.insert(package.loaders or package.searchers, fennel.make_searcher({correlate=true}))
|
||||
table.insert(package.loaders or package.searchers, fennel.searcher)
|
||||
|
||||
require("init") -- load ~/.config/awesome/config.fnl
|
||||
-- pcall(require, "luarocks.loader")
|
||||
-- -- local fennel = require("./fennel")
|
||||
-- fennel = require("./fennel")
|
||||
-- local gears = require("gears")
|
||||
-- fennel.path = fennel.path .. ";.config/awesome/?.fnl"
|
||||
-- table.insert(package.loaders or package.searchers, fennel.make_searcher({correlate=true}))
|
||||
|
||||
-- local fennel = require("./fennel")
|
||||
-- fennel.path = fennel.path .. ";.config/awesome/?.fnl"
|
||||
-- fennel.makeSearcher({
|
||||
-- correlate = true,
|
||||
-- useMetadata = true
|
||||
-- })
|
||||
-- table.insert(package.loaders or package.searchers, fennel.searcher)
|
||||
|
||||
require("init") -- load ~/.config/awesome/init.fnl
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue