[core]Add setAttr support, fix chunk ast parse

apache · YorkShen · Aug 9, 2018 · Jul 4, 2018 · Jul 9, 2018 · Jul 7, 2018
commit e48167ad87abead7ebe1039a7991748e85c1c2e9
@@ -87,7 +87,8 @@ void CodeGenerator::Visit(CallExpression *stms, void *data) {
   argc = stms->args().size();
   for (auto it = stms->args().begin(); it != stms->args().end(); ++it) {
     auto temp = (*it).get();
-    temp->Accept(this, nullptr);
+    long arg = cur_block_->NextRegisterId();
+    temp->Accept(this, &arg);
   }
 
   FuncState *state = cur_func_->func_state();

@@ -140,7 +140,7 @@ class Ref {
   template <class B>
   inline operator Ref<B>() {
       // typename std::enable_if<std::is_base_of<B, T>::value>::type;
-      return Ref<B>(dynamic_cast<B*>(ptr_));
+      return Ref<B>(reinterpret_cast<B*>(ptr_));
     }
 
 private:

@@ -125,25 +125,26 @@ void ChunkStatement::Pasing(Json &json) {
         }
         Json childs = json["childNodes"];
         if (childs.is_array() && childs.array_items().size() > 0) {
-            Handle<ExpressionList> list = factory->NewExpressionList();
+//            Handle<ExpressionList> list = factory->NewExpressionList();
             for (int i = 0;i < childs.array_items().size(); i++) {
                 Json child = childs[i];
                 if (child.is_null() || !child.is_object()) {
                     continue;
                 }
                 Handle<Expression> block = factory->NewChildBlockStatement(child, factory->NewExpressionList(), nodeId.string_value());
-                list->Insert(block);
-            }
-            if (controlExpr) {
-                if (controlExpr->IsForStatement()) {
-                    Handle<ForStatement> forExpr = controlExpr;
-                    Handle<BlockStatement> forBlock = forExpr->body();
-                    forBlock->PushExpression(list);
-                }
-            }
-            else {
-                PushExpression(list);
+//                list->Insert(block);
+                PushExpression(block);
             }
+//            if (controlExpr) {
+//                if (controlExpr->IsForStatement()) {
+//                    Handle<ForStatement> forExpr = controlExpr;
+//                    Handle<BlockStatement> forBlock = forExpr->body();
+//                    forBlock->PushExpression(list);
+//                }
+//            }
+//            else {
+//                PushExpression(list);
+//            }
         }
 
     } while (0);
@@ -205,6 +206,20 @@ void ChildBlockStatement::Pasing(Json &json) {
         }
         Json attributes = json["attributes"];
         if (attributes.is_object()) {
+            auto items = attributes.object_items();
+            for (auto it = items.begin(); it != items.end(); ++it) {
+                const auto& key = it->first;
+                const auto& value = it->second.string_value();//todo support expression
+                std::vector<Handle<Expression>> args;
+                args.push_back(factory->NewStringLiteral(json,nodeId.string_value()));
+                args.push_back(factory->NewStringLiteral(json,key));
+                args.push_back(factory->NewStringLiteral(json,value));
+
+                Handle<Expression> setAttrFunc = factory->NewIdentifier(json, "setAttr");
+                Handle<CallExpression> callFunc = factory->NewCallExpression(
+                    json,setAttrFunc,args);
+                PushExpression(callFunc);
+            }
             std::string error;
             Handle<Expression> attr = Parser::parseExpression(attributes, error);
             if (controlExpr) {

@@ -177,6 +177,19 @@ static Value AppendChild(ExecState* exec_state) {//appendChild("parent_id","id")
   return Value();
 }
 
+static Value SetAttr(ExecState* exec_state) {//setAttr("id","key","value");
+  VNode* node = exec_state->find_node(exec_state->GetArgument(0)->str->c_str());
+  char* key = exec_state->GetArgument(1)->str->c_str();
+  char* value = exec_state->GetArgument(2)->str->c_str();
+
+  if (node == nullptr) {
+    return Value();
+  }
+
+  node->SetAttribute(key,value);
+  return Value();
+}
+
 void RegisterCFunc(ExecState* state, const std::string& name, CFunction function) {
   Value func;
   func.type = Value::Type::CFUNC;
@@ -186,7 +199,7 @@ void RegisterCFunc(ExecState* state, const std::string& name, CFunction function
 
 void VNodeRenderManager::InitVM() {
   if (g_vm_ == nullptr) {
-    VM* vm = new VM();
+    g_vm_ = new VM();
   }
 }
 void VNodeRenderManager::TestProcess(const std::string& input, const std::string& page_id) {
@@ -196,6 +209,7 @@ void VNodeRenderManager::TestProcess(const std::string& input, const std::string
   RegisterCFunc(execState, "log", Log);
   RegisterCFunc(execState, "createElement", CreateElement);
   RegisterCFunc(execState, "appendChild", AppendChild);
+  RegisterCFunc(execState, "setAttr", SetAttr);
 
   execState->page_id(page_id);
   execState->Compile(input);