Skip to content

Commit

Permalink
Use ES2015 instead of E6 in README, website, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
svaarala committed Jan 2, 2017
1 parent 4180966 commit 5d6bd6c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Main features:
* Minimal platform dependencies
* Combined reference counting and mark-and-sweep garbage collection with finalization
* Custom features like co-routines
* Property virtualization using a subset of Ecmascript E6 Proxy object
* Property virtualization using a subset of Ecmascript E2015 Proxy object
* Bytecode dump/load for caching compiled functions
* Distributable includes an optional logging framework, CommonJS-based module
loading implementations, etc
Expand Down
2 changes: 1 addition & 1 deletion doc/low-memory.rst
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ NOTE: This list is not exhaustive, see ``config/examples/low_memory.yaml``.

- ``#undef DUK_USE_JC``

* Features borrowed from Ecmascript E6 can usually be disabled
* Features borrowed from Ecmascript ES2015 can usually be disabled
(not exhaustive):

- ``#undef DUK_USE_ES6_OBJECT_SETPROTOTYPEOF``
Expand Down
4 changes: 2 additions & 2 deletions website/guide/luacomparison.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h2>Bytecode dump/load</h2>
<h2>Metatables</h2>

<p>There is no equivalent of Lua metatables in Ecmascript E5/E5.1, but
<a href="http://www.ecma-international.org/ecma-262/6.0/index.html#sec-proxy-objects">Ecmascript E6 Proxy objects</a>
<a href="http://www.ecma-international.org/ecma-262/6.0/index.html#sec-proxy-objects">Ecmascript ES2015 Proxy objects</a>
provide similar functionality. To allow property virtualization better than available in
E5/E5.1, Duktape implements an <a href="#es6-proxy">ES2015 Proxy subset</a>.</p>

Expand Down Expand Up @@ -105,7 +105,7 @@ <h2>Coroutines</h2>
<h2>Multiple return values</h2>

<p>Lua supports multiple return values, Duktape (or Ecmascript) currently
doesn't. This may change with Ecmascript E6, which has a syntax for
doesn't. This may change with Ecmascript ES2015, which has a syntax for
multiple value returns. The Duktape/C API reserves return values above 1
so that they may be later used for multiple return values.</p>

Expand Down
2 changes: 1 addition & 1 deletion website/index/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h1>Main features</h1>
<li>Combined reference counting and mark-and-sweep garbage collection
with finalization</li>
<li>Coroutines</li>
<li>Property virtualization using a subset of Ecmascript E6 Proxy object</li>
<li>Property virtualization using a subset of Ecmascript ES2015 Proxy object</li>
<li>Bytecode dump/load for caching compiled functions</li>
<li>Distributable includes an optional logging framework, CommonJS-based module
loading implementations, etc</li>
Expand Down

0 comments on commit 5d6bd6c

Please sign in to comment.