Make NELEMS type-safe (b417d7d6) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/NativeFileList.mk

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -101,4 +101,5 @@ LATIN_IME_CORE_SRC_FILES := \
	time_keeper.cpp)		time_keeper.cpp)

	LATIN_IME_CORE_TEST_FILES := \		LATIN_IME_CORE_TEST_FILES := \
			defines_test.cpp \
	utils/autocorrection_threshold_utils_test.cpp		utils/autocorrection_threshold_utils_test.cpp

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,13 @@
	// Must be equal to ProximityInfo.MAX_PROXIMITY_CHARS_SIZE in Java		// Must be equal to ProximityInfo.MAX_PROXIMITY_CHARS_SIZE in Java
	#define MAX_PROXIMITY_CHARS_SIZE 16		#define MAX_PROXIMITY_CHARS_SIZE 16
	#define ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE 2		#define ADDITIONAL_PROXIMITY_CHAR_DELIMITER_CODE 2
	#define NELEMS(x) (sizeof(x) / sizeof((x)[0]))
			// TODO: Use size_t instead of int.
			// Disclaimer: You will see a compile error if you use this macro against a variable-length array.
			// Sorry for the inconvenience. It isn't supported.
			template <typename T, int N>
			char (&ArraySizeHelper(T (&array)[N]))[N];
			#define NELEMS(x) (sizeof(ArraySizeHelper(x)))

	AK_FORCE_INLINE static int intArrayToCharArray(const int *const source, const int sourceSize,		AK_FORCE_INLINE static int intArrayToCharArray(const int *const source, const int sourceSize,
	char *dest, const int destSize) {		char *dest, const int destSize) {

0 → 100644

+34 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2014 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			#include "defines.h"

			#include <gtest/gtest.h>

			namespace latinime {
			namespace {

			TEST(DefinesTest, NELEMSForFixedLengthArray) {
			const size_t SMALL_ARRAY_SIZE = 1;
			const size_t LARGE_ARRAY_SIZE = 100;
			int smallArray[SMALL_ARRAY_SIZE];
			int largeArray[LARGE_ARRAY_SIZE];
			EXPECT_EQ(SMALL_ARRAY_SIZE, NELEMS(smallArray));
			EXPECT_EQ(LARGE_ARRAY_SIZE, NELEMS(largeArray));
			}

			} // namespace
			} // namespace latinime