Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of changes in #4472 #4572

Merged
merged 9 commits into from
Jan 7, 2016
Merged

Conversation

cjihrig
Copy link
Contributor

@cjihrig cjihrig commented Jan 7, 2016

This PR is a backport of the issues referenced in #4472. The original commits weren't applying cleanly for two reasons.

  1. Normal churn on master, where all commits aren't backported to LTS caused conflicts.
  2. Each referenced PR was mapped to a single commit in Repl Changes to LTS blocked #4472. However, a few of the PRs actually had multiple commits.

With this branch, I was able to get all tests passing on my local machine.
R= @thealphanerd @bnoordhuis @jasnell
Closes #4472

cjihrig and others added 9 commits January 7, 2016 14:30
This commit adds an internal util method that makes hidden
values in the C++ layer visible in JS.

PR-URL: nodejs#3988
Reviewed-By: Trevor Norris <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>

Conflicts:
	lib/internal/util.js
This commit adds the decorateErrorStack() method. This function
uses the internal util's getHiddenValue() method to extract
arrow messages from error objects and attach them to the
error's stack trace.

PR-URL: nodejs#4013
Reviewed-By: Ben Noordhuis <[email protected]>
Currently, when a file with a syntax error is imported in the
REPL, no information is provided on the error's location. This
commit adds the error's location to the stack trace.

Refs: nodejs#2762
Refs: nodejs#3411
Refs: nodejs#3784
PR-URL: nodejs#4013
Reviewed-By: Ben Noordhuis <[email protected]>
Remove a hack that was introduced in commit bb6d468 from November 2010.
This is groundwork for a follow-up commit that makes it possible to use
internal modules in lib/repl.js.

PR-URL: nodejs#4026
Reviewed-By: Colin Ihrig <[email protected]>

Conflicts:
	lib/module.js
Move the method that was added in commit 8ca412b from earlier this month
from lib/util.js to lib/internal/util.js.

Avoids exposing a method that we may not wish to expose just yet, seeing
how it relies on implementation details.

PR-URL: nodejs#4026
Reviewed-By: Colin Ihrig <[email protected]>
A number of REPL tests define the same ArrayStream object. This
commit moves the repeated code into common.js.

PR-URL: nodejs#4027
Reviewed-By: Ben Noordhuis <[email protected]>

Conflicts:
	test/common.js
Determine object types of regular expressions, Dates, Maps, and
Sets in the C++ layer instead of depending on toString()
behavior in JavaScript.

PR-URL: nodejs#4100
Reviewed-By: Evan Lucas <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
The Is* type checking functions in node_util.cc are mostly
the same boilerplate. This commit defines them using a macro.

Refs: nodejs#4100
PR-URL: nodejs#4118
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: James M Snell <[email protected]>

Conflicts:
	src/node_util.cc
Fix module loading of third-party modules in the REPL by inheriting
module.paths from the REPL's parent module.

Commit ee72ee7 ("module,repl: remove repl require() hack") introduced
a regression where require() of modules in node_modules directories
no longer worked in the REPL (and fortunately only in the REPL.)
It turns out we didn't have test coverage for that but we do now.

Fixes: nodejs#4208
PR-URL: nodejs#4215
Reviewed-By: Roman Reiss <[email protected]>
@MylesBorins
Copy link
Contributor

🎉

@MylesBorins
Copy link
Contributor

@MylesBorins MylesBorins merged commit 82c9778 into nodejs:v4.x-staging Jan 7, 2016
@cjihrig cjihrig deleted the backport branch January 7, 2016 20:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants