sdk/lib/_internal/pub/lib/src/utils.dart - Issue 1106713003: Support defining environment constants for dart2js via the command-line.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: sdk/lib/_internal/pub/lib/src/utils.dart

Issue 1106713003: Support defining environment constants for dart2js via the command-line. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Code review changes Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « sdk/lib/_internal/pub/lib/src/command/serve.dart ('k') | sdk/lib/_internal/pub/test/dart2js/environment_constant_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sdk/lib/_internal/pub/lib/src/utils.dart

diff --git a/sdk/lib/_internal/pub/lib/src/utils.dart b/sdk/lib/_internal/pub/lib/src/utils.dart

index 14d81a67a4138ea4e2c6aac75429c1a6cc05a132..d0eb936f7f818d5e0b4eac6013e3952cbb251cd0 100644

--- a/sdk/lib/_internal/pub/lib/src/utils.dart

+++ b/sdk/lib/_internal/pub/lib/src/utils.dart

@@ -371,6 +371,16 @@ Future<Map> mapFromIterableAsync(Iterable iter, {key(element),

})).then((_) => map);

}

+/// Returns a new map with all entries in both [map1] and [map2].

+///

+/// If there are overlapping keys, [map2]'s value wins.

+Map mergeMaps(Map map1, Map map2) {

+ var result = {};

+ result.addAll(map1);

+ result.addAll(map2);

+ return result;

/// Returns the transitive closure of [graph].

///

/// This assumes [graph] represents a graph with a vertex for each key and an