🦄 refactor: Rename ast_token to token

caoccao · Mar 25, 2024 · c1fb105 · c1fb105
1 parent 76d60c7
commit c1fb105
Show file tree

Hide file tree

Showing 15 changed files with 927 additions and 927 deletions.
diff --git a/rust/src/enums.rs b/rust/src/enums.rs
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -25,7 +25,7 @@ use std::ffi::c_void;
 use std::ptr::null_mut;
 
 pub mod ast_utils;
-pub mod ast_token_utils;
+pub mod token_utils;
 pub mod converter;
 pub mod core;
 pub mod enums;
@@ -41,7 +41,7 @@ pub extern "system" fn JNI_OnLoad<'local>(java_vm: JavaVM, _: c_void) -> jint {
   debug_println!("JNI_OnLoad()");
   let mut env = java_vm.get_env().expect("Cannot get JNI env");
   ast_utils::init(&mut env);
-  ast_token_utils::init(&mut env);
+  token_utils::init(&mut env);
   enums::init(&mut env);
   error::init(&mut env);
   jni_utils::init(&mut env);

diff --git a/rust/src/outputs.rs b/rust/src/outputs.rs
@@ -26,7 +26,7 @@ use jni::JNIEnv;
 use std::ptr::null_mut;
 use std::sync::Arc;
 
-use crate::ast_token_utils;
+use crate::token_utils;
 use crate::ast_utils;
 use crate::converter;
 use crate::enums::*;
@@ -81,7 +81,7 @@ impl JavaParseOutput {
     let source_text = jvalue {
       l: converter::string_to_jstring(env, &parse_output.source_text).as_raw(),
     };
-    let tokens = ast_token_utils::token_and_spans_to_java_list(
+    let tokens = token_utils::token_and_spans_to_java_list(
       env,
       &byte_to_index_map,
       &parse_output.source_text.to_string(),
@@ -156,7 +156,7 @@ impl JavaTranspileOutput {
     let source_text = jvalue {
       l: converter::string_to_jstring(env, &transpile_output.parse_output.source_text).as_raw(),
     };
-    let tokens = ast_token_utils::token_and_spans_to_java_list(
+    let tokens = token_utils::token_and_spans_to_java_list(
       env,
       &byte_to_index_map,
       &transpile_output.parse_output.source_text.to_string(),

diff --git a/rust/src/ast_token_utils.rs → rust/src/token_utils.rs b/rust/src/ast_token_utils.rs → rust/src/token_utils.rs
diff --git a/src/main/java/com/caoccao/javet/swc4j/enums/Swc4jAstTokenType.java b/src/main/java/com/caoccao/javet/swc4j/enums/Swc4jAstTokenType.java
diff --git a/...vet/swc4j/enums/Swc4jAstTokenSubType.java → .../javet/swc4j/enums/Swc4jTokenSubType.java b/...vet/swc4j/enums/Swc4jAstTokenSubType.java → .../javet/swc4j/enums/Swc4jTokenSubType.java
@@ -16,7 +16,7 @@
 
 package com.caoccao.javet.swc4j.enums;
 
-public enum Swc4jAstTokenSubType {
+public enum Swc4jTokenSubType {
     AssignOperator,
     BinaryOperator,
     GenericOperator,