From b75329a85e5c57e35bf9da01582ea8b198bbb6ac Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Fri, 27 Jul 2018 21:42:01 +0100 Subject: [PATCH] Match any number returned by (load) in lisp.tcl. Modifying some of the sources has changed these from the values previously in lisp.tcl and build.tcl; it now matches any string of numbers on a line by itself (optionally with "." and spaces afterwards). --- build/build.tcl | 19 ++++++++++++------- build/lisp.tcl | 36 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/build/build.tcl b/build/build.tcl index 8b0c8a76..50e53e70 100644 --- a/build/build.tcl +++ b/build/build.tcl @@ -72,17 +72,22 @@ proc ip_address {string} { format "%o" $x } +# Respond to the output from (load ...). +proc respond_load { r } { + expect -re {[\r\n][0-9]+\.? *[\r\n]} + type $r +} + proc build_macsyma_portion {} { respond "*" "complr\013" respond "_" "\007" respond "*" "(load \"liblsp;iota\")" - respond "274630" "(load \"maxtul;docgen\")" - respond "300064" "(load \"maxtul;mcl\")" - respond "302627" "(load \"maxdoc;mcldat\")" - respond "302627" "(load \"libmax;module\")" - respond "303363" "(load \"libmax;maxmac\")" - expect "307173" - type "(todo)" + respond_load "(load \"maxtul;docgen\")" + respond_load "(load \"maxtul;mcl\")" + respond_load "(load \"maxdoc;mcldat\")" + respond_load "(load \"libmax;module\")" + respond_load "(load \"libmax;maxmac\")" + respond_load "(todo)" expect { ") \r" { } diff --git a/build/lisp.tcl b/build/lisp.tcl index 6840a4f0..1b47ee5e 100644 --- a/build/lisp.tcl +++ b/build/lisp.tcl @@ -272,7 +272,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;mforma\r" respond "_" "\032" type ":kill\r" @@ -280,7 +280,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;maxmac\r" respond "_" "\032" type ":kill\r" @@ -288,7 +288,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;mforma\r" respond "_" "\032" type ":kill\r" @@ -296,7 +296,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;maxmac\r" respond "_" "\032" type ":kill\r" @@ -316,7 +316,7 @@ respond "*" ":link libmax;lusets fasl,liblsp;\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;ermsgx\r" respond "_" "libmax;ermsgc\r" respond "_" "z;fildir\r" @@ -377,7 +377,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;define\r" respond "_" "\032" type ":kill\r" @@ -392,7 +392,7 @@ respond "*" ":link macsym;mdefun fasl,libmax;\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "macsym;ermsgm_maxsrc;ermsgm\r" respond "_" "maxdoc;tdcl\r" respond "_" "rlb;bitmac\r" @@ -436,7 +436,7 @@ respond "*" "(quit)" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;mhayat_rat;mhayat\r" respond "_" "\032" type ":kill\r" @@ -444,7 +444,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;ratmac_rat;ratmac\r" respond "_" "\032" type ":kill\r" @@ -456,7 +456,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((libmax) module))" -respond "274534" "(maklap)" +respond_load "(maklap)" respond "_" "libmax;mforma\r" respond "_" "\032" type ":kill\r" @@ -465,7 +465,7 @@ respond "*" "complr\013" respond "_" "\007" respond "*" "(setq pure t)" respond "T" "(load \"liblsp;sharab\")" -respond "276437" "(load \"maxtul;mcldmp (init)\")" +respond_load "(load \"maxtul;mcldmp (init)\")" respond "T" "\007" respond "*" "(dump-mcl 32. t)" respond "File name->" "\002" @@ -529,11 +529,11 @@ respond "*" ":move macsym;macsym ntags,macsym tags\r" respond "*" "aljabr\033\023" respond "*" ":lisp\r" type "(load \"lisp;mlsub\")" -respond "124656" "(load \"libmax;module\")" -respond "133046" "(load \"libmax;define\")" -respond "135417" "(load \"libmax;maxmac\")" -respond "141227" "(load \"libmax;displm\")" -respond "142040" "(load \"aljabr;loader\")" +respond_load "(load \"libmax;module\")" +respond_load "(load \"libmax;define\")" +respond_load "(load \"libmax;maxmac\")" +respond_load "(load \"libmax;displm\")" +respond_load "(load \"aljabr;loader\")" respond "T" "(loader 1000)" respond "(C1)" "quit();" @@ -764,7 +764,7 @@ type ":kill\r" respond "*" "complr\013" respond "_" "\007" respond "*" "(load '((lisp) cgol fasl))" -respond "312654" "(maklap)" +respond_load "(maklap)" respond "_" "liblsp;_pratt;cgprin\r" respond "_" "\032" type ":kill\r" @@ -862,7 +862,7 @@ type ":kill\r" respond "*" "l\013" respond "Alloc?" "n" respond "*" "(load '((games) animal fasl))" -respond "53694." "(dump '((games) ts animal))" +respond_load "(dump '((games) ts animal))" expect "KILL" # think