This commit is contained in:
sagie gur ari 2020-06-05 12:48:14 +00:00
parent d98b26c4ca
commit 013d20d723
5 changed files with 18 additions and 5 deletions

View file

@ -1,5 +1,9 @@
## CHANGELOG
### v0.4.2 (2020-06-05)
* Fixed parsing issue for commands evaluated by other commands (for example if conditions)
### v0.4.1 (2020-06-04)
* New Enable to error an exec command via new --fail-on-error flag #108

View file

@ -63,6 +63,9 @@
<span id="63">63</span>
<span id="64">64</span>
<span id="65">65</span>
<span id="66">66</span>
<span id="67">67</span>
<span id="68">68</span>
</pre><div class="example-wrap"><pre class="rust ">
<span class="kw">use</span> <span class="ident">duckscript</span>::<span class="ident">parser</span>;
<span class="kw">use</span> <span class="ident">duckscript</span>::<span class="ident">runner</span>;
@ -95,7 +98,10 @@
<span class="ident">line_buffer</span>.<span class="ident">push</span>(<span class="string">&#39; &#39;</span>);
}
<span class="kw">let</span> <span class="ident">line_str</span> <span class="op">=</span> <span class="ident">line_buffer</span>.<span class="ident">replace</span>(<span class="string">&quot;\r&quot;</span>, <span class="string">&quot;&quot;</span>).<span class="ident">replace</span>(<span class="string">&quot;\n&quot;</span>, <span class="string">&quot;&quot;</span>);
<span class="kw">let</span> <span class="ident">line_str</span> <span class="op">=</span> <span class="ident">line_buffer</span>
.<span class="ident">replace</span>(<span class="string">&quot;\r&quot;</span>, <span class="string">&quot;&quot;</span>)
.<span class="ident">replace</span>(<span class="string">&quot;\n&quot;</span>, <span class="string">&quot;&quot;</span>)
.<span class="ident">replace</span>(<span class="string">&quot;\\&quot;</span>, <span class="string">&quot;\\\\&quot;</span>);
<span class="kw">match</span> <span class="ident">parser</span>::<span class="ident">parse_text</span>(<span class="kw-2">&amp;</span><span class="ident">line_str</span>) {
<span class="prelude-val">Ok</span>(<span class="ident">instructions</span>) <span class="op">=</span><span class="op">&gt;</span> {

View file

@ -1,6 +1,6 @@
[package]
name = "duckscript_cli"
version = "0.4.1"
version = "0.4.2"
authors = ["Sagie Gur-Ari <sagiegurari@gmail.com>"]
description = "The duckscript command line executable."
license = "Apache-2.0"
@ -28,7 +28,7 @@ path = "src/main.rs"
[dependencies]
duckscript = { version = "^0.4.0", path = "../duckscript" }
duckscriptsdk = { version = "^0.4.1", path = "../duckscript_sdk" }
duckscriptsdk = { version = "^0.4.2", path = "../duckscript_sdk" }
[badges.codecov]
branch = "master"

View file

@ -1,6 +1,6 @@
[package]
name = "duckscriptsdk"
version = "0.4.1"
version = "0.4.2"
authors = ["Sagie Gur-Ari <sagiegurari@gmail.com>"]
description = "The duckscript SDK."
license = "Apache-2.0"

View file

@ -29,7 +29,10 @@ pub(crate) fn eval(
line_buffer.push(' ');
}
let line_str = line_buffer.replace("\r", "").replace("\n", "");
let line_str = line_buffer
.replace("\r", "")
.replace("\n", "")
.replace("\\", "\\\\");
match parser::parse_text(&line_str) {
Ok(instructions) => {