Peel away CYCompound layers to fix tab completion.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index b7a4533c571c995b4ac128aa76b0884a3317d46a..d669e67239ff008726de6258bd6c6c0bee187852 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */


@@ -211,11 +211,16 @@ static CYExpression *ParseExpression(CYUTF8String code) {
     Setup(driver, parser);
 
     if (parser.parse() != 0 || !driver.errors_.empty())
     Setup(driver, parser);
 
     if (parser.parse() != 0 || !driver.errors_.empty())

-        _assert(false);
+        return NULL;
+
+    CYOptions options;
+    CYContext context(options);

 
 

-    CYExpress *express(dynamic_cast<CYExpress *>(driver.program_->statements_));
-    _assert(express != NULL);
-    return express->expression_;
+    // XXX: this could be replaced with a CYStatement::Primitive()
+    if (CYExpress *express = dynamic_cast<CYExpress *>(driver.program_->statements_))
+        return express->expression_->Primitive(context);
+
+    return NULL;

 }
 
 static int client_;
 }
 
 static int client_;


@@ -297,6 +302,9 @@ static char **Complete(const char *word, int start, int end) {
     CYUTF8String json(Run(pool, client_, code));
 
     CYExpression *result(ParseExpression(json));
     CYUTF8String json(Run(pool, client_, code));
 
     CYExpression *result(ParseExpression(json));

+    if (result == NULL)
+        return NULL;
+

     CYArray *array(dynamic_cast<CYArray *>(result));
 
     if (array == NULL) {
     CYArray *array(dynamic_cast<CYArray *>(result));
 
     if (array == NULL) {