File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- /**
1+ /*
22 Licensed to the Apache Software Foundation (ASF) under one
33 or more contributor license agreements. See the NOTICE file
44 distributed with this work for additional information
1616 specific language governing permissions and limitations
1717 under the License.
1818*/
19-
2019/*
2120 * Generated by PEG.js 0.10.0.
2221 *
Original file line number Diff line number Diff line change 1717 under the License.
1818*/
1919
20- {
21- function merge_obj (obj , secondObj ) {
22- if (! obj)
23- return secondObj;
24-
25- for (var i in secondObj)
26- obj[i] = merge_obj (obj[i], secondObj[i]);
27-
28- return obj;
29- }
30- }
31-
3220/*
3321 * Project: point of entry from pbxproj file
3422 */
@@ -62,7 +50,7 @@ AssignmentList
6250 var returnObject = list[0 ][0 ];
6351 for (var i = 1 ; i < list .length ; i++ ){
6452 var another = list[i][0 ];
65- returnObject = merge_obj (returnObject, another);
53+ returnObject = Object . assign (returnObject, another);
6654 }
6755 return returnObject;
6856 }
You can’t perform that action at this time.
0 commit comments