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

Tab removal #753

Merged
merged 3 commits into from
Nov 30, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,11 @@ endif()
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${INCLUDE_EXTERNAL_LIBS_INTERFACE})
if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)))
target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libclang_rt.osx)
else()
${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libclang_rt.osx)
else()
target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME}
${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
endif()
${FDLIBM_TARGET_NAME} ${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
endif()

add_cppcheck_target(${TARGET_NAME})

Expand Down Expand Up @@ -502,7 +502,7 @@ endif()
if(("${PLATFORM}" STREQUAL "DARWIN") AND (NOT (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)))
target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME} ${FDLIBM_TARGET_NAME}
${PREFIX_IMPORTED_LIB}libclang_rt.osx)
else()
else()
target_link_libraries(${TARGET_NAME} ${CORE_TARGET_NAME} ${LIBC_TARGET_NAME} ${FDLIBM_TARGET_NAME}
${PREFIX_IMPORTED_LIB}libgcc ${PREFIX_IMPORTED_LIB}libgcc_eh)
endif()
Expand Down
2 changes: 1 addition & 1 deletion tests/jerry-test-suite/15/15.02/15.02.01/15.02.01-009.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and
// limitations under the License.

var a = new Number(123.5);
var a = new Number(123.5);
assert (typeof Object(a) === 'object');
2 changes: 1 addition & 1 deletion tests/jerry/N.func-expr-strict.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
"use strict";

(function () {
var let = 1;
var let = 1;
})();
12 changes: 6 additions & 6 deletions tests/jerry/array-prototype-concat.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var new_arr = array.concat();

assert(new_arr.length === array.length)
for (i = 0; i < array.length; i++) {
assert(array[i] === new_arr[i]);
assert(array[i] === new_arr[i]);
}

var obj = { concat : Array.prototype.concat };
Expand Down Expand Up @@ -54,7 +54,7 @@ var result = arr1.concat(arr2, arr3, arr4);

assert(result.length === expected.length)
for (i = 0; i < result.length; i++) {
assert(result[i] === expected[i]);
assert(result[i] === expected[i]);
}

var arr1 = [];
Expand All @@ -69,9 +69,9 @@ Object.defineProperty(arr, '0', { 'get' : function () {throw new ReferenceError
arr.length = 1;

try {
arr.concat();
assert(false);
arr.concat();
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
32 changes: 16 additions & 16 deletions tests/jerry/array-prototype-every.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
var array = ["foo", [], Infinity, 4];

function f(arg1, arg2, arg3) {
assert(arg1 === array[arg2]);
assert(arg3 === array);
return true;
assert(arg1 === array[arg2]);
assert(arg3 === array);
return true;
}

assert(array.every(f) === true);

function g(arg1, arg2, arg3) {
if (arg1 === 1) {
return true;
} else {
return false;
}
if (arg1 === 1) {
return true;
} else {
return false;
}
}

var arr1 = [1, 1, 1, 1, 1, 2];
Expand All @@ -42,21 +42,21 @@ var obj = { every : Array.prototype.every };
Object.defineProperty(obj, 'length', { 'get' : function () {throw new ReferenceError ("foo"); } });

try {
obj.every(f);
assert(false);
obj.every(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to get element
var obj = { every : Array.prototype.every, length : 1};
Object.defineProperty(obj, '0', { 'get' : function () {throw new ReferenceError ("foo"); } });

try {
obj.every(f);
assert(false);
obj.every(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
34 changes: 17 additions & 17 deletions tests/jerry/array-prototype-filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@
var array = ["foo", [], Infinity, 4]

function f(arg1, arg2, arg3) {
assert(arg1 === array[arg2]);
assert(arg3 === array);
return true;
assert(arg1 === array[arg2]);
assert(arg3 === array);
return true;
}

var filtered = array.filter(f);
assert(filtered.length === array.length);
for (i = 0; i < filtered.length; i++) {
assert(filtered[i] === array[i]);
assert(filtered[i] === array[i]);
}

var array = [1, 2, 3, 4, 5, 6, 7, 8];

function g (arg1, arg2, arg3) {
if (arg2 % 2 === 0) {
return true;
} else {
return false;
}
if (arg2 % 2 === 0) {
return true;
} else {
return false;
}
}

filtered = array.filter(g)
Expand All @@ -57,11 +57,11 @@ Object.defineProperty(obj, 'length', { 'get' : function () {throw new ReferenceE
obj.filter = Array.prototype.filter;

try {
obj.filter(f);
assert(false);
obj.filter(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to get element
Expand All @@ -71,9 +71,9 @@ Object.defineProperty(obj, '0', { 'get' : function () {throw new ReferenceError
obj.filter = Array.prototype.filter

try {
obj.filter(f);
assert(false);
obj.filter(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
20 changes: 10 additions & 10 deletions tests/jerry/array-prototype-foreach.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
var array = ["foo", [], Infinity, 4]

function f(arg1, arg2, arg3) {
assert(arg1 === array[arg2]);
assert(arg3 === array);
assert(arg1 === array[arg2]);
assert(arg3 === array);
}

array.forEach(f);
Expand All @@ -28,11 +28,11 @@ Object.defineProperty(obj, 'length', { 'get' : function () {throw new ReferenceE
obj.forEach = Array.prototype.forEach;

try {
obj.forEach(f);
assert(false);
obj.forEach(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to get element
Expand All @@ -42,9 +42,9 @@ Object.defineProperty(obj, '0', { 'get' : function () {throw new ReferenceError
obj.forEach = Array.prototype.forEach

try {
obj.forEach(f);
assert(false);
obj.forEach(f);
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
34 changes: 17 additions & 17 deletions tests/jerry/array-prototype-indexof.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,42 +48,42 @@ var arr = [11, 22, 33, 44];
assert(arr.indexOf(44, 4) === -1);

var fromIndex = {
toString: function () {
return {};
},
toString: function () {
return {};
},

valueOf: function () {
return {};
}
valueOf: function () {
return {};
}
};

try {
[0, 1].indexOf(1, fromIndex);
assert(false);
[0, 1].indexOf(1, fromIndex);
assert(false);
} catch (e) {
assert(e instanceof TypeError);
assert(e instanceof TypeError);
}

// Checking behavior when unable to get length
var obj = { indexOf : Array.prototype.indexOf}
Object.defineProperty(obj, 'length', { 'get' : function () { throw new ReferenceError ("foo"); } });

try {
obj.indexOf("bar");
assert(false);
obj.indexOf("bar");
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to get element
var obj = { indexOf : Array.prototype.indexOf, length : 1}
Object.defineProperty(obj, '0', { 'get' : function () { throw new ReferenceError ("foo"); } });

try {
obj.indexOf("bar");
assert(false);
obj.indexOf("bar");
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
16 changes: 8 additions & 8 deletions tests/jerry/array-prototype-lastindexof.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,21 @@ var obj = { lastIndexOf : Array.prototype.lastIndexOf}
Object.defineProperty(obj, 'length', { 'get' : function () { throw new ReferenceError ("foo"); } });

try {
obj.lastIndexOf("bar");
assert(false);
obj.lastIndexOf("bar");
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to get element
var obj = { lastIndexOf : Array.prototype.lastIndexOf, length : 1}
Object.defineProperty(obj, '0', { 'get' : function () { throw new ReferenceError ("foo"); } });

try {
obj.lastIndexOf("bar");
assert(false);
obj.lastIndexOf("bar");
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
24 changes: 12 additions & 12 deletions tests/jerry/array-prototype-pop.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,23 @@ var obj = { pop : Array.prototype.pop };
Object.defineProperty(obj, 'length', { 'get' : function () {throw new ReferenceError ("foo"); } });

try {
obj.pop();
assert(false);
obj.pop();
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when unable to set length
var obj = { pop : Array.prototype.pop };
Object.defineProperty(obj, 'length', { 'set' : function () {throw new ReferenceError ("foo"); } });

try {
obj.pop();
assert(false);
obj.pop();
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}

// Checking behavior when no length property defined
Expand All @@ -67,9 +67,9 @@ var obj = { pop : Array.prototype.pop, length : 1 };
Object.defineProperty(obj, '0', { 'get' : function () {throw new ReferenceError ("foo"); } });

try {
obj.pop();
assert(false);
obj.pop();
assert(false);
} catch (e) {
assert(e.message === "foo");
assert(e instanceof ReferenceError);
assert(e.message === "foo");
assert(e instanceof ReferenceError);
}
Loading