Merge branch 'chrivers/fix-bool-parsing'

Author: chrivers

crates/dregistry/src/source.rs

@@ -43,7 +43,7 @@ impl DockerSource {
         if let Some(ns) = namespace {
             format!("{ns}/{}", &self.repository)
         } else {
-            self.repository.to_string()
+            self.repository.clone()
         }
     }
 

crates/raptor-parser/src/lexer.rs

@@ -52,6 +52,12 @@ pub enum Token {
     #[token("@")]
     At,
 
+    #[token("true")]
+    True,
+
+    #[token("false")]
+    False,
+
     #[regex("[a-zA-Z_][^\\]@/. \n\t\",=:{}\\[-]*")]
     Bareword,
 
@@ -117,6 +123,8 @@ impl Token {
             Self::Minus => "-",
             Self::Dollar => "$",
             Self::At => "@",
+            Self::True => "true",
+            Self::False => "false",
             Self::Bareword => "<bareword>",
             Self::Number => "<number>",
             Self::Newline => "\\n",
@@ -142,6 +150,8 @@ impl Token {
             Self::Minus => "'-' (minus)",
             Self::Dollar => "'$' (dollar)",
             Self::At => "'@' (at)",
+            Self::True => "true (keyword)",
+            Self::False => "false (keyword)",
             Self::Bareword => "<bareword>",
             Self::Number => "<number>",
             Self::Newline => "\\n (newline)",

crates/raptor-parser/src/parser.rs

@@ -492,20 +492,19 @@ impl<'src> Parser<'src> {
                 Ok(Value::from_serialize(value))
             }
             Token::Number => {
-                self.expect(&Token::Number)?;
+                self.next()?;
                 Ok(Value::from_serialize(self.token().parse::<i64>()?))
             }
-            Token::Bareword => {
-                self.expect(&Token::Bareword)?;
-                let value = match self.token() {
-                    "true" => true,
-                    "false" => false,
-                    _ => return Err(ParseError::Expected("boolean")),
-                };
-                Ok(Value::from_serialize(value))
+            Token::True => {
+                self.next()?;
+                Ok(Value::from_serialize(true))
+            }
+            Token::False => {
+                self.next()?;
+                Ok(Value::from_serialize(false))
             }
 
-            _ => Err(ParseError::Expected("value4")),
+            _ => Err(ParseError::Expected("value (list, map, number, or bool)")),
         }
     }
 

src/make/maker.rs

@@ -38,7 +38,7 @@ impl<'a> Maker<'a> {
 
     pub fn add_links(&self, loader: &Loader) {
         for (name, link) in &self.make.raptor.link {
-            loader.add_package(name.to_string(), Utf8PathBuf::from(&link.source));
+            loader.add_package(name.clone(), Utf8PathBuf::from(&link.source));
         }
     }
 

src/program/loader.rs

@@ -73,7 +73,7 @@ impl Loader<'_> {
             ModuleRoot::Package(pkg) => {
                 let package = self
                     .get_package(pkg)
-                    .ok_or_else(|| RaptorError::PackageNotFound(pkg.to_string(), origin.clone()))?;
+                    .ok_or_else(|| RaptorError::PackageNotFound(pkg.clone(), origin.clone()))?;
                 package.join(end)
             }
         };

tests/parse.rs

@@ -7,8 +7,8 @@ use minijinja::{Value, context};
 use pretty_assertions::assert_eq;
 
 use raptor::RaptorResult;
-use raptor::dsl::Item;
-use raptor::{dsl::Program, program::Loader};
+use raptor::dsl::{Item, Program};
+use raptor::program::Loader;
 use raptor_parser::ast::{
     Chown, FromSource, IncludeArg, InstEnvAssign, InstFrom, InstMkdir, InstMount, Instruction,
     MountOptions, MountType, Origin,