comparing 04dd4dc3e5b5e1d19b71f238650a7b60d031109f and main on drubery.com/icfp2007

+1 -1

.gitignore

···

       1
       1
        
       task/endo.dna

     

       2
       2
        
       .tup/

     

       3
       3
       -
       out/
     

       3
       3
       +
       /out/

-13

Tupfile

···

       1
       1
       -
       RUSTC_FLAGS= --edition=2024 --crate-type bin --emit=link -C opt-level=3 -C embed-bitcode=no --check-cfg 'cfg (docsrs,test)' --check-cfg 'cfg(feature, values())' --out-dir out/bin -C strip=debuginfo -L dependency=out/bin

     

       2
       2
       -
       

     

       3
       3
       -
       : dna2rna/src/*.rs |> rustc --crate-name dna2rna dna2rna/src/main.rs $(RUSTC_FLAGS) |> out/bin/dna2rna

     

       4
       4
       -
       : rna2bmp/src/*.rs |> rustc --crate-name rna2bmp rna2bmp/src/main.rs $(RUSTC_FLAGS) |> out/bin/rna2bmp

     

       5
       5
       -
       : asm2dna/src/*.rs |> rustc --crate-name asm2dna asm2dna/src/main.rs $(RUSTC_FLAGS) |> out/bin/asm2dna

     

       6
       6
       -
       

     

       7
       7
       -
       : foreach asm/*.asm | out/bin/asm2dna |> ./out/bin/asm2dna %f out/dna/%B.dna |> out/dna/%B.dna

     

       8
       8
       -
       

     

       9
       9
       -
       : foreach out/dna/*.dna | out/bin/dna2rna |> ./out/bin/dna2rna %f task/endo.dna out/rna/%B.rna |> out/rna/%B.rna

     

       10
       10
       -
       

     

       11
       11
       -
       : foreach out/rna/*.rna | out/bin/rna2bmp |> ./out/bin/rna2bmp %f out/bmp/%B.bmp |> out/bmp/%B.bmp

     

       12
       12
       -
       

     

       13
       13
       -
       : foreach out/bmp/*.bmp |> convert %f out/png/%B.png |> out/png/%B.png

+64

Tupfile.lua

···

       1
       1
       +
       function define_rust_rule(name, type, deps)

     

       2
       2
       +
           local inputs = {}

     

       3
       3
       +
           for _, input in ipairs(tup.glob(name .. "/src/*.rs")) do

     

       4
       4
       +
       	table.insert(inputs, input)

     

       5
       5
       +
           end

     

       6
       6
       +
       

     

       7
       7
       +
           local input_rs

     

       8
       8
       +
           local output

     

       9
       9
       +
           if type == "bin" then

     

       10
       10
       +
               input_rs = name .. "/src/main.rs"

     

       11
       11
       +
       	output = "out/bin/" .. name

     

       12
       12
       +
           else

     

       13
       13
       +
               input_rs = name .. "/src/lib.rs"

     

       14
       14
       +
       	output = "out/lib/lib" .. name .. ".rlib"

     

       15
       15
       +
           end

     

       16
       16
       +
           

     

       17
       17
       +
           local externs = {}

     

       18
       18
       +
           for _, dep in ipairs(deps) do

     

       19
       19
       +
               local rlib = "out/lib/lib" .. dep .. ".rlib"

     

       20
       20
       +
               table.insert(inputs, rlib)

     

       21
       21
       +
       	table.insert(externs, "--extern " .. dep .. "=" .. rlib)

     

       22
       22
       +
           end

     

       23
       23
       +
       

     

       24
       24
       +
           local flags = "--edition=2024 -C opt-level=3 -C embed-bitcode=no -C strip=debuginfo --emit=link"

     

       25
       25
       +
           local command = "rustc --crate-name " .. name .. " --crate-type=" .. type .. " " .. input_rs .. " -o %o " .. table.concat(externs, " ") .. " " .. flags

     

       26
       26
       +
           tup.definerule{inputs = inputs, command = command, outputs = {output}}

     

       27
       27
       +
       end

     

       28
       28
       +
       

     

       29
       29
       +
       define_rust_rule("dna_parsing", "lib", {})

     

       30
       30
       +
       define_rust_rule("dna2rna", "bin", {"dna_parsing"})

     

       31
       31
       +
       define_rust_rule("disassembler", "bin", {"dna_parsing"})

     

       32
       32
       +
       define_rust_rule("rna2bmp", "bin", {})

     

       33
       33
       +
       define_rust_rule("asm2dna", "bin", {})

     

       34
       34
       +
       

     

       35
       35
       +
       local asm = tup.glob("asm/*.asm")

     

       36
       36
       +
       asm.extra_inputs = {"out/bin/asm2dna"}

     

       37
       37
       +
       tup.foreach_rule(

     

       38
       38
       +
         asm,

     

       39
       39
       +
         "./out/bin/asm2dna %f %o",

     

       40
       40
       +
         {"out/dna/%B.dna"}

     

       41
       41
       +
       )

     

       42
       42
       +
       

     

       43
       43
       +
       local dna = tup.glob("out/dna/*.dna")

     

       44
       44
       +
       dna.extra_inputs = {"out/bin/dna2rna"}

     

       45
       45
       +
       tup.foreach_rule(

     

       46
       46
       +
         dna,

     

       47
       47
       +
         "./out/bin/dna2rna %f task/endo.dna %o",

     

       48
       48
       +
         {"out/rna/%B.rna"}

     

       49
       49
       +
       )

     

       50
       50
       +
       

     

       51
       51
       +
       local rna = tup.glob("out/rna/*.rna")

     

       52
       52
       +
       rna.extra_inputs = {"out/bin/rna2bmp"}

     

       53
       53
       +
       tup.foreach_rule(

     

       54
       54
       +
         rna,

     

       55
       55
       +
         "./out/bin/rna2bmp %f %o",

     

       56
       56
       +
         {"out/bmp/%B.bmp"}

     

       57
       57
       +
       )

     

       58
       58
       +
       

     

       59
       59
       +
       local bmp = tup.glob("out/bmp/*.bmp")

     

       60
       60
       +
       tup.foreach_rule(

     

       61
       61
       +
         bmp,

     

       62
       62
       +
         "convert %f %o",

     

       63
       63
       +
         {"out/png/%B.png"}

     

       64
       64
       +
       )

+1

disassembler/.dir-locals.el

···

       1
       1
       +
       ((nil . ((default-directory . "~/repos/endo/disassembler/"))))

+14

disassembler/Cargo.lock

···

       1
       1
       +
       # This file is automatically @generated by Cargo.

     

       2
       2
       +
       # It is not intended for manual editing.

     

       3
       3
       +
       version = 4

     

       4
       4
       +
       

     

       5
       5
       +
       [[package]]

     

       6
       6
       +
       name = "disassembler"

     

       7
       7
       +
       version = "0.1.0"

     

       8
       8
       +
       dependencies = [

     

       9
       9
       +
        "dna_parsing",

     

       10
       10
       +
       ]

     

       11
       11
       +
       

     

       12
       12
       +
       [[package]]

     

       13
       13
       +
       name = "dna_parsing"

     

       14
       14
       +
       version = "0.1.0"

+7

disassembler/Cargo.toml

···

       1
       1
       +
       [package]

     

       2
       2
       +
       name = "disassembler"

     

       3
       3
       +
       version = "0.1.0"

     

       4
       4
       +
       edition = "2024"

     

       5
       5
       +
       

     

       6
       6
       +
       [dependencies]

     

       7
       7
       +
       dna_parsing = { path = "../dna_parsing" }

+69

disassembler/src/main.rs

···

       1
       1
       +
       use dna_parsing::base::Base;

     

       2
       2
       +
       use dna_parsing::parser::Parser;

     

       3
       3
       +
       use std::env;

     

       4
       4
       +
       use std::fs;

     

       5
       5
       +
       use std::io;

     

       6
       6
       +
       use std::io::Write;

     

       7
       7
       +
       

     

       8
       8
       +
       fn main() {

     

       9
       9
       +
           let args: Vec<String> = env::args().collect();

     

       10
       10
       +
           if args.len() < 3 {

     

       11
       11
       +
               println!("Usage: {} <dna file> <offset>", args[0]);

     

       12
       12
       +
               return;

     

       13
       13
       +
           }

     

       14
       14
       +
       

     

       15
       15
       +
           let Ok(dna) = fs::read_to_string(&args[1]) else {

     

       16
       16
       +
               println!("Failed to read dna file at {}", &args[1]);

     

       17
       17
       +
               return;

     

       18
       18
       +
           };

     

       19
       19
       +
           let Ok(offset): Result<usize, _> = args[2].parse() else {

     

       20
       20
       +
               println!("Failed to parse offset {}", &args[2]);

     

       21
       21
       +
               return;

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           let mut index = 0;

     

       25
       25
       +
           loop {

     

       26
       26
       +
               print!("> ");

     

       27
       27
       +
               let _ = io::stdout().flush();

     

       28
       28
       +
               let mut line = String::new();

     

       29
       29
       +
               if !io::stdin().read_line(&mut line).is_ok() {

     

       30
       30
       +
                   println!("Failed to read response line");

     

       31
       31
       +
                   return;

     

       32
       32
       +
               }

     

       33
       33
       +
               line = line.trim().to_string();

     

       34
       34
       +
               if !line.is_empty() {

     

       35
       35
       +
                   let Ok(new_index): Result<usize, _> = line.parse() else {

     

       36
       36
       +
                       println!("Failed to parse {}", line);

     

       37
       37
       +
                       continue;

     

       38
       38
       +
                   };

     

       39
       39
       +
                   index = new_index;

     

       40
       40
       +
               }

     

       41
       41
       +
       

     

       42
       42
       +
               let mut parser = Parser::new(

     

       43
       43
       +
                   dna[index + offset..]

     

       44
       44
       +
                       .chars()

     

       45
       45
       +
                       .filter_map(|c| Base::from_char(c)),

     

       46
       46
       +
               );

     

       47
       47
       +
               let mut rna = Vec::new();

     

       48
       48
       +
               let Some(pattern) = parser.pattern(&mut rna) else {

     

       49
       49
       +
                   println!("Failed to parse pattern");

     

       50
       50
       +
                   continue;

     

       51
       51
       +
               };

     

       52
       52
       +
               let Some(template) = parser.template(&mut rna) else {

     

       53
       53
       +
                   println!("Failed to parse template");

     

       54
       54
       +
                   continue;

     

       55
       55
       +
               };

     

       56
       56
       +
       

     

       57
       57
       +
               if !rna.is_empty() {

     

       58
       58
       +
                   println!("RNA output:");

     

       59
       59
       +
                   for r in rna.iter() {

     

       60
       60
       +
                       let rna_str: String = r.iter().map(|b| b.to_char()).collect();

     

       61
       61
       +
                       println!("    {}", rna_str);

     

       62
       62
       +
                   }

     

       63
       63
       +
                   println!();

     

       64
       64
       +
               }

     

       65
       65
       +
               println!("{} ; {} ;", pattern, template);

     

       66
       66
       +
               index += parser.index();

     

       67
       67
       +
               println!("Now at: {}", index);

     

       68
       68
       +
           }

     

       69
       69
       +
       }

-2

dna2rna/src/match_replace.rs

···

       123
       123
        
           let template = parser.template(rna)?;

     

       124
       124
        
           let index = parser.index();

     

       125
       125
        
       

     

       126
       126
       -
           println!("{} ; {} ;", &pattern, &template);

     

       127
       127
       -
       

     

       128
       126
        
           if let Some(matched) = do_match(&dna, index, pattern) {

     

       129
       127
        
               let mut replace = DnaRef::new();

     

       130
       128
        
               for t in template.into_iter() {

+20

generate_crate_rule.py

···

       1
       1
       +
       import sys

     

       2
       2
       +
       

     

       3
       3
       +
       # 'lib' or 'bin'

     

       4
       4
       +
       crate_type = sys.argv[1]

     

       5
       5
       +
       crate_name = sys.argv[2]

     

       6
       6
       +
       if crate_type == "bin":

     

       7
       7
       +
           input_rs = f"{crate_name}/src/main.rs"

     

       8
       8
       +
           outfile = f"out/bin/{crate_name}"

     

       9
       9
       +
       else:

     

       10
       10
       +
           input_rs = f"{crate_name}/src/lib.rs"

     

       11
       11
       +
           outfile = f"out/lib/lib{crate_name}.rlib"

     

       12
       12
       +
       

     

       13
       13
       +
       dep_crates = sys.argv[3:]

     

       14
       14
       +
       dep_inputs = " ".join([f"out/lib/lib{dep}.rlib" for dep in dep_crates])

     

       15
       15
       +
       externs = " ".join([f"--extern {dep}=out/lib/lib{dep}.rlib" for dep in dep_crates])

     

       16
       16
       +
       

     

       17
       17
       +
       flags = "--edition=2024 -C opt-level=3 -C embed-bitcode=no -C strip=debuginfo --emit=link"

     

       18
       18
       +
       

     

       19
       19
       +
       inputs = f"{crate_name}/src/*.rs"

     

       20
       20
       +
       print(f": {crate_name}/src/*.rs {dep_inputs} |> rustc --crate-name {crate_name} --crate-type={crate_type} {input_rs} -o %o {externs} {flags} |> {outfile}")

Compare changes