From f06af4fe86a953a20b9ef90f5605331707370765 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 18 Jul 2013 18:25:24 +0000
Subject: [assemble] compile syntax error into bytecode reporting syntax error
message.
---
generic/tclAssembly.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/generic/tclAssembly.c b/generic/tclAssembly.c
index 0722eb9..9b9b6f8 100644
--- a/generic/tclAssembly.c
+++ b/generic/tclAssembly.c
@@ -930,7 +930,7 @@ TclCompileAssembleCmd(
{
Tcl_Token *tokenPtr; /* Token in the input script */
-#if 0
+#if 1
int numCommands = envPtr->numCommands;
int offset = envPtr->codeNext - envPtr->codeStart;
int depth = envPtr->currStackDepth;
@@ -956,11 +956,7 @@ TclCompileAssembleCmd(
if (TCL_ERROR == TclAssembleCode(envPtr, tokenPtr[1].start,
tokenPtr[1].size, TCL_EVAL_DIRECT)) {
- /*
- * TODO: Finish working out how to capture syntax errors captured
- * during compile and make them bytecode reporting the error.
- */
-#if 0
+#if 1
Tcl_AppendObjToErrorInfo(interp, Tcl_ObjPrintf(
"\n (\"%.*s\" body, line %d)",
parsePtr->tokenPtr->size, parsePtr->tokenPtr->start,
@@ -1136,7 +1132,7 @@ NewAssemblyEnv(
assemEnvPtr->envPtr = envPtr;
assemEnvPtr->parsePtr = parsePtr;
- assemEnvPtr->cmdLine = envPtr->line;
+ assemEnvPtr->cmdLine = 1;
assemEnvPtr->clNext = envPtr->clNext;
/*
--
cgit v0.12