Commit graph

4 commits

Author SHA1 Message Date
Cyrus Najmabadi 29f3f6fcae Merge branch 'master' into typeWriter 2015-04-13 14:29:37 -07:00
Cyrus Najmabadi b5b9f517ce Include symbol information in the typewriter baselines. 2015-04-13 13:54:22 -07:00
Cyrus Najmabadi 592e2314d4 Simplify typewriter code. 2015-04-13 12:36:11 -07:00
Daniel Rosenwasser 5fc2ec701b Merge branch 'master' into thanksLua
Conflicts:
	src/compiler/emitter.ts
	tests/baselines/reference/FunctionPropertyAssignments5_es6.js
	tests/baselines/reference/computedPropertyNames9_ES6.js
	tests/baselines/reference/computedPropertyNamesDeclarationEmit3.js
	tests/baselines/reference/computedPropertyNamesDeclarationEmit4.js
	tests/baselines/reference/parserES5ComputedPropertyName3.js
	tests/baselines/reference/parserES5ComputedPropertyName4.js
2015-02-17 17:43:06 -08:00