Renaming all files to remove the unncessary prefix

CMakeLists.txt

@@ -5,7 +5,7 @@ project(varnam)
 message ("Generating project ${PROJECT_NAME}")
 
 set(VARNAM_LIBRARY_NAME "varnam")
-set(FOREIGN_LIBRARY_NAME "foreign-functions")
+set(DEPS_LIBRARY_NAME "deps")
 
 set(VARNAM_VERSION_MAJOR 1)
 set(VARNAM_VERSION_MINOR 0)
@@ -27,14 +27,14 @@ add_definitions(-DHAVE_SNPRINTF -DPREFER_PORTABLE_SNPRINTF -DNEED_ASPRINTF)
 
 # Append the source files here
 list (APPEND VARNAM_SOURCES
-  varnam-util.c
-  varnam-trie.c
-  varnam-strbuf.c
-  varnam-tl.c
-  varnam-symbol-table.c
-  varnam-words-table.c
-  varnam-array.c
-  varnam-token.c
+  util.c
+  trie.c
+  strbuf.c
+  transliterate.c
+  symbol-table.c
+  words-table.c
+  varray.c
+  token.c
   vword.c
   learn.c
   rendering.c
@@ -45,16 +45,15 @@ list (APPEND VARNAM_SOURCES
 # Append the header files here. this will get copied to include directory
 list (APPEND VARNAM_INCLUDE_FILES
   varnam.h
-  varnam-api.h
-  varnam-result-codes.h
-  varnam-trie.h
-  varnam-types.h
-  varnam-util.h
-  varnam-symbol-table.h
+  api.h
+  result-codes.h
+  vtypes.h
+  util.h
+  varray.h
   )
 
-# Build foreign functions
-add_subdirectory(foreign)
+# Build dependencies
+add_subdirectory(deps)
 
 # Build tests
 add_subdirectory(tests)
@@ -68,15 +67,15 @@ SET_TARGET_PROPERTIES(${VARNAM_LIBRARY_NAME} PROPERTIES
 
 INSTALL ( TARGETS ${VARNAM_LIBRARY_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 INSTALL ( FILES ${VARNAM_INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lib${VARNAM_LIBRARY_NAME})
-INSTALL ( FILES foreign/sqlite3.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lib${VARNAM_LIBRARY_NAME}/foreign)
+INSTALL ( FILES deps/sqlite3.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lib${VARNAM_LIBRARY_NAME}/deps)
 
 IF(CMAKE_COMPILER_IS_GNUCC)
         # sqlite requires pthread and dl
-        target_link_libraries(${VARNAM_LIBRARY_NAME} ${FOREIGN_LIBRARY_NAME} pthread dl)
+        target_link_libraries(${VARNAM_LIBRARY_NAME} ${DEPS_LIBRARY_NAME} pthread dl)
 ENDIF()
 
 IF(MSVC)
-        target_link_libraries(${VARNAM_LIBRARY_NAME} ${FOREIGN_LIBRARY_NAME})
+        target_link_libraries(${VARNAM_LIBRARY_NAME} ${DEPS_LIBRARY_NAME})
 ENDIF()
 
 add_custom_target(vstfiles

varnam-api.h → api.h

@@ -21,9 +21,9 @@
 #define VARNAM_API_H_INCLUDED_093510
 
 #include <stdlib.h>
-#include "varnam-types.h"
-#include "varnam-util.h"
-#include "varnam-array.h"
+#include "vtypes.h"
+#include "util.h"
+#include "varray.h"
 
 /**
  * Initializes the varnam library.

foreign/CMakeLists.txt → deps/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.6)
 
-project (foreign_functions)
+project (deps)
 message ("Generating project ${PROJECT_NAME}")
 
 # This builds the 3rd party code that we uses. It uses very less level of warnings 
@@ -20,9 +20,9 @@ ENDIF()
 
 add_definitions(-DSQLITE_CASE_SENSITIVE_LIKE -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS)
 
-list (APPEND FOREIGN_SOURCES
+list (APPEND DEPS_SOURCES
   snprintf.c
   sqlite3.c
   )
 
-add_library (${FOREIGN_LIBRARY_NAME} STATIC ${FOREIGN_SOURCES})
+add_library (${DEPS_LIBRARY_NAME} STATIC ${DEPS_SOURCES})

foreign/snprintf.c → deps/snprintf.c

@@ -284,7 +284,7 @@
 /* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */
 /* ============================================= */
 
-#include "../varnam-util.h"
+#include "../util.h"
 
 #define PORTABLE_SNPRINTF_VERSION_MAJOR 2
 #define PORTABLE_SNPRINTF_VERSION_MINOR 2

learn.c

@@ -17,13 +17,13 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "varnam-api.h"
-#include "varnam-types.h"
-#include "varnam-array.h"
-#include "varnam-util.h"
-#include "varnam-result-codes.h"
-#include "varnam-symbol-table.h"
-#include "varnam-words-table.h"
+#include "api.h"
+#include "vtypes.h"
+#include "varray.h"
+#include "util.h"
+#include "result-codes.h"
+#include "symbol-table.h"
+#include "words-table.h"
 
 static strbuf*
 sanitize_word (varnam *handle, const char *word)

renderer/ml_unicode.c

@@ -20,10 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <string.h>
 
 #include "renderers.h"
-#include "../varnam-util.h"
-#include "../varnam-types.h"
-#include "../varnam-result-codes.h"
-#include "../varnam-symbol-table.h"
+#include "../util.h"
+#include "../vtypes.h"
+#include "../result-codes.h"
+#include "../symbol-table.h"
 
 #define RENDER_VALUE2_TAG "render_value2"
 #define CHIL_TAG "chill"

renderer/renderers.h

@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef RENDERING_RENDERERS_H_INCLUDED_105305
 #define RENDERING_RENDERERS_H_INCLUDED_105305
 
-#include "../varnam-types.h"
-#include "../varnam-util.h"
+#include "../vtypes.h"
+#include "../util.h"
 
 int
 ml_unicode_renderer(varnam *handle,

rendering.c

@@ -19,14 +19,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include "varnam-symbol-table.h"
-#include "varnam-result-codes.h"
-#include "varnam-array.h"
-#include "varnam-types.h"
+#include "symbol-table.h"
+#include "result-codes.h"
+#include "varray.h"
+#include "vtypes.h"
 #include "rendering.h"
 #include "vword.h"
-#include "varnam-api.h"
-#include "varnam-array.h"
+#include "api.h"
 
 static vtoken_renderer*
 get_renderer(varnam *handle)

rendering.h

@@ -16,8 +16,8 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA */
 
-#include "varnam-types.h"
-#include "varnam-array.h"
+#include "vtypes.h"
+#include "varray.h"
 
 #ifndef RENDERING_H_INCLUDED_200624
 #define RENDERING_H_INCLUDED_200624

varnam-result-codes.h → result-codes.h

@@ -1,4 +1,4 @@
-/* varnam-result-codes.h
+/* Specifies the return codes
  *
  * Copyright (C) Navaneeth.K.N
  *

varnam-strbuf.c → strbuf.c

@@ -1,4 +1,4 @@
-/* strbuf.c - dynamically growing string buffer
+/* Dynamically growing string buffer
  *
  * Copyright (C) Navaneeth.K.N
  *
@@ -22,8 +22,8 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include "varnam-util.h"
-#include "varnam-array.h"
+#include "util.h"
+#include "varray.h"
 
 static int grow_buffer(struct strbuf *string)
 {

varnam-symbol-table.c → symbol-table.c

@@ -19,12 +19,12 @@
 #include <string.h>
 #include <assert.h>
 
-#include "varnam-symbol-table.h"
-#include "varnam-util.h"
-#include "varnam-types.h"
-#include "varnam-result-codes.h"
-#include "varnam-api.h"
-#include "varnam-token.h"
+#include "symbol-table.h"
+#include "util.h"
+#include "vtypes.h"
+#include "result-codes.h"
+#include "api.h"
+#include "token.h"
 
 int
 ensure_schema_exists(varnam *handle, char **msg)

varnam-symbol-table.h → symbol-table.h

@@ -20,8 +20,8 @@
 #ifndef VARNAM_SYMBOL_TABLE_H_INCLUDED_120215
 #define VARNAM_SYMBOL_TABLE_H_INCLUDED_120215
 
-#include "varnam-types.h"
-#include "varnam-array.h"
+#include "vtypes.h"
+#include "varray.h"
 
 /**
  * checks the schema availability. this function will create it when necessary

varnam-token.c → token.c

@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA */
 
 #include <string.h>
-#include "varnam-token.h"
-#include "varnam-types.h"
-#include "varnam-util.h"
-#include "varnam-array.h"
-#include "varnam-result-codes.h"
+#include "token.h"
+#include "vtypes.h"
+#include "util.h"
+#include "varray.h"
+#include "result-codes.h"
 
 static void
 initialize_token (vtoken *tok,

varnam-token.h → token.h

@@ -20,8 +20,8 @@
 #ifndef VARNAM_TOKEN_H_INCLUDED_090112
 #define VARNAM_TOKEN_H_INCLUDED_090112
 
-#include "varnam-types.h"
-#include "varnam-array.h"
+#include "vtypes.h"
+#include "varray.h"
 
 struct token*
 Token(int id, int type, int match_type, const char* pattern, const char* value1, const char* value2, const char* tag);

varnam-tl.c → transliterate.c

@@ -19,14 +19,14 @@
 #include <string.h>
 #include <assert.h>
 
-#include "foreign/sqlite3.h"
-#include "varnam-api.h"
-#include "varnam-util.h"
-#include "varnam-types.h"
-#include "varnam-result-codes.h"
-#include "varnam-symbol-table.h"
-#include "varnam-array.h"
-#include "varnam-token.h"
+#include "deps/sqlite3.h"
+#include "api.h"
+#include "util.h"
+#include "vtypes.h"
+#include "result-codes.h"
+#include "symbol-table.h"
+#include "varray.h"
+#include "token.h"
 #include "vword.h"
 #include "rendering.h"
 

varnam-trie.c → trie.c

@@ -22,9 +22,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "varnam-util.h"
-#include "varnam-trie.h"
-#include "varnam-result-codes.h"
+#include "util.h"
+#include "trie.h"
+#include "result-codes.h"
 
 static struct trie *trie_new(const char *label, void *value)
 {

varnam-trie.h → trie.h

@@ -20,7 +20,7 @@
 #ifndef TRIE_H_INCLUDED_095519
 #define TRIE_H_INCLUDED_095519
 
-#include "varnam-util.h"
+#include "util.h"
 
 struct trie {
     int root; /* if 1, then this is root */

varnam-util.c → util.c

@@ -1,4 +1,4 @@
-/* util.c
+/* Utility functions
  *
  * Copyright (C) 2010 Navaneeth.K.N
  *
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "varnam-util.h"
-#include "varnam-types.h"
+#include "util.h"
+#include "vtypes.h"
 
 /**
  * substr(str,start,length,output) writes length characters of str beginning with start to substring.

varnam-util.h → util.h

@@ -27,8 +27,8 @@ typedef int bool;
 #define false 0
 #define true  1
 
-#include "varnam-array.h"
-#include "varnam-types.h"
+#include "varray.h"
+#include "vtypes.h"
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 

varnam.c

@@ -20,14 +20,14 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "varnam-array.h"
-#include "varnam-api.h"
-#include "varnam-types.h"
-#include "varnam-util.h"
-#include "varnam-result-codes.h"
-#include "varnam-symbol-table.h"
-#include "varnam-words-table.h"
-#include "varnam-token.h"
+#include "varray.h"
+#include "api.h"
+#include "vtypes.h"
+#include "util.h"
+#include "result-codes.h"
+#include "symbol-table.h"
+#include "words-table.h"
+#include "token.h"
 #include "renderer/renderers.h"
 
 static struct varnam_internal*

varnam.h

@@ -22,9 +22,9 @@
 
 #include <stdlib.h>
 
-#include "varnam-util.h"
-#include "varnam-types.h"
-#include "varnam-result-codes.h"
-#include "varnam-api.h"
+#include "util.h"
+#include "vtypes.h"
+#include "result-codes.h"
+#include "api.h"
 
 #endif

varnam-array.c → varray.c

@@ -20,8 +20,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include "varnam-array.h"
-#include "varnam-util.h"
+#include "varray.h"
+#include "util.h"
 
 varray*
 varray_init()