From abf774bc57680d19b84f8bdbaaae633747e8d215 Mon Sep 17 00:00:00 2001 From: Rich-Harris Date: Sat, 8 Apr 2017 13:32:16 -0400 Subject: [PATCH] remove generator.push and generator.pop --- src/generators/Generator.js | 11 ---------- src/generators/dom/index.js | 22 ------------------- src/generators/dom/visitors/EachBlock.js | 3 --- src/generators/dom/visitors/Element.js | 4 ---- src/generators/server-side-rendering/index.js | 19 ---------------- 5 files changed, 59 deletions(-) diff --git a/src/generators/Generator.js b/src/generators/Generator.js index 7241f0c048..bd80f4fefa 100644 --- a/src/generators/Generator.js +++ b/src/generators/Generator.js @@ -418,15 +418,4 @@ export default class Generator { templateProperties }; } - - pop () { - const tail = this.current; - this.current = tail.parent; - - return tail; - } - - push ( fragment ) { - this.current = fragment; - } } diff --git a/src/generators/dom/index.js b/src/generators/dom/index.js index b75fb69c43..969bc95fac 100644 --- a/src/generators/dom/index.js +++ b/src/generators/dom/index.js @@ -86,27 +86,6 @@ class DomGenerator extends Generator { ` ); } - // generateBlock ( node, name, type ) { - // const childFragment = this.current.child({ - // type, - // name, - // target: 'target', - // localElementDepth: 0, - // builders: getBuilders(), - // getUniqueName: this.getUniqueNameMaker( this.current.params ) - // }); - - // this.push( childFragment ); - - // // walk the children here - // node.children.forEach( node => visit( node, this ) ); - // this.addRenderer( this.current ); - // this.pop(); - - // // unset the children, to avoid them being visited again - // node.children = []; - // } - helper ( name ) { if ( this.options.dev && `${name}Dev` in shared ) { name = `${name}Dev`; @@ -150,7 +129,6 @@ export default function dom ( parsed, source, options ) { builders: getBuilders(), getUniqueName }); - generator.push( mainFragment ); parsed.html.children.forEach( node => { visit( generator, mainFragment, node ); diff --git a/src/generators/dom/visitors/EachBlock.js b/src/generators/dom/visitors/EachBlock.js index 7d49523fd4..6a3bea8eec 100644 --- a/src/generators/dom/visitors/EachBlock.js +++ b/src/generators/dom/visitors/EachBlock.js @@ -211,14 +211,11 @@ export default function visitEachBlock ( generator, fragment, node ) { getUniqueName }); - generator.push( childFragment ); - node.children.forEach( child => { visit( generator, childFragment, child ); }); generator.addRenderer( childFragment ); - generator.pop(); if ( node.else ) { const childFragment = fragment.child({ diff --git a/src/generators/dom/visitors/Element.js b/src/generators/dom/visitors/Element.js index 4db5bf32f2..d24c7c267e 100644 --- a/src/generators/dom/visitors/Element.js +++ b/src/generators/dom/visitors/Element.js @@ -107,8 +107,6 @@ export default function visitElement ( generator, fragment, node ) { key: null }); - generator.push( childFragment ); - generator.elementDepth += 1; node.children.forEach( child => { @@ -120,6 +118,4 @@ export default function visitElement ( generator, fragment, node ) { if ( node.initialUpdate ) { fragment.builders.create.addBlock( node.initialUpdate ); } - - generator.pop(); } \ No newline at end of file diff --git a/src/generators/server-side-rendering/index.js b/src/generators/server-side-rendering/index.js index a5bef40135..722b854baa 100644 --- a/src/generators/server-side-rendering/index.js +++ b/src/generators/server-side-rendering/index.js @@ -1,6 +1,5 @@ import deindent from '../../utils/deindent.js'; import CodeBuilder from '../../utils/CodeBuilder.js'; -import flattenReference from '../../utils/flattenReference.js'; import Generator from '../Generator.js'; import Fragment from './Fragment.js'; import visit from './visit.js'; @@ -12,24 +11,6 @@ class SsrGenerator extends Generator { this.renderCode = ''; } - addBinding ( binding, name ) { - const conditions = [ `!( '${binding.name}' in root )`].concat( // TODO handle contextual bindings... - this.current.conditions.map( c => `(${c})` ) - ); - - const { keypath } = flattenReference( binding.value ); - - this.bindings.push( deindent` - if ( ${conditions.join( '&&' )} ) { - tmp = ${name}.data(); - if ( '${keypath}' in tmp ) { - root.${binding.name} = tmp.${keypath}; - settled = false; - } - } - ` ); - } - append ( code ) { this.renderCode += code; }