Merge pull request #81 from zbeekman/small-improvements

Small changes and fixes:

Author: jacobwilliams

build.sh

@@ -57,16 +57,24 @@ fi
 #build the stand-alone library:
 echo ""
 echo "Building library..."
-FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static -colors
+
+# work around for FoBiS.py PR #45
+[ -d "$LIBDIR" ] || mkdir "$LIBDIR"
+
+FoBiS.py build -ch -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static -colors
 
 #build the unit tests (uses the above library):
 if [[ $JF_SKIP_TESTS != [yY]* ]]; then
     echo ""
     echo "Building unit tests..."
+
+    # FoBiS.py PR #45 work around
+    [ -d "$BINDIR" ] || mkdir "$BINDIR"
+
     for TEST in "${TESTDIR%/}"/jf_test_*.f90; do
 	THIS_TEST=${TEST##*/}
 	echo "Build ${THIS_TEST%.f90}"
-	FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.f90} -colors
+	FoBiS.py build -ch -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.f90} -colors
     done
 else
     echo "Skip building the unit tests since \$JF_SKIP_TESTS has been set to 'true'."

robodoc.rc

@@ -10,7 +10,7 @@
 #  NOTES
 #    Fortran keywords, statements, data types, intrinsic procedures, etc. from:
 #     [1] http://fortranwiki.org/fortran/show/Keywords
-#     [2] A. M. Gorelik, "Statements, data types and intrinsic procedures 
+#     [2] A. M. Gorelik, "Statements, data types and intrinsic procedures
 #         in the Fortran standards (1966-2008)", ACM SIGPLAN Fortran Forum,
 #         Volume 33 Issue 3, December 2014.
 #
@@ -20,9 +20,12 @@
 #
 #  AUTHOR
 #    Jacob Williams, 3/1/2015
-# 
+#
 #  SOURCE
 
+ignore files:
+    *~
+    #*#
 items:
     AUTHOR
     BUGS

src/json_module.f90

@@ -22,15 +22,15 @@ module json_module
 !    JSON-FORTRAN: A Fortran 2008 JSON API
 !
 !    http://github.com/jacobwilliams/json-fortran
-!  
+!
 !    Copyright (c) 2014, Jacob Williams
 !
 !    All rights reserved.
-!  
+!
 !    Redistribution and use in source and binary forms, with or without modification,
 !    are permitted provided that the following conditions are met:
 !    * Redistributions of source code must retain the above copyright notice, this
-!      list of conditions and the following disclaimer.  
+!      list of conditions and the following disclaimer.
 !    * Redistributions in binary form must reproduce the above copyright notice, this
 !      list of conditions and the following disclaimer in the documentation and/or
 !      other materials provided with the distribution.
@@ -50,18 +50,18 @@ module json_module
 !    Original FSON License:
 !
 !    http://github.com/josephalevin/fson
-!  
+!
 !    Copyright (c) 2012 Joseph A. Levin
-!  
+!
 !    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
@@ -528,7 +528,7 @@ end subroutine array_callback_func
     !     end subroutine example1
     !
     !    Note: it should NOT be called for a json_value pointer than has already been
-    !    added to another json_value structure, since doing so may render the 
+    !    added to another json_value structure, since doing so may render the
     !    other structure invalid.  Consider the following example:
     !     subroutine example2(p)
     !     type(json_value),pointer,intent(out) :: p
@@ -538,7 +538,7 @@ end subroutine array_callback_func
     !     call json_create_object(q,'q')
     !     call json_add(q,'val',1)
     !     call json_add(p, q)  !add q to p structure
-    !     ! do NOT call json_destroy(q) here, because q is 
+    !     ! do NOT call json_destroy(q) here, because q is
     !     ! now part of the output structure p.  p should be destroyed
     !     ! somewhere upstream by the caller of this routine.
     !     nullify(q) !OK, but not strictly necessary
@@ -1566,7 +1566,7 @@ end subroutine json_value_create
 !
 !  AUTHOR
 !    Jacob Williams : 1/22/2014 : The original version of this
-!    routine was not properly freeing the memory.  
+!    routine was not properly freeing the memory.
 !    It has been rewritten.
 !
 !  SOURCE
@@ -4088,7 +4088,7 @@ end subroutine json_get_array
 !
 !  INPUTS
 !    The inputs can be:
-!    * file and unit : the specified unit is used to read JSON from file. 
+!    * file and unit : the specified unit is used to read JSON from file.
 !                      [note if unit is already open, then the filename is ignored]
 !    * file          : JSON is read from file using internal unit number
 !    * str           : JSON data is read from the string instead
@@ -5541,7 +5541,7 @@ end subroutine real_to_string
 !    compact_real_string
 !
 !  DESCRIPTION
-!    Compact a string representing a real number, so that 
+!    Compact a string representing a real number, so that
 !    the same value is displayed with fewer characters.
 !
 !  SEE ALSO
@@ -5714,4 +5714,4 @@ end subroutine json_print_error_message
 
 !*****************************************************************************************
     end module json_module
-!*****************************************************************************************
+!*****************************************************************************************

src/tests/jf_test_9.f90

@@ -48,11 +48,17 @@ module jf_test_9_mod
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
 
     implicit none
+    !small file - 0.0 sec : http://www.json-generator.com
+    !character(len=*),parameter :: filename = 'random1.json'
 
-    !character(len=*),parameter :: filename = 'random1.json'  !small file - 0.0 sec : http://www.json-generator.com
-     character(len=*),parameter :: filename = 'big.json'      !7 MB - 5.4 sec : http://www.json-generator.com
-    !character(len=*),parameter :: filename = 'AllSets.json'  !13 MB - 7.6 sec : http://mtgjson.com
-    !character(len=*),parameter :: filename = '100mb.json'    !100 MB - takes forever... : https://github.com/seductiveapps/largeJSON
+    !7 MB - 5.4 sec : http://www.json-generator.com
+    character(len=*),parameter :: filename = 'big.json'
+
+    !13 MB - 7.6 sec : http://mtgjson.com
+    !character(len=*),parameter :: filename = 'AllSets.json'
+
+    !100 MB - takes forever... : https://github.com/seductiveapps/largeJSON
+    !character(len=*),parameter :: filename = '100mb.json'
 
     character(len=*),parameter :: dir      = '../files/'     !working directory
 
@@ -115,4 +121,4 @@ program jf_test_9
     if (n_errors /= 0) stop 1
 end program jf_test_9
 
-!*******************************************************************************************************
+!*******************************************************************************************************