[rkward-cvs] SF.net SVN: rkward:[3148] branches/2010_10_18_backend_restructuring_branch/ rkward/rbackend/rembedinternal.cpp

[tfry at users.sourceforge.net]

Revision: 3148
          http://rkward.svn.sourceforge.net/rkward/?rev=3148&view=rev
Author:   tfry
Date:     2010-10-25 16:41:07 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
presence of toplevel task handlers could lead to false syntax error alarms

Modified Paths:
--------------
    branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp

Modified: branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp
===================================================================
--- branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp	2010-10-25 16:29:10 UTC (rev 3147)
+++ branches/2010_10_18_backend_restructuring_branch/rkward/rbackend/rembedinternal.cpp	2010-10-25 16:41:07 UTC (rev 3148)
@@ -316,7 +316,11 @@
 	// output while nothing else is running (including handlers?) -> This may be a syntax error.
 	if (RThread::repl_status.eval_depth == 0) {
 		if (RThread::repl_status.user_command_status == RThread::RKReplStatus::UserCommandTransmitted) {
-			RThread::repl_status.user_command_status = RThread::RKReplStatus::UserCommandSyntaxError;
+			// status UserCommandTransmitted might have been set from RKToplevelStatementFinishedHandler, too, in which case all is fine
+			// (we're probably inside another task handler at this point, then)
+			if (RThread::repl_status.user_command_parsed_up_to < RThread::repl_status.user_command_transmitted_up_to) { 
+				RThread::repl_status.user_command_status = RThread::RKReplStatus::UserCommandSyntaxError;
+			}
 		} else if (RThread::repl_status.user_command_status == RThread::RKReplStatus::ReplIterationKilled) {
 			// purge superflous newlines
 			if (QString ("\n") == buf) return;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.