mirrors
/
rpncalc-v4
mirror of https://github.com/Baidicoot/rpncalc-v4
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed/remodeled parse syntax for push

This commit is contained in:
Aidan K. Ewart 2020-05-20 12:04:37 +01:00
parent 9a700aca35
commit 7f8fb253b5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
parse.js
View File

@ -21,7 +21,7 @@ convert:
] ]
(for c+p) (for c+p)
[{type:"int",val:1},{type:"int",val:2},{type:"ident",name:"+"},{type:"syntax",val:"("},{type:"ident",name:"name"},{type:"syntax",val:";"},{type:"ident",name:"args"},{type:"syntax",val:"->"},{type:"int",val:2},{type:"ident",name:"args"},{type:"ident",name:"+"},{type:"syntax",val:")"}] [{type:"int",val:1},{type:"int",val:2},{type:"ident",name:"+"},{type:"syntax",val:"'"},{type:"syntax",val:"("},{type:"ident",name:"name"},{type:"syntax",val:";"},{type:"ident",name:"args"},{type:"syntax",val:"->"},{type:"int",val:2},{type:"ident",name:"args"},{type:"ident",name:"+"},{type:"syntax",val:")"}]
to: to:
[ [
@ -73,12 +73,12 @@ const or = (a, b) => (stream) => {
/* (parser) */ /* (parser) */
const parens = (parser) => (stream) => { const parens = (parser) => (stream) => {
let a = parseSyntax("(", stream); let a = parseSyntax("(")(stream);
if (a.parsed === null) { if (a.parsed === null) {
return {parsed:null, stream:a.stream}; return {parsed:null, stream:a.stream};
} }
let dat = parser(a.stream); let dat = parser(a.stream);
a = parseSyntax(")", dat.stream); a = parseSyntax(")")(dat.stream);
if (a.parsed === null) { if (a.parsed === null) {
throw 'mismatched parens!'; throw 'mismatched parens!';
} }
@ -141,7 +141,7 @@ const parseInteger = (stream) => {
} }
/* takes in stream, outputs parsed item or null */ /* takes in stream, outputs parsed item or null */
const parseSyntax = (syntax, stream) => { const parseSyntax = (syntax) => (stream) => {
let e = stream[0]; let e = stream[0];
if (e === undefined) { if (e === undefined) {
return {parsed:null, stream:stream}; return {parsed:null, stream:stream};
@ -163,7 +163,7 @@ const parseName = (stream) => {
if (id.parsed === null) { if (id.parsed === null) {
return {parsed:null, stream:id.stream}; return {parsed:null, stream:id.stream};
} }
let syn = parseSyntax(";", id.stream); let syn = parseSyntax(";")(id.stream);
if (syn.parsed === null) { if (syn.parsed === null) {
throw 'could not parse name!' throw 'could not parse name!'
} }
@ -172,11 +172,12 @@ const parseName = (stream) => {
/* takes in stream, outputs parsed item or null - FAILABLE */ /* takes in stream, outputs parsed item or null - FAILABLE */
const parsePush = (stream) => { const parsePush = (stream) => {
let syn = attempt(parseSyntax("'")); let syn = attempt(parseSyntax("'"))(stream);
console.log(syn);
if (syn.parsed === null) { if (syn.parsed === null) {
return {parsed:null, stream:syn.stream}; return {parsed:null, stream:syn.stream};
} }
let id = parseIdent(syn.stream); let id = parseExpr(syn.stream);
if (id.parsed === null) { if (id.parsed === null) {
return {parsed:null, stream:id.stream}; return {parsed:null, stream:id.stream};
} }
@ -190,7 +191,7 @@ const parseLambda = (stream) => {
name.parsed = ""; name.parsed = "";
} }
let args = many(parseIdent)(name.stream); let args = many(parseIdent)(name.stream);
let syn = parseSyntax("->", args.stream); let syn = parseSyntax("->")(args.stream);
if (syn.parsed === null) { if (syn.parsed === null) {
throw 'no lambda body found!'; throw 'no lambda body found!';
} }
@ -205,4 +206,4 @@ const parseLambda = (stream) => {
const parseExpr = or(parseBuiltin, or(parseIdent, or(parseInteger, or(parsePush, attempt(parens(parseLambda)))))); const parseExpr = or(parseBuiltin, or(parseIdent, or(parseInteger, or(parsePush, attempt(parens(parseLambda))))));
/* takes in stream, outputs parsed items */ /* takes in stream, outputs parsed items */
export const parseExprs = many(parseExpr); const parseExprs = many(parseExpr);