Browse Source

пустышка

kpmy 10 years ago
parent
commit
cf56142ffc
4 changed files with 14 additions and 8 deletions
  1. 2 0
      XevDemo0.oxf
  2. 3 2
      rt2/rules/enter.go
  3. 6 5
      rt2/scope/stdScope.go
  4. 3 1
      xev/converter.go

+ 2 - 0
XevDemo0.oxf

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<graphml xmlns:cpt="urn:bbcb:component:dev:cpt" xmlns="http://graphml.graphdrawing.org/xmlns"><graph edgedefault="undirected" cpt:scope="0"/><graph edgedefault="undirected" cpt:proc="XevDemo0"><node id="0"><data><cpt:node cpt:proto="statement" cpt:class="enter" cpt:enter="module"/></data></node></graph></graphml>

+ 3 - 2
rt2/rules/enter.go

@@ -6,14 +6,15 @@ import (
 	"fw/rt2/frame"
 	"fw/rt2/nodeframe"
 	"fw/rt2/scope"
-	"ypk/assert"
 )
 
 func enterSeq(f frame.Frame) (seq frame.Sequence, ret frame.WAIT) {
 	var fu nodeframe.FrameUtils
 	n := fu.NodeOf(f)
 	body := fu.NodeOf(f).Right()
-	assert.For(body != nil, 40)
+	if body == nil {
+		return frame.End()
+	}
 	sm := scope.This(f.Domain().Discover(context.SCOPE))
 	//fmt.Println(n.Object())
 	if n.Object() != nil {

+ 6 - 5
rt2/scope/stdScope.go

@@ -211,11 +211,12 @@ func (m *manager) Initialize(n node.Node, o object.Object, _val node.Node) {
 
 func (m *manager) Dispose(n node.Node) {
 	e := m.areas.Front()
-	assert.For(e != nil, 20)
-	h := e.Value.(*area)
-	assert.For(h.root == n, 21)
-	m.areas.Remove(e)
-	fmt.Println("dispose")
+	if e != nil {
+		h := e.Value.(*area)
+		assert.For(h.root == n, 21)
+		m.areas.Remove(e)
+		fmt.Println("dispose")
+	}
 }
 
 func FindObjByName(mgr Manager, name string) (ret object.Object) {

+ 3 - 1
xev/converter.go

@@ -264,7 +264,9 @@ func (r *Result) doObject(n *Node) object.Object {
 }
 
 func (r *Result) buildScope(list []Node) (ro []object.Object, rt []object.ComplexType) {
-	assert.For(list != nil, 20)
+	if list == nil {
+		return nil, nil
+	}
 	ro = make([]object.Object, 0)
 	rt = make([]object.ComplexType, 0)
 	for i := range list {