Compare commits

..

No commits in common. "f9a7b4d2de3c92b27d57b782c5f7dca032995857" and "ef266f381190efeb1c45224a61981bd4830966ff" have entirely different histories.

5 changed files with 7 additions and 10 deletions

View file

@ -8,7 +8,7 @@ func main { mega | with args ;
catch { catch {
" > " print readln dyn-read exec2 "\n" print " > " print readln dyn-read exec2 "\n" print
} }
{ with err ; with { with err ;
err:message dup null eq if { err:message dup null eq if {
pop pop
"Uncaught error." "Uncaught error."

View file

@ -179,10 +179,8 @@ fn read_block(str_words: &[String], isfn: bool) -> Result<(Option<u32>, Words, u
types.push(str_words[i].to_owned()); types.push(str_words[i].to_owned());
i += 1; i += 1;
} }
println!("{} {}", str_words[i], str_words[i+1]);
let blk = read_block(&str_words[i + 1..], false)?; let blk = read_block(&str_words[i + 1..], false)?;
i += 2 + blk.2; i += 1 + blk.2;
println!("{} {}", str_words[i], str_words[i+1]);
let ctch = read_block(&str_words[i + 1..], false)?; let ctch = read_block(&str_words[i + 1..], false)?;
i += 1 + ctch.2; i += 1 + ctch.2;
words.push(Word::Key(Keyword::Catch(types, blk.1, ctch.1))) words.push(Word::Key(Keyword::Catch(types, blk.1, ctch.1)))

View file

@ -22,9 +22,6 @@ fn main() {
} }
println!("Embedding source..."); println!("Embedding source...");
} }
else {
builder.set_name(file[..file.rfind('.').unwrap_or(file.len())].to_owned());
}
builder.add_source(file.to_owned(), data.to_owned()); builder.add_source(file.to_owned(), data.to_owned());
if build_only { if build_only {
println!("Preparing rust code..."); println!("Preparing rust code...");

View file

@ -472,7 +472,8 @@ func call-main-on-file { | with file ;
"@" file concat import "@" file concat import
update-types update-types
argv main exit argv main exit
} { with err ; }
with { with err ;
err:message dup null eq if { err:message dup null eq if {
pop pop
"Uncaught error." "Uncaught error."

View file

@ -120,7 +120,8 @@ func main { int | with args ;
"testing http" println "testing http" println
def req "tudbut.de" 81 "GET" "/spltest" Request:new =req def req "tudbut.de" 81 "GET" "/spltest" Request:new =req
req:send:body _str println req:send:body _str println
} { with e ; }
with { with e ;
e:message println e:message println
"it seems the internet is not available" println "it seems the internet is not available" println
} }
@ -135,7 +136,7 @@ func main { int | with args ;
catch { catch {
"heya" throw "heya" throw
} { with e ; } with { with e ;
e:message println e:message println
} }
"" println "" println