Skip to content

Fixes and Improvements #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2022
Merged

Fixes and Improvements #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
574af61
Fix and improve
Kacarott Feb 25, 2022
320dae9
Update showcase code
Kacarott Feb 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,18 @@ <h1>
# Multiple definition
true = not false

# Invalid names
%value = ()

# Invalid whitespace (tabs)
whitespace = ()

# Bare term
# Bare lambda
(\ f x . f (x x))

# Bare term
const f x

# Symbols
< a b c > => < a a a >

# Unbound
some-func = \ local . true non-existent local

Expand All @@ -58,9 +61,18 @@ <h1>
# Debug mode on
#debug

# Bare term - Debug
# Invalid names - Debug
%value = ()

# Bare lambda - Debug
(\ f x . f (x x))

# Bare term - Debug
const f x

# Symbols - Debug
< a b c > => < a a a >

# Unbound - Debug
some-func = \ local . true non-existent local

Expand Down
21 changes: 12 additions & 9 deletions lambdacalc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CodeMirror.defineMode("lambdacalc", function(_config, modeConfig) {
const EMPTY = "text";
const UNDEF = "error";
const REDEF = "variable-3";
const SUPPRESS = "text";
const FAIL = "error";

const defName = /[a-zA-Z][a-zA-Z0-9_\-']*/
Expand All @@ -23,14 +24,14 @@ CodeMirror.defineMode("lambdacalc", function(_config, modeConfig) {
const numconst = /\d+/

function expectDefOrTerm(stream, state) {
return expectDef(stream, state)
|| (state.debug ? null : expectTerm(stream, state));
if (stream.match(/.*=/, false)) return expectDef(stream, state);
else return expectTerm(stream, state);
}

function expectDef(stream, state) {
const name = (stream.match(defName)||[])[0];
state.f = expectAssign;
if (!name || !(/[=\s]/.test(stream.peek()) || stream.eol())) return null;
if (!name || !(stream.match(/\s*=/, false))) return null;
const res = [];
if (state.defined.includes(name)) res.push(REDEF);
state.defined.push(name);
Expand Down Expand Up @@ -81,7 +82,7 @@ CodeMirror.defineMode("lambdacalc", function(_config, modeConfig) {
if (!res) return null;
if (state.bound.some(v=>v.includes(res))) return BOUND;
if (state.defined.includes(res)) return PREDEF;
return state.debug ? UNDEF : "text";
return UNDEF;
}

function number(stream, state) {
Expand All @@ -103,12 +104,12 @@ CodeMirror.defineMode("lambdacalc", function(_config, modeConfig) {

function onFail(stream, state) {
stream.match(/[^\s]*/);
return FAIL
return FAIL ;
}

return {
startState: function () { return {
f: expectDefOrTerm,
f: expectDef,
depth: [],
defined: [],
bound: [[]],
Expand Down Expand Up @@ -136,13 +137,15 @@ CodeMirror.defineMode("lambdacalc", function(_config, modeConfig) {
}
if (stream.sol() && state.depth.length === 0) {
state.bound = [[]];
state.f = expectDefOrTerm;
state.f = expectDef;
}
return state.f(stream, state) || onFail(stream, state);
const res = state.f(stream, state)
|| (state.debug ? null : expectDefOrTerm(stream, state))
|| onFail(stream, state);
return !state.debug && res == FAIL ? SUPPRESS : res ;
},

indent: function(state, textAfter) {
console.log(state.depth);
if (!state.depth.length) return 0;
return state.depth[state.depth.length-1] + 2;
},
Expand Down