Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1_17.05.17

livecodeali · livecodeali · commit 41a859de38d0 · 2017-05-17T11:15:19.000+01:00
diff --git a/docs/development/testing.md b/docs/development/testing.md
@@ -61,6 +61,7 @@ Before running each test command, the test framework inserts a test library stac
 * `TestSkip pDescription, pReasonSkipped`: Record a test as having been skipped.  *pReasonSkipped* should be a short explanation of why the test was skipped (e.g. "not supported on Windows").
 * `TestAssertBroken pDescription, pExpectTrue, pReasonBroken`: The same as `TestAssert`, but marking the test as "expected to fail".  *pReasonBroken* should be a short explanation of why the test is currently expected to fail; it should almost always be a reference to a bug report, e.g. "bug 54321".
 * `TestAssertThrow pDescription, pHandlerName, pTarget, pExpectedError, pParam`: Assert that a given handler triggers the expected error message. *pHandlerName* is the name of the handler containing the script expected to cause an error; it is dispatched to *pTarget* with *pParam* as a parameter within a try/catch structure. *pExpectedError* is the expected script execution error code.
+* `TestAssertDoesNotThrow pDescription, pHandlerName, pTarget, pParam`: Assert that a given handler does not trigger any exceptions. *pHandlerName* is the name of the handler containing the script expected to cause an error; it is dispatched to *pTarget* with *pParam* as a parameter within a try/catch structure.
 * `TestGetEngineRepositoryPath`: A function that returns the path to the main LiveCode engine repository.
 * `TestGetIDERepositoryPath`: A function that returns the path to the LiveCode IDE repository.
 * `TestLoadExtension pName`: Attempt to load the extension with name `pName`, eg `TestLoadExtension "json"` will load the JSON library extension.
diff --git a/docs/dictionary/command/get.lcdoc b/docs/dictionary/command/get.lcdoc
@@ -14,7 +14,7 @@ OS: mac, windows, linux, ios, android
 Platforms: desktop, server, mobile
 
 Example:
-get the colors
+get the colors of button 1
 
 Example:
 get 2 * 25 * pi -- gets area of circle with radius 25
diff --git a/docs/dictionary/command/revSpeak.lcdoc b/docs/dictionary/command/revSpeak.lcdoc
@@ -45,7 +45,7 @@ settings are used.
 > speaking, use the <revIsSpeaking> <function>, as in the following
 > example: 
 
-    if revIsSpeaking then answer "Just a moment..."
+    if revIsSpeaking() then answer "Just a moment..."
     else revSpeak it
 
 
diff --git a/docs/notes/bugfix-19361.md b/docs/notes/bugfix-19361.md
@@ -0,0 +1 @@
+# Added missing parantheses for revIsSpeaking()
diff --git a/docs/notes/bugfix-19687.md b/docs/notes/bugfix-19687.md
@@ -0,0 +1 @@
+# Preserve error from chunk-of-code send form
diff --git a/docs/notes/bugfix-19688.md b/docs/notes/bugfix-19688.md
@@ -0,0 +1 @@
+# Ensure 'put the objProp' causes a parse error
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -1437,8 +1437,8 @@ static void MCEngineSendOrCall(MCExecContext& ctxt, MCStringRef p_script, MCObje
         else
             tptr = MCNameGetString(*t_message);
         
-        if ((stat = optr->domess(*tptr)) == ES_ERROR)
-            ctxt . LegacyThrow(EE_STATEMENT_BADCOMMAND, *t_message);
+        if (optr->domess(*tptr, nil, false) == ES_ERROR)
+            ctxt . Throw();
 	}
 	else if (stat == ES_PASS)
 		stat = ES_NORMAL;
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -2920,7 +2920,7 @@ void MCObject::drawdirectionaltext(MCDC *dc, int2 sx, int2 sy, MCStringRef p_str
 #endif
 }
 
-Exec_stat MCObject::domess(MCStringRef sptr, MCParameter* p_args)
+Exec_stat MCObject::domess(MCStringRef sptr, MCParameter* p_args, bool p_ignore_errors)
 {
 	MCAutoStringRef t_temp_script;
 	/* UNCHECKED */ MCStringFormat(&t_temp_script, "on message\n%@\nend message\n", sptr);
@@ -2952,11 +2952,12 @@ Exec_stat MCObject::domess(MCStringRef sptr, MCParameter* p_args)
     swap(MCtargetptr, oldtargetptr);
 	if (stat == ES_NORMAL)
 		return ES_NORMAL;
-	else
-	{
-		MCeerror->clear(); // clear out bogus error messages
-		return ES_ERROR;
-	}
+    else
+    {
+        if (p_ignore_errors)
+            MCeerror->clear(); // clear out bogus error messages
+        return ES_ERROR;
+    }
 }
 
 void MCObject::eval(MCExecContext &ctxt, MCStringRef p_script, MCValueRef &r_value)
diff --git a/engine/src/object.h b/engine/src/object.h
@@ -1033,7 +1033,8 @@ class MCObject :
     // SN-2014-04-16 [[ Bug 12078 ]] Buttons and tooltip label are not drawn in the text direction
     void drawdirectionaltext(MCDC *dc, int2 sx, int2 sy, MCStringRef p_string, MCFontRef font);
 
-	Exec_stat domess(MCStringRef sptr, MCParameter *args = nil);
+	Exec_stat domess(MCStringRef sptr, MCParameter *args = nil, bool p_ignore_errors = true);
+    
 	void eval(MCExecContext& ctxt, MCStringRef p_script, MCValueRef& r_value);
 	// MERG 2013-9-13: [[ EditScriptChunk ]] Added at expression that's passed through as a second parameter to editScript
     void editscript(MCStringRef p_at = nil);
diff --git a/engine/src/scriptpt.cpp b/engine/src/scriptpt.cpp
@@ -1744,10 +1744,10 @@ Parse_stat MCScriptPoint::parseexp(Boolean single, Boolean items,
 					{
 						delete newfact;
 						*this = thesp;
-						if (MCexplicitvariables)
+						if (doingthe || MCexplicitvariables)
 						{
 							MCerrorlock--;
-							MCperror->add(PE_EXPRESSION_NOTLITERAL, *this);
+							MCperror->add(PE_PROPERTY_NOTOF, *this);
 							return PS_ERROR;
 						}
 						newfact = new (nothrow) MCLiteral(gettoken_nameref());
diff --git a/engine/src/w32-clipboard.cpp b/engine/src/w32-clipboard.cpp
@@ -149,7 +149,6 @@ void MCWin32RawClipboardCommon::Clear()
 	if (m_item)
 		m_item->Release();
 	m_item = NULL;
-	CreateNewItem();
 }
 
 bool MCWin32RawClipboardCommon::IsExternalData() const
diff --git a/tests/_testlib.livecodescript b/tests/_testlib.livecodescript
@@ -204,6 +204,16 @@ on TestAssertThrow pDescription, pHandler, pTarget, pErrorCodes, pParam
    TestAssert pDescription, tSuccess
 end TestAssertThrow
 
+on TestAssertDoesNotThrow pDescription, pHandler, pTarget, pParam
+  local tError
+  try
+    dispatch pHandler to pTarget with pParam
+  catch tError
+  end try
+
+  TestAssert pDescription, tError is empty 
+end TestAssertDoesNotThrow
+
 on ErrorDialog executionError, parseError
    write executionError & return to stderr
    quit 1
diff --git a/tests/lcs/core/engine/send.livecodescript b/tests/lcs/core/engine/send.livecodescript
@@ -54,4 +54,13 @@ on TestSendToSubobj
 	delete stack tStack
 
 	TestAssert "message canceled on delete", not MessageExists(tMsgId)
-end TestSendToSubobj
+end TestSendToSubobj
+
+on __SendError
+	send "--execute this" & return & "put the name of stack nonexistent"
+end __SendError
+
+on TestSendError
+	TestAssertThrow "send throws correct error", __SendError, \ 
+		the long id of me, 91
+end TestSendError
diff --git a/tests/lcs/parser/parser.livecodescript b/tests/lcs/parser/parser.livecodescript
@@ -0,0 +1,45 @@
+﻿script "TestLCSParser"
+/*
+Copyright (C) 2017 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+/* TODO 15/05/2017: Turn these tests into an LCS parser test when merging
+up into develop branch */
+
+private command __CompileCheck pMessage
+   local tCompileTest, tCompileResult
+   --checks to see if the message compiles
+   lock messages
+   create script only stack "compilationTest"
+   put "on compileTest" & return & pMessage & return \ 
+      & "end compileTest" into tCompileTest
+   set the script of stack "compilationTest" to tCompileTest
+   put the result into tCompileResult
+   delete stack "compilationTest"
+   unlock messages
+   repeat for each line tError in tCompileResult
+      if item 2 of tError is not 0 then
+         return tError
+      end if
+   end repeat
+
+   return empty
+end __CompileCheck
+
+on TestBug19688
+	__CompileCheck "get the width"
+   TestAssert "'get the <objprop>' parse error", the result is not empty
+end TestBug19688

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Added missing parantheses for revIsSpeaking()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Preserve error from chunk-of-code send form`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure 'put the objProp' causes a parse error`
Original file line number	Diff line number	Diff line change
`@@ -1744,10 +1744,10 @@ Parse_stat MCScriptPoint::parseexp(Boolean single, Boolean items,`
`1744`	`1744`	`{`
`1745`	`1745`	`delete newfact;`
`1746`	`1746`	`*this = thesp;`
`1747`		`- if (MCexplicitvariables)`
	`1747`	`+ if (doingthe \|\| MCexplicitvariables)`
`1748`	`1748`	`{`
`1749`	`1749`	`MCerrorlock--;`
`1750`		`- MCperror->add(PE_EXPRESSION_NOTLITERAL, *this);`
	`1750`	`+ MCperror->add(PE_PROPERTY_NOTOF, *this);`
`1751`	`1751`	`return PS_ERROR;`
`1752`	`1752`	`}`
`1753`	`1753`	`newfact = new (nothrow) MCLiteral(gettoken_nameref());`