Skip to content

Commit

Permalink
Fix Sphinx helper script that emits command lines.
Browse files Browse the repository at this point in the history
When an example contained multiple commands separated by semicolons,
we'd execute them separately but still include all of them into each of
the command lines emitted into the docs.

(Couple of doc outputs show slightly changed content, including updates
into this commit.)
  • Loading branch information
rsmmr committed Dec 8, 2020
1 parent dd02df3 commit f4b9f4b
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 12 deletions.
4 changes: 2 additions & 2 deletions doc/programming/examples/_parse-backtrack.spicy.output
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Automatically generated; do not edit. -- <HASH> printf '\001\002\003\004' | spicy-driver %INPUT; printf '\003\004' | spicy-driver %INPUT/printf '\001\002\003\004' | spicy-driver %INPUT; printf '\003\004' | spicy-driver %INPUT/False
# printf '\001\002\003\004' | spicy-driver backtrack.spicy; printf '\003\004' | spicy-driver backtrack.spicy
# printf '\001\002\003\004' | spicy-driver backtrack.spicy
[$foo=[$a=1, $b=2], $bar=[$a=3, $b=4]]

# printf '\001\002\003\004' | spicy-driver backtrack.spicy; printf '\003\004' | spicy-driver backtrack.spicy
# printf '\003\004' | spicy-driver backtrack.spicy
[$foo=[$a=3, $b=(not set)], $bar=[$a=3, $b=4]]
4 changes: 2 additions & 2 deletions doc/programming/examples/_parse-if.spicy.output
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Automatically generated; do not edit. -- <HASH> printf '\01\02\03\04' | spicy-driver %INPUT; printf '\02\02\03\04' | spicy-driver %INPUT/printf '\01\02\03\04' | spicy-driver %INPUT; printf '\02\02\03\04' | spicy-driver %INPUT/False
# printf '\01\02\03\04' | spicy-driver foo.spicy; printf '\02\02\03\04' | spicy-driver foo.spicy
# printf '\01\02\03\04' | spicy-driver foo.spicy
[$a=1, $b=2, $c=(not set), $d=3]

# printf '\01\02\03\04' | spicy-driver foo.spicy; printf '\02\02\03\04' | spicy-driver foo.spicy
# printf '\02\02\03\04' | spicy-driver foo.spicy
[$a=2, $b=(not set), $c=2, $d=3]
Binary file modified doc/programming/examples/_parse-random-access.spicy.output
Binary file not shown.
4 changes: 2 additions & 2 deletions doc/programming/examples/_parse-switch-lhead-2.spicy.output
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Automatically generated; do not edit. -- <HASH> printf 'A ' | spicy-driver %INPUT; printf '\377\377' | spicy-driver %INPUT/printf 'A ' | spicy-driver %INPUT; printf '\377\377' | spicy-driver %INPUT/False
# printf 'A ' | spicy-driver foo.spicy; printf '\377\377' | spicy-driver foo.spicy
# printf 'A ' | spicy-driver foo.spicy
[$a=[$a=b"A"], $b=(not set)]

# printf 'A ' | spicy-driver foo.spicy; printf '\377\377' | spicy-driver foo.spicy
# printf '\377\377' | spicy-driver foo.spicy
[$a=(not set), $b=[$b=65535]]
4 changes: 2 additions & 2 deletions doc/programming/examples/_parse-switch.spicy.output
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Automatically generated; do not edit. -- <HASH> printf 'A\01' | spicy-driver %INPUT; printf 'B\01\02' | spicy-driver %INPUT/printf 'A\01' | spicy-driver %INPUT; printf 'B\01\02' | spicy-driver %INPUT/False
# printf 'A\01' | spicy-driver foo.spicy; printf 'B\01\02' | spicy-driver foo.spicy
# printf 'A\01' | spicy-driver foo.spicy
[$x=b"A", $a8=1, $a16=(not set), $a32=(not set)]

# printf 'A\01' | spicy-driver foo.spicy; printf 'B\01\02' | spicy-driver foo.spicy
# printf 'B\01\02' | spicy-driver foo.spicy
[$x=b"B", $a8=(not set), $a16=258, $a32=(not set)]
2 changes: 1 addition & 1 deletion doc/programming/examples/_parse-unit-params.spicy.output
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Automatically generated; do not edit. -- <HASH> printf '\01\02' | spicy-driver %INPUT/printf '\01\02' | spicy-driver %INPUT/False
# printf '\01\02' | spicy-driver foo.spicy
"Spicy": 1
Spicy: 1
[$y=[$x=1]]
2 changes: 1 addition & 1 deletion doc/programming/examples/_unit-params.spicy.output
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Automatically generated; do not edit. -- <HASH> printf '\05' | spicy-driver %INPUT/printf '\05' | spicy-driver %INPUT/False
# printf '\05' | spicy-driver foo.spicy
"My multiplied integer": 25
My multiplied integer: 25
10 changes: 8 additions & 2 deletions doc/scripts/spicy.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,10 @@ def update(self, source, destination, cmd):
all_good = True
first = True

show_as = []
if self.show_as:
show_as = self.show_as.split(";")

for one_cmd in cmd.split(";"):
one_cmd = one_cmd.strip()

Expand Down Expand Up @@ -418,12 +422,14 @@ def update(self, source, destination, cmd):
out = open(destination, "ab")
out.write(b"\n")

if self.show_as:
one_cmd = "# %s\n" % self.show_as
if show_as:
one_cmd = "# %s\n" % show_as[0].strip()
one_cmd = one_cmd.replace("%INPUT", self.show_with)
output = output.replace(
source.encode(), self.show_with.encode())
out.write(one_cmd.encode())
show_as = show_as[1:]

out.write(output)
out.close()
first = False
Expand Down

0 comments on commit f4b9f4b

Please sign in to comment.