Skip to content

path: reduce path code size #25278

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.

Sign up for GitHub

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

Closed
BridgeAR wants to merge 8 commits into from
Closed

path: reduce path code size #25278

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0584d41
path: minor refactoring
BridgeAR Jan 27, 2019
317013c
path: more small refactorings
BridgeAR Jan 27, 2019
471192b
path: refactor more path code for simplicity
BridgeAR Jan 27, 2019
ace9215
path: minor refactoring
BridgeAR Jan 27, 2019
6b2c7a2
path: refactor logic for to reduce code branches
BridgeAR Jan 27, 2019
a815e20
path: simplify code and remove obsolete checks
BridgeAR Jan 27, 2019
5b5cebb
path: refactor for less indentation
BridgeAR Jan 27, 2019
5da1b22
path: refactor code for clarity
BridgeAR Jan 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
path: simplify code and remove obsolete checks 
Either `end` is `-1` or `startPart` is not `0`. Therefore it's
possible to move the conditions in a way that we eliminate a few code
branches.
  • Loading branch information
@BridgeAR
BridgeAR committed Feb 28, 2019
commit a815e209e48fe6a7edc232a9473a4745f869fbfd
59 changes: 25 additions & 34 deletions lib/path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,21 +960,20 @@ const win32 = {
}
}

if (startDot === -1 ||
end === -1 ||
// We saw a non-dot character immediately before the dot
preDotState === 0 ||
// The (right-most) trimmed path component is exactly '..'
(preDotState === 1 &&
startDot === end - 1 &&
startDot === startPart + 1)) {
if (end !== -1) {
if (end !== -1) {
if (startDot === -1 ||
// We saw a non-dot character immediately before the dot
preDotState === 0 ||
// The (right-most) trimmed path component is exactly '..'
(preDotState === 1 &&
startDot === end - 1 &&
startDot === startPart + 1)) {
ret.base = ret.name = path.slice(startPart, end);
} else {
ret.name = path.slice(startPart, startDot);
ret.base = path.slice(startPart, end);
ret.ext = path.slice(startDot, end);
}
} else {
ret.name = path.slice(startPart, startDot);
ret.base = path.slice(startPart, end);
ret.ext = path.slice(startDot, end);
}

// If the directory is the root, use the entire root as the `dir` including
Expand Down Expand Up @@ -1380,29 +1379,21 @@ const posix = {
}
}

if (startDot === -1 ||
end === -1 ||
// We saw a non-dot character immediately before the dot
preDotState === 0 ||
// The (right-most) trimmed path component is exactly '..'
(preDotState === 1 &&
startDot === end - 1 &&
startDot === startPart + 1)) {
if (end !== -1) {
if (startPart === 0 && isAbsolute)
ret.base = ret.name = path.slice(1, end);
else
ret.base = ret.name = path.slice(startPart, end);
}
} else {
if (startPart === 0 && isAbsolute) {
ret.name = path.slice(1, startDot);
ret.base = path.slice(1, end);
if (end !== -1) {
const start = startPart === 0 && isAbsolute ? 1 : startPart;
if (startDot === -1 ||
// We saw a non-dot character immediately before the dot
preDotState === 0 ||
// The (right-most) trimmed path component is exactly '..'
(preDotState === 1 &&
startDot === end - 1 &&
startDot === startPart + 1)) {
ret.base = ret.name = path.slice(start, end);
} else {
ret.name = path.slice(startPart, startDot);
ret.base = path.slice(startPart, end);
ret.name = path.slice(start, startDot);
ret.base = path.slice(start, end);
ret.ext = path.slice(startDot, end);
}
ret.ext = path.slice(startDot, end);
}

if (startPart > 0)
Expand Down