try nix shell

marzipan/src/__init__.py

@@ -1,2 +1,64 @@
+from .util import pkgs, setup_exports, export, rename
+from rich import print
+import click
+
+(__all__, export) = setup_exports()
+export(setup_exports)
+
+def eprint(*args, **kwargs):
+    print(*args, **{"file": pkgs.sys.stderr, **kwargs})
+
+def exc(argv, **kwargs):
+    eprint("$", *argv)
+    command = pkgs.subprocess.run(argv, **kwargs)
+    if command.stdout is not None:
+        return command.stdout.decode("utf-8")
+    return ""
+
+@click.command()
+@click.argument("file")
+@click.argument("log")
+@click.argument("extra_args")
+def run_proverif(file, log, extra_args):
+    return exc(["proverif", "-test", *extra_args, file], stderr=pkgs.sys.stderr)
+
+
+def clean_warnings():
+    pass
+
+
+@click.command()
+@click.argument("prefix")
+@click.argument("mark")
+@click.argument("color")
+@click.argument("text")
+def pretty_output_line(prefix, mark, color, text):
+    colored_prefix = f"[grey42]{prefix}[/grey42]"
+    colored_mark_text = f"[{color}]{mark} {text}[/{color}]"
+    print(colored_prefix, colored_mark_text)
+
+@click.command()
+@click.argument("path")
+def analyze(path):
+    exc([
+        f"{pkgs.pathlib.Path(__file__).resolve().parent}/analyze.sh",
+        path
+    ])
+
+@click.command()
+def clean():
+    click.echo("foo")
+    pass
+
+
+@export
+@rename("main") # Click seems to erase __name__
+@click.group()
 def main():
-    print("Hello World")
+    #pkgs.IPython.embed()
+    pass
+
+main.add_command(analyze)
+main.add_command(clean)
+main.add_command(run_proverif)
+main.add_command(pretty_output_line)

marzipan/src/analyze.sh

@@ -0,0 +1,168 @@
+#!/usr/bin/env bash
+
+exc() {
+  echo >&2 "\$" "$@"
+  "$@"
+}
+
+run_proverif() {
+  #local file; file="$1"; shift
+  #local log; log="$1"; shift
+  #exc proverif -test "${@}" "${file}" 2>&1
+
+  exc rosenpass-marzipan run_proverif "${file}" "${@}"
+}
+
+clean_warnings() {
+   awk '
+      BEGIN {
+        null = "0455290a-50d5-4f28-8008-3d69605c2835"
+        p = null;
+      }
+
+      function pt(arg) {
+        if (arg != null) {
+          print(arg);
+        }
+      }
+      function bod() {
+        if ($0 !~ /^Warning: identifier \w+ rebound.$/) {
+          pt(p);
+          p=$0;
+        } else {
+          p=null;
+        }
+      }
+      { bod(); }
+      END { $0=null; bod(); }
+    '
+}
+
+color_red='\033[0;31m'
+color_green='\033[0;32m'
+color_gray='\033[0;30m'
+color_clear='\033[0m'
+
+checkmark="✔"
+cross="❌"
+
+pretty_output_line() {
+  local prefix; prefix="$1"; shift
+  local mark; mark="$1"; shift
+  local color; color="$1"; shift
+  local text; text="$1"; shift
+  echo -ne "\033[0\r${color_gray}${prefix}${color}${mark} ${text}${color_clear}"
+}
+
+pretty_output() {
+  local file; file="$1"; shift
+  local expected=() descs=()
+
+  # Lemmas are processed first
+  readarray -t -O "${#expected[@]}" expected < <(
+    < "$file" grep -Po '@(lemma)(?=\s+"[^\"]*")' \
+      | sed 's/@lemma/true/')
+  readarray -t -O "${#descs[@]}" descs < <(
+    < "$file" grep -Po '@(lemma)\s+"[^\"]*"' \
+      | sed 's/@\w\+\s\+//; s/"//g')
+
+  # Then regular queries
+  readarray -t -O "${#expected[@]}" expected < <(
+    < "$file" grep -Po '@(query|reachable)(?=\s+"[^\"]*")' \
+      | sed 's/@query/true/; s/@reachable/false/')
+  readarray -t -O "${#descs[@]}" descs < <(
+    < "$file" grep -Po '@(query|reachable)\s+"[^\"]*"' \
+      | sed 's/@\w\+\s\+//; s/"//g')
+
+  local outp ctr res ta tz; ctr=0; res=0; ta="$(date +%s)"
+  while read -r outp; do
+    tz="$(date +%s)"
+    if [[ "${outp}" = "${expected[$ctr]}" ]]; then
+      pretty_output_line "$((tz - ta))s " "${checkmark}" "${color_green}" "${descs[$ctr]}"
+    else
+      res=1
+      pretty_output_line "$((tz - ta))s " "${cross}" "${color_red}" "${descs[$ctr]}"
+    fi
+    echo
+
+    (( ctr += 1 ))
+    ta="${tz}"
+  done
+
+  return "$res"
+}
+
+metaverif() {
+  local file; file="$1"; shift
+  local name; name="$(echo "${file}" | grep -Po '[^/]*(?=\.mpv)')"
+
+  local cpp_prep; cpp_prep="${tmpdir}/${name}.i.pv"
+  exc cpp -P -I"${PWD}/$(dirname "${file}")" "${file}" -o "${cpp_prep}"
+
+  local awk_prep; awk_prep="${tmpdir}/${name}.o.pv"
+  {
+    exc awk -f marzipan/marzipan.awk "${cpp_prep}"
+    echo -e "\nprocess main"
+  } > "${awk_prep}"
+
+  local log; log="${tmpdir}/${name}.log"
+  {
+    run_proverif "${awk_prep}" "$@" \
+      | clean_warnings \
+      | tee "${log}" \
+      | awk '
+          /^RESULT/ {
+            gsub(/\./, "", $NF);
+            print($NF);
+            fflush(stdout);
+          }' \
+      | pretty_output "${cpp_prep}"
+  } || {
+    if ! grep -q "^Verification summary" "${log}"; then
+      echo -ne "\033[0\r"
+      cat "${log}"
+    fi
+  }
+}
+
+analyze() {
+  mkdir -p "${tmpdir}"
+
+  entries=()
+  readarray -t -O "${#entries[@]}" entries < <(
+    find analysis -iname '*.entry.mpv' | sort)
+
+  local entry
+  local procs; procs=()
+  for entry in "${entries[@]}"; do
+    exc metaverif "${entry}" "$@" >&2 & procs+=("$!")
+  done
+
+  for entry in "${procs[@]}"; do
+    exc wait -f "${entry}"
+  done
+}
+
+err_usage() {
+    echo >&1 "USAGE: ${0} analyze PATH"
+    exit 1
+}
+
+main() {
+  set -e -o pipefail
+
+  local cmd="$1"; shift || err_usage
+  local dir="$1"; shift || err_usage
+
+  cd -- "${dir}"
+  tmpdir="target/proverif"
+
+  case "${cmd}" in
+    analyze) analyze ;;
+    clean_warnings) clean_warnings ;;
+    *) err_usage
+  esac
+}
+
+# Do not execute main if sourced
+(return 0 2>/dev/null) || main "$@"

marzipan/src/util.py

@@ -32,6 +32,13 @@ def setup_exports() -> Tuple[List[str], Callable[[T], T]]:
 (__all__, export) = setup_exports()
 export(setup_exports)
 
+@export
+def rename(name: str) -> Callable[[T], T]:
+    def rename_impl(v: T) -> T:
+        v.__name__ = name
+        return v
+    return rename_impl
+
 @export
 def attempt(fn):
     # TODO: Documentation tests