From d16add7e83a83ab94a493f2ea7d9076a97a9ad83 Mon Sep 17 00:00:00 2001
From: Masato Imai <mi.imai8080@gmail.com>
Date: Tue, 13 Sep 2022 12:22:50 +0900
Subject: [PATCH] demo

---
 client.gpsl           | 4 ++--
 ns.sh                 | 3 +++
 s.sh                  | 3 +++
 src/gpsl/gpsl_type.rs | 2 +-
 src/gpsl/vm/gpsl.rs   | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100755 ns.sh
 create mode 100755 s.sh

diff --git a/client.gpsl b/client.gpsl
index effc542..70c7871 100644
--- a/client.gpsl
+++ b/client.gpsl
@@ -1,4 +1,4 @@
-#[server(ip = "localhost:8080")]
+#[server(ip = "172.25.5.189:8080")]
 fn encrypt_add(a: Vec<eep>) $(accept[StdOut]) {
     println("");
     println("集計開始");
@@ -45,7 +45,7 @@ fn main() {
 
     println("復号します...");
     let result = decrypt(r);
-    println("賛成者の合計は" + result + "です。");
+    println("賛成の合計は" + result + "です。");
     write("result.txt", result);
 }
 
diff --git a/ns.sh b/ns.sh
new file mode 100755
index 0000000..35b88c9
--- /dev/null
+++ b/ns.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "/home/imai/work/encrypt"
+/home/imai/.cargo/bin/cargo run --bin encrypt --release -- client.gpsl
\ No newline at end of file
diff --git a/s.sh b/s.sh
new file mode 100755
index 0000000..46488fe
--- /dev/null
+++ b/s.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+cd "/home/imai/work/encrypt"
+/home/imai/.cargo/bin/cargo run --bin encrypt --release -- client.gpsl
\ No newline at end of file
diff --git a/src/gpsl/gpsl_type.rs b/src/gpsl/gpsl_type.rs
index 5bc2f37..4262646 100644
--- a/src/gpsl/gpsl_type.rs
+++ b/src/gpsl/gpsl_type.rs
@@ -35,7 +35,7 @@ impl GPSLType {
         let mut main = String::new();
         let mut read_count = 0;
         for x in s.chars() {
-            if !x.is_alphabetic() && x != '<' && x != '>' && x != ',' {
+            if !x.is_alphanumeric() && x != '<' && x != '>' && x != ',' {
                 return Err(format!("Invalid character: {}", x));
             }
             if x != '<' && x != '>' && x != ',' {
diff --git a/src/gpsl/vm/gpsl.rs b/src/gpsl/vm/gpsl.rs
index cca84c3..b6f726c 100644
--- a/src/gpsl/vm/gpsl.rs
+++ b/src/gpsl/vm/gpsl.rs
@@ -328,7 +328,7 @@ impl GPSL {
                         match *(lhs.clone()) {
                             Node::Lvar { value, index } => {
                                 if let Some(index) = index {
-                                    let mut val =
+                                    let val =
                                         self.get_local_var_mut(&value).unwrap().value.clone();
                                     match val {
                                         Some(Variable::Vec {
@@ -544,7 +544,7 @@ impl GPSL {
                 if let Some(index) = index {
                     let val = self.get_local_var_mut(&value).unwrap().clone();
                     match val.value {
-                        Some(Variable::Vec { value, gpsl_type }) => {
+                        Some(Variable::Vec { value, .. }) => {
                             return Ok(Some(
                                 value[self
                                     .evaluate(index)