Permalink
Browse files

Final few changes

  • Loading branch information...
1 parent b0f1b0b commit 5d5e87ce68ae206a9e063cb9ff9ef201a363813d @YasserAsmi committed Feb 18, 2014
Showing with 36 additions and 13 deletions.
  1. +2 −12 CMakeLists.txt
  2. BIN docs/jvardocs.tar.gz
  3. +2 −0 docs/readme.txt
  4. +21 −0 license.txt
  5. +11 −1 mainpage.dox
View
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6)
-project(edge)
+project(jvar)
include_directories("include/")
link_directories("lib/")
@@ -11,17 +11,7 @@ set(LIBRARY_OUTPUT_PATH "lib/")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall -Wextra -Wno-unused-parameter -Wno-variadic-macros")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Og -Wall -Wextra -Wno-unused-parameter -Wno-variadic-macros")
-add_library(jvar STATIC base/str.cpp base/util.cpp base/arr.cpp base/var.cpp base/json.cpp)
-add_library(edgedb STATIC db/sql.cpp db/dm.cpp)
-
-add_executable(basetest test/basetest.cpp)
-target_link_libraries(basetest jvar -lrt)
-
-add_executable(parsetest test/parsetest.cpp)
-target_link_libraries(parsetest jvar -lrt)
-
-add_executable(sqltest test/sqltest.cpp)
-target_link_libraries(sqltest edgedb jvar -L/usr/lib/x86_64-linux-gnu -lmysqlclient -lpthread -lz -lm -lrt -ldl)
+add_library(jvar STATIC src/str.cpp src/util.cpp src/arr.cpp src/var.cpp src/json.cpp)
add_executable(ex_basics example/basics.cpp)
target_link_libraries(ex_basics jvar -lrt)
View
Binary file not shown.
View
@@ -0,0 +1,2 @@
+The docs are html.
+To view the docs, please uncompress jvardocs.tar.gz into a folder and open index.html in a browser.
View
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Yasser Asmi
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
View
@@ -1,6 +1,16 @@
/**
\mainpage About jvar
+jvar tries to capture some of the expressiveness of JavaScript and bring it into C++.<p>
-TODO: put more details
+In particular, it implements a Variant type which is similar to 'var' in JS. Like JS, you can store data of any type into it. You can have objects, arrays, arrays of objects, objects with arrays, etc and nest them to any level. You can even have function objects with closure. You can write out Variant as JSON and you can parse JSON directly into a Variant. <P>
+
+Variant combined with JSON and simple automatic memory management make for a very powerful data structure.
+jvar is designed to be very fast. Because the backing data structures are optimized, JSON parsing speed is very fast. Special attention has been paid to how often things are copied and how often memory is allocated.<p>
+
+jvar doesn't use have any dependencies. It doesn't use Boost and hardly uses STL. It only uses std::string--but even with that jvar tries to minimize memory allocations.<p>
+
+Please take a look at the examples to see if you agree with the added expressiveness. <p>
+
+Enjoy.
*/

0 comments on commit 5d5e87c

Please sign in to comment.