Fix JR offset inside of macros + line number in error messages

2 files changed, 6 insertions, 6 deletions

diff --git a/macros.go b/macros.go
index e08562c..30ab64a 100644
--- a/macros.go
+++ b/macros.go
@@ -173,7 +173,7 @@ func MacroParse(
 			if err != nil {
 				return err
 			}
-			new_instructions, err := secondPass("MACRO$"+definedMacroName, macroContent, offset, state)
+			new_instructions, err := secondPass("MACRO$"+definedMacroName, macroContent, 0, state)
 			if err != nil {
 				return err
 			}
diff --git a/main.go b/main.go
index 8100e43..1968fb2 100644
--- a/main.go
+++ b/main.go
@@ -56,7 +56,7 @@ func firstPass(
 					return nil, fmt.Errorf(
 						"File %s, line %d:\nLabel %s is already defined",
 						input_file_name,
-						line_nb,
+						line_nb+1,
 						label,
 					)
 				}
@@ -83,7 +83,7 @@ func firstPass(
 				return nil, fmt.Errorf(
 					"File %s, line %d (1st pass|macro):\n%w",
 					input_file_name,
-					line_nb,
+					line_nb+1,
 					err,
 				)
 			}
@@ -93,7 +93,7 @@ func firstPass(
 				return nil, fmt.Errorf(
 					"File %s, line %d (1st pass):\n%w",
 					input_file_name,
-					line_nb,
+					line_nb+1,
 					err,
 				)
 			}
@@ -136,7 +136,7 @@ func secondPass(
 				return nil, fmt.Errorf(
 					"File %s, line %d (2nd pass|macro):\n%w",
 					input_file_name,
-					line_nb,
+					line_nb+1,
 					err,
 				)
 			}
@@ -146,7 +146,7 @@ func secondPass(
 				return nil, fmt.Errorf(
 					"File %s, line %d (2nd pass): %w",
 					input_file_name,
-					line_nb,
+					line_nb+1,
 					err,
 				)
 			}