添加对于过长的复杂数字使用十六进制

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mindustry_logic_bang_lang"
-version = "0.14.15"
+version = "0.14.16"
 edition = "2021"
 
 authors = ["A4-Tacks <[email protected]>"]

tools/parser/tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "parser-tests"
-version = "0.1.9"
+version = "0.1.10"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/parser/tests/src/lib.rs

@@ -3898,6 +3898,23 @@ fn const_expr_eval_test() {
         print null;
         "#).unwrap()).compile().unwrap(),
     );
+
+    assert_eq!(
+        CompileMeta::new().compile(parse!(parser, r#"
+        print ($ = 999999+0;);
+        print ($ = 999999+1;);
+        print ($ = -999999 - 0;);
+        print ($ = -999999 - 1;);
+        print ($ = 1 - 1;);
+        "#).unwrap()).compile().unwrap(),
+        CompileMeta::new().compile(parse!(parser, r#"
+        print 999999;
+        print 0xF4240;
+        print -999999;
+        print 0x-F4240;
+        print 0;
+        "#).unwrap()).compile().unwrap(),
+    );
 }
 
 #[test]

tools/syntax/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "syntax"
-version = "0.2.10"
+version = "0.2.11"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

tools/syntax/src/lib.rs

@@ -173,13 +173,30 @@ pub enum Value {
 impl Value {
     pub fn try_eval_const_num_to_var(&self, meta: &CompileMeta) -> Option<Var> {
         if let Some((num, true)) = self.try_eval_const_num(meta) {
+            use std::num::FpCategory as FpC;
             // 仅对复杂数据也就是有效运算后的数据
             return match num.classify() {
-                std::num::FpCategory::Nan => "null".into(),
-                std::num::FpCategory::Infinite
+                FpC::Nan => "null".into(),
+                FpC::Infinite
                 if num.is_sign_negative() => (i64::MIN+1).to_string(),
-                std::num::FpCategory::Infinite => i64::MAX.to_string(),
-                _ => num.to_string(),
+                FpC::Infinite => i64::MAX.to_string(),
+                _ => loop {
+                    let n = num.round() - num;
+                    if let FpC::Zero | FpC::Subnormal = n.classify() {
+                        let rng = i64::MIN as f64..=i64::MAX as f64;
+                        let v = 999999;
+                        if rng.contains(&num) && !(-v..=v).contains(&(num as i64)) {
+                            let num = num.round() as i64;
+                            break if !num.is_negative() {
+                                format!("0x{num:X}")
+                            } else {
+                                let num = -num;
+                                format!("0x-{num:X}")
+                            }
+                        }
+                    }
+                    break num.to_string()
+                },
             }.into()
         } else {
             None