mii/encrypt
1
0
Fork 0
mirror of https://github.com/mii443/encrypt.git synced 2025-08-22 23:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

ローカル関数の引数対応

Browse Source
This commit is contained in:
Masato Imai
2022-07-25 14:52:18 +09:00
parent 78f923360f
commit 24336a1cdb
2 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client.gpsl
View File

@ -1,12 +1,14 @@
#[server(ip = "172.25.5.189:8080")] #[server(ip = "172.25.5.189:8080")]
fn encrypt_add(a: eep, b: eep) { fn encrypt_add(a: eep, b: eep) {
print("a: ") println("a: " + a)
println(a) println("b: " + b)
print("b: ")
println(b)
return a + b return a + b
} }
fn add(a: num, b: num) {
return a + b;
}
fn main() { fn main() {
print("Input a: ") print("Input a: ")
let a = to_u512(read_line()) let a = to_u512(read_line())
@ -14,7 +16,7 @@ fn main() {
print("Input b: ") print("Input b: ")
let b = to_u512(read_line()) let b = to_u512(read_line())
println("a: " + a); println("テスト");
let enc_a = encrypt(a) let enc_a = encrypt(a)
let enc_b = encrypt(b) let enc_b = encrypt(b)
@ -23,3 +25,4 @@ fn main() {
println(decrypt(enc_res)) println(decrypt(enc_res))
} }

71
src/gpsl/vm/gpsl.rs
View File

@ -174,7 +174,16 @@ impl GPSL {
let function_args = function.1.extract_function_args(); let function_args = function.1.extract_function_args();
let mut args: HashMap<String, Variable> = HashMap::new(); let mut args: HashMap<String, Variable> = HashMap::new();
for (i, arg_name) in function_args.0.iter().enumerate() { for (i, arg_name) in function_args.0.iter().enumerate() {
args.insert(arg_name.clone(), args_value[i].clone()); if function_args.1[i] == args_value[i].get_type() {
args.insert(arg_name.clone(), args_value[i].clone());
} else {
return Err(format!(
"Argument {} type mismatch: {} != {}",
arg_name,
function_args.1[i],
args_value[i].get_type()
));
}
} }
let server_function_call = serde_json::to_string(&ServerFunctionCall { let server_function_call = serde_json::to_string(&ServerFunctionCall {
@ -216,20 +225,47 @@ impl GPSL {
functions.contains_key(&function_name) functions.contains_key(&function_name)
); );
if functions.contains_key(&function_name) { if functions.contains_key(&function_name) {
if let Node::Function { body, .. } = &*(functions[&function_name]) { if let Node::Function {
body,
args_name,
args_type,
..
} = &*(functions[&function_name])
{
let block = {
let blocks = self.blocks.clone();
blocks.front().unwrap().clone()
};
let mut args: HashMap<String, LocalVariable> = HashMap::new();
for (i, name) in args_name.iter().enumerate() {
if args_type[i] == args_value[i].get_type() {
args.insert(
name.clone(),
LocalVariable {
name: name.clone(),
value: Some(args_value[i].clone()),
status: VariableStatus::default(),
},
);
} else {
return Err(format!(
"Argument {} type mismatch: {} != {}",
name,
args_type[i],
args_value[i].get_type()
));
}
}
self.blocks.push_front(Block {
accept: block.accept.clone(),
reject: block.reject.clone(),
variables: args,
is_split: true,
});
for program in body { for program in body {
let block = {
let blocks = self.blocks.clone();
blocks.front().unwrap().clone()
};
self.blocks.push_front(Block {
accept: block.accept.clone(),
reject: block.reject.clone(),
variables: HashMap::new(),
is_split: true,
});
let res = self.evaluate(Box::new(*program.clone())); let res = self.evaluate(Box::new(*program.clone()));
if let Ok(Some(res)) = res { if let Ok(Some(res)) = res {
@ -595,7 +631,8 @@ impl GPSL {
value, value,
} => { } => {
if let Some(value) = value { if let Some(value) = value {
if let Ok(Some(value)) = self.evaluate(value) { let value = self.evaluate(value);
if let Ok(Some(value)) = value.clone() {
if value.get_type() == var_type.unwrap_or(value.get_type()) { if value.get_type() == var_type.unwrap_or(value.get_type()) {
self.blocks.front_mut().unwrap().variables.insert( self.blocks.front_mut().unwrap().variables.insert(
name.clone(), name.clone(),
@ -609,8 +646,10 @@ impl GPSL {
} else { } else {
return Err(String::from("Type mismatch.")); return Err(String::from("Type mismatch."));
} }
} else if let Err(err) = value {
return Err(err);
} else { } else {
return Err(String::from("Cannot evaluate value.")); return Err(String::from("Unexpected error in DEFINE."));
} }
} else { } else {
let value = match &*var_type.unwrap() { let value = match &*var_type.unwrap() {