Fixed console input, Left works now to load files
This commit is contained in:
+18
-4
@@ -1,13 +1,27 @@
|
||||
|
||||
use fmt;
|
||||
|
||||
export fn console_input(c: u8, ctype: u8, state: *uxn) (done | error) = {
|
||||
state.dev[0x12] = c;
|
||||
state.dev[0x17] = ctype;
|
||||
if(state.console_vector != 0){
|
||||
// fmt::println("Evaluating Console Vector")!;
|
||||
uxn_eval(state.console_vector, state)?;
|
||||
// fmt::println("Done Evaluating Console Vector")!;
|
||||
// fmt::printfln("Evaluating Console Vector ctype: {:x} value: {:x}",ctype,c)!;
|
||||
match(uxn_eval(state.console_vector, state)){
|
||||
case done =>
|
||||
state.dev[0x12] = 0;
|
||||
state.dev[0x17] = 0;
|
||||
return done;
|
||||
case let err: error =>
|
||||
state.dev[0x12] = 0;
|
||||
state.dev[0x17] = 0;
|
||||
return err;
|
||||
case =>
|
||||
state.dev[0x12] = 0;
|
||||
state.dev[0x17] = 0;
|
||||
return done;
|
||||
};
|
||||
}; //TODO implement eval
|
||||
state.dev[0x12] = 0;
|
||||
state.dev[0x17] = 0;
|
||||
return done;
|
||||
};
|
||||
|
||||
|
||||
+43
@@ -952,5 +952,48 @@ export fn uxn_init(path: str) ( *uxn | error ) = {
|
||||
};
|
||||
export fn uxn_reset(state: *uxn) void = {
|
||||
state.running = true;
|
||||
const args = os::args[2..];
|
||||
const argcount = len(args): u8;
|
||||
if(argcount > 0){
|
||||
state.dev[0x17] = 1;
|
||||
}else {
|
||||
state.dev[0x17] = 0;
|
||||
};
|
||||
uxn_eval(reset_vector,state)!;
|
||||
state.dev[0x17] = 0;
|
||||
};
|
||||
|
||||
export fn uxn_console_argument(state: *uxn) void = {
|
||||
// fmt::printf("Evaluating console arguments")!;
|
||||
let args = os::args[2..];
|
||||
let i: u8 = 0;
|
||||
let argcount = len(args): u8;
|
||||
for (let arg .. args){
|
||||
// fmt::println("Console input args")!;
|
||||
for(let char: u8 .. strings::toutf8(arg)){
|
||||
// fmt::printfln("Console input arg char: {}", char: rune)!;
|
||||
match (console_input(char,2,state)) {
|
||||
case done =>
|
||||
yield done;
|
||||
case let val: u8 =>
|
||||
fmt::fatalf("Unhandled Opcode: {:x}", val);
|
||||
case =>
|
||||
yield done;
|
||||
};
|
||||
};
|
||||
let ctype: u8 = if(i == (argcount - 1)){
|
||||
yield 4;
|
||||
} else {
|
||||
yield 3;
|
||||
};
|
||||
match (console_input('\n',ctype,state)) {
|
||||
case done =>
|
||||
yield done;
|
||||
case let val: u8 =>
|
||||
fmt::fatalf("Unhandled Opcode: {:x}", val);
|
||||
case =>
|
||||
yield done;
|
||||
};
|
||||
i+=1; //TODO using i here seems inelegant
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user