port aarch-specific json_parser to within the aarch module

Author: madhav-madhusoodanan

crates/intrinsic-test/src/aarch/argument.rs

@@ -0,0 +1,42 @@
+use crate::aarch::parser::ArgPrep;
+use crate::argument::{Argument, Constraint};
+use crate::types::IntrinsicType;
+
+impl TryFrom<ArgPrep> for Constraint {
+    type Error = ();
+
+    fn try_from(prep: ArgPrep) -> Result<Self, Self::Error> {
+        let parsed_ints = match prep {
+            ArgPrep::Immediate { min, max } => Ok((min, max)),
+            _ => Err(()),
+        };
+        if let Ok((min, max)) = parsed_ints {
+            if min == max {
+                Ok(Constraint::Equal(min))
+            } else {
+                Ok(Constraint::Range(min..max + 1))
+            }
+        } else {
+            Err(())
+        }
+    }
+}
+
+// TODO: Add FromC named impl for this function.
+impl Argument {
+    pub fn from_c(pos: usize, arg: &str, arg_prep: Option<ArgPrep>) -> Argument {
+        let (ty, var_name) = Self::type_and_name_from_c(arg);
+
+        let ty = IntrinsicType::from_c(ty)
+            .unwrap_or_else(|_| panic!("Failed to parse argument '{arg}'"));
+
+        let constraint = arg_prep.and_then(|a| a.try_into().ok());
+
+        Argument {
+            pos,
+            name: String::from(var_name),
+            ty,
+            constraints: constraint.map_or(vec![], |r| vec![r]),
+        }
+    }
+}

crates/intrinsic-test/src/aarch/mod.rs

@@ -0,0 +1,2 @@
+pub mod argument;
+pub mod parser;

crates/intrinsic-test/src/json_parser.rs renamed to crates/intrinsic-test/src/aarch/parser.rs

@@ -43,7 +43,7 @@ struct JsonIntrinsic {
     architectures: Vec<String>,
 }
 
-pub fn get_neon_intrinsics(filename: &Path) -> Result<Vec<Intrinsic>, Box<dyn std::error::Error>> {
+pub fn parse_file(filename: &Path) -> Result<Vec<Intrinsic>, Box<dyn std::error::Error>> {
     let file = std::fs::File::open(filename)?;
     let reader = std::io::BufReader::new(file);
     let json: Vec<JsonIntrinsic> = serde_json::from_reader(reader).expect("Couldn't parse JSON");

crates/intrinsic-test/src/argument.rs

@@ -2,7 +2,6 @@ use std::ops::Range;
 
 use crate::Language;
 use crate::format::Indentation;
-use crate::json_parser::ArgPrep;
 use crate::types::{IntrinsicType, TypeKind};
 
 /// An argument for the intrinsic.
@@ -24,26 +23,6 @@ pub enum Constraint {
     Range(Range<i64>),
 }
 
-impl TryFrom<ArgPrep> for Constraint {
-    type Error = ();
-
-    fn try_from(prep: ArgPrep) -> Result<Self, Self::Error> {
-        let parsed_ints = match prep {
-            ArgPrep::Immediate { min, max } => Ok((min, max)),
-            _ => Err(()),
-        };
-        if let Ok((min, max)) = parsed_ints {
-            if min == max {
-                Ok(Constraint::Equal(min))
-            } else {
-                Ok(Constraint::Range(min..max + 1))
-            }
-        } else {
-            Err(())
-        }
-    }
-}
-
 impl Constraint {
     pub fn to_range(&self) -> Range<i64> {
         match self {
@@ -78,22 +57,6 @@ impl Argument {
         (arg[..split_index + 1].trim_end(), &arg[split_index + 1..])
     }
 
-    pub fn from_c(pos: usize, arg: &str, arg_prep: Option<ArgPrep>) -> Argument {
-        let (ty, var_name) = Self::type_and_name_from_c(arg);
-
-        let ty = IntrinsicType::from_c(ty)
-            .unwrap_or_else(|_| panic!("Failed to parse argument '{arg}'"));
-
-        let constraint = arg_prep.and_then(|a| a.try_into().ok());
-
-        Argument {
-            pos,
-            name: String::from(var_name),
-            ty,
-            constraints: constraint.map_or(vec![], |r| vec![r]),
-        }
-    }
-
     fn is_rust_vals_array_const(&self) -> bool {
         use TypeKind::*;
         match self.ty {

crates/intrinsic-test/src/main.rs

@@ -14,12 +14,11 @@ use types::TypeKind;
 
 use crate::argument::Argument;
 use crate::format::Indentation;
-use crate::json_parser::get_neon_intrinsics;
 
+mod aarch;
 mod argument;
 mod format;
 mod intrinsic;
-mod json_parser;
 mod types;
 mod values;
 
@@ -519,7 +518,7 @@ fn main() {
         Default::default()
     };
     let a32 = target.contains("v7");
-    let mut intrinsics = get_neon_intrinsics(&filename).expect("Error parsing input file");
+    let mut intrinsics = aarch::parser::parse_file(&filename).expect("Error parsing input file");
 
     intrinsics.sort_by(|a, b| a.name.cmp(&b.name));