From f704918fe2b187d715fe985ebffebdfbdc4b541f Mon Sep 17 00:00:00 2001 From: Ben Burwell Date: Wed, 14 Sep 2016 16:15:20 -0400 Subject: Add repeat and input --- lib/doml.js | 33 +++++++++++++++++++ lib/style.css | 68 ++++++++++++++++++++++++++++++++++---- prog/euclideanAlgorithmInput.html | 69 +++++++++++++++++++++++++++++++++++++++ prog/function.doml | 19 +++++++++++ prog/function.html | 13 +++++--- prog/input.html | 28 ++++++++++++++++ 6 files changed, 218 insertions(+), 12 deletions(-) create mode 100644 prog/euclideanAlgorithmInput.html create mode 100644 prog/function.doml create mode 100644 prog/input.html diff --git a/lib/doml.js b/lib/doml.js index c813db9..181f574 100644 --- a/lib/doml.js +++ b/lib/doml.js @@ -151,6 +151,23 @@ 'call': function(dataset, children, context) { return context[dataset.name](children); + }, + + 'repeat': function(dataset, children, context) { + var times = me.evaluate(children[0], context); + for (var n = 0; n < times; n++) { + if (dataset.iteration) { + context[dataset.iteration] = n; + } + me.evaluate(children[1], context); + } + }, + + 'input': function(dataset, children, context) { + var msg = dataset.prompt || dataset.name; + var rawInput = prompt(dataset.prompt); + context[dataset.name] = me.Types[dataset.type](rawInput); + return context[dataset.name]; } }; @@ -176,6 +193,22 @@ 'bin-op': function(e) { return [ e.dataset.op ]; + }, + + 'input': function(e) { + return [ e.dataset.name ]; + }, + + 'call': function(e) { + return [ e.dataset.name ]; + }, + + 'function': function(e) { + return [ e.dataset.args ]; + }, + + 'repeat': function(e) { + return [ e.dataset.iteration ]; } }; diff --git a/lib/style.css b/lib/style.css index 6b7d25f..3f7ec40 100644 --- a/lib/style.css +++ b/lib/style.css @@ -1,3 +1,8 @@ +* { + margin: 0; + padding: 0; +} + body { font-family: monospace; } @@ -15,8 +20,7 @@ var { } .statement-sequence { - display: block; - border: 2px solid #666; + flex-direction: column; } .statement-sequence > span { @@ -32,7 +36,7 @@ var { .assign::before { content: 'Variable Assignment'; - color: darkmagenta; + color: blueviolet; order: 1; } @@ -68,7 +72,7 @@ var { .while::before { content: 'While'; - color: darkmagenta; + color: blueviolet; } .return > span { @@ -77,13 +81,13 @@ var { .return::after { content: 'Return'; - color: darkmagenta; + color: blueviolet; order: 1; } .compare::before { content: 'Comparison'; - color: darkmagenta; + color: blueviolet; order: 1; } @@ -105,7 +109,7 @@ var { .branch::before { content: 'Logical Branch'; - color: darkmagenta; + color: blueviolet; } .branch > span { @@ -123,3 +127,53 @@ var { .bin-op > var { order: 2; } + +.input { + color: blue; +} + +.input::before { + content: 'Input'; + color: blueviolet; +} + +.call::before { + content: 'Function Call'; + color: blueviolet; +} + +.call > var { + font-weight: bold; + color: darkorange; + order: 1; +} + +.call > span { + order: 2; +} + +.function { + border: 4px solid darkorange; + margin: 3px; + flex-direction: column-reverse; + padding-left: 0; + padding-right: 0; + background-color: white; +} + +.function > var { + background-color: darkorange; +} + +.print { + background-color: greenyellow; +} + +.repeat { + flex-direction: column; +} + +.repeat::before { + content: 'Repeat'; + color: blueviolet; +} diff --git a/prog/euclideanAlgorithmInput.html b/prog/euclideanAlgorithmInput.html new file mode 100644 index 0000000..dfba476 --- /dev/null +++ b/prog/euclideanAlgorithmInput.html @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/prog/function.doml b/prog/function.doml new file mode 100644 index 0000000..841cb0b --- /dev/null +++ b/prog/function.doml @@ -0,0 +1,19 @@ +statement-sequence { + assign(name=myFunc) { + function(args=stringToPrint,val1,val2) { + print { + variable(name=stringToPrint) + bin-op(op=+) { + variable(name=val1) + variable(name=val2) + } + } + } + } + + call(name=myFunc) { + constant(val="hello, world!" type="string") + constant(val="3.5" type="number") + constant(val="7" type="number") + } +} diff --git a/prog/function.html b/prog/function.html index 2fe8d40..f0bf334 100644 --- a/prog/function.html +++ b/prog/function.html @@ -5,7 +5,7 @@ - + @@ -21,10 +21,13 @@ - - - - + + + + + + + diff --git a/prog/input.html b/prog/input.html new file mode 100644 index 0000000..07ca54a --- /dev/null +++ b/prog/input.html @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3