1 files changed, 27 insertions, 5 deletions

diff --git a/src/stages/semantic.rs b/src/stages/semantic.rs
index ec2f704..6cd83f8 100644
--- a/src/stages/semantic.rs
+++ b/src/stages/semantic.rs
@@ -144,6 +144,11 @@ impl SemanticParser {
                     MacroDefinitionBody::Block(mut tokens) => {
                         block_tokens.append(&mut tokens);
                     }
+                    MacroDefinitionBody::String(string) => {
+                        let error = SemanticError::ExpectedBlock(location);
+                        let tracked = Tracked::from(error, string.source);
+                        self.errors.push(tracked);
+                    }
                     MacroDefinitionBody::Invocation(invocation) => {
                         // Convert invocation to a block invocation.
                         let token = BlockToken::Invocation(invocation.value);
@@ -178,10 +183,10 @@ impl SemanticParser {
                 let tracked = Tracked::from(token, source);
                 Some(MacroDefinitionBody::Integer(tracked))
             }
-            SyntacticToken::StringLiteral(_) => {
-                let error = SemanticError::MisplacedStringLiteral;
-                self.errors.push(Tracked::from(error, source));
-                None
+            SyntacticToken::StringLiteral(value) => {
+                let token = StringToken::StringLiteral(value);
+                let tracked = Tracked::from(token, source);
+                Some(MacroDefinitionBody::String(tracked))
             }
             SyntacticToken::WordTemplate(word_template) => {
                 let token = BlockToken::WordTemplate(word_template);
@@ -260,6 +265,11 @@ impl SemanticParser {
                 self.errors.push(Tracked::from(error, token.source));
                 None
             }
+            MacroDefinitionBody::String(string) => {
+                let error = SemanticError::ExpectedInteger(location);
+                self.errors.push(Tracked::from(error, string.source));
+                None
+            }
         }
     }
 
@@ -281,6 +291,11 @@ impl SemanticParser {
                 self.errors.push(Tracked::from(error, integer.source));
                 None
             }
+            MacroDefinitionBody::String(string) => {
+                let error = SemanticError::ExpectedBlock(location);
+                self.errors.push(Tracked::from(error, string.source));
+                None
+            }
         }
     }
 
@@ -357,7 +372,8 @@ impl SemanticParser {
         let source = token.source;
         match token.value {
             SyntacticToken::StringLiteral(string_literal) => {
-                let argument = InvocationArgument::String(string_literal);
+                let string = StringToken::StringLiteral(string_literal);
+                let argument = InvocationArgument::StringToken(string);
                 Some(Tracked::from(argument, source))
             }
             SyntacticToken::IntegerLiteral(value) => {
@@ -430,6 +446,12 @@ impl SemanticParser {
                     }
                 }
             }
+            SyntacticToken::StringLiteral(string) => {
+                let variant = ArgumentType::String;
+                let name = string.string;
+                let definition = ArgumentDefinition { name, variant };
+                return Some(Tracked::from(definition, source));
+            }
             _ => (),
         };
         let error = SemanticError::InvalidArgumentDefinition;