Merge changes from master related to wiki docs.

Merge branch 'master' into concurrent_httpd

Conflicts:
	README.md

.gitignore

@@ -2,3 +2,6 @@ EIFGENs
 tests/temp/
 .svn/
 *.swp
+*~
+*.scm
+*#

CONTRIBUTING.md

@@ -0,0 +1,142 @@
+# Contributing to this project
+
+Please take a moment to review this document in order to make the contribution
+process easy and effective for everyone involved.
+
+Following these guidelines helps to communicate that you respect the time of
+the developers managing and developing this open source project. In return,
+they should reciprocate that respect in addressing your issue or assessing
+patches and features.
+
+
+## Using the issue tracker
+
+The issue tracker is the preferred channel for [bug reports](#bugs),
+[features requests](#features) and [submitting pull
+requests](#pull-requests), but please respect the following restrictions:
+
+* Please **do not** use the issue tracker for personal support requests (use
+  [Stack Overflow](http://stackoverflow.com) or IRC).
+
+* Please **do not** derail or troll issues. Keep the discussion on topic and
+  respect the opinions of others.
+
+
+<a name="bugs"></a>
+## Bug reports
+
+A bug is a _demonstrable problem_ that is caused by the code in the repository.
+Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Use the GitHub issue search** &mdash; check if the issue has already been
+   reported.
+
+2. **Check if the issue has been fixed** &mdash; try to reproduce it using the
+   latest `master` or development branch in the repository.
+
+3. **Isolate the problem** &mdash; ideally create a [reduced test
+   case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What browser(s) and OS
+experience the problem? What would you expect to be the outcome? All these
+details will help people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` - a link to the reduced test case
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+
+<a name="features"></a>
+## Feature requests
+
+Feature requests are welcome. But take a moment to find out whether your idea
+fits with the scope and aims of the project. It's up to *you* to make a strong
+case to convince the project's developers of the merits of this feature. Please
+provide as much detail and context as possible.
+
+
+<a name="pull-requests"></a>
+## Pull requests
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits.
+
+**Please ask first** before embarking on any significant pull request (e.g.
+implementing features, refactoring code, porting to a different language),
+otherwise you risk spending a lot of time working on something that the
+project's developers might not want to merge into the project.
+
+Please adhere to the coding conventions used throughout a project (indentation,
+accurate comments, etc.) and any other requirements (such as test coverage).
+
+Adhering to the following this process is the best way to get your work
+included in the project:
+
+1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork,
+   and configure the remotes:
+
+   ```bash
+   # Clone your fork of the repo into the current directory
+   git clone https://github.com/<your-username>/<repo-name>
+   # Navigate to the newly cloned directory
+   cd <repo-name>
+   # Assign the original repo to a remote called "upstream"
+   git remote add upstream https://github.com/<upstream-owner>/<repo-name>
+   ```
+
+2. If you cloned a while ago, get the latest changes from upstream:
+
+   ```bash
+   git checkout <dev-branch>
+   git pull upstream <dev-branch>
+   ```
+
+3. Create a new topic branch (off the main project development branch) to
+   contain your feature, change, or fix:
+
+   ```bash
+   git checkout -b <topic-branch-name>
+   ```
+
+4. Commit your changes in logical chunks. Please adhere to these [git commit
+   message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
+   or your code is unlikely be merged into the main project. Use Git's
+   [interactive rebase](https://help.github.com/articles/interactive-rebase)
+   feature to tidy up your commits before making them public.
+
+5. Locally merge (or rebase) the upstream development branch into your topic branch:
+
+   ```bash
+   git pull [--rebase] upstream <dev-branch>
+   ```
+
+6. Push your topic branch up to your fork:
+
+   ```bash
+   git push origin <topic-branch-name>
+   ```
+
+7. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
+    with a clear title and description.
+
+**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
+license your work under the same license as that used by the project.

MIGRATION.md

@@ -0,0 +1,121 @@
+Date: 2015-mar-31
+
+# Goal:
+=======
+- support safe concurrency with EWF
+- provide a concurrent standalone connector
+
+# Status: 
+=========
+- The current version of EWF has mainly 3 connectors: CGI, libFCGI, and nino. 
+  - CGI and libFCGI connectors does not need any concurrency support.
+  - But the nino connector had a pseudo concurrency support with Thread, however one could do write code that result in hasardeous concurrency execution. 
+
+So, it was decided to provide an improved Eiffel web nino connector, and update EWF design to make it concurrency compliant.
+
+# Decisions:
+============
+- instead of updating current nino library, we now have a new "standalone" connector which is inspired by nino, but have support for the 3 concurrency modes: none, thread and SCOOP.
+
+
+# Overview
+==========
+Adding support for SCOOP concurrency mode add constraints to the design, but also helps ensuring the concurrency design of EWF is correct.
+
+As a consequence, we had to introduce a new interface WSF_EXECUTION which is instantiated for each incoming request. See its simplified interface :
+<code lang="eiffel">
+	deferred class WSF_EXECUTION
+
+	feature -- Initialization
+
+		make (req: WGI_REQUEST; res: WGI_RESPONSE)
+			do
+				...
+				īnitialize
+			end
+
+		initialize
+				-- Initialize Current object.
+				--| To be redefined if needed.
+			do
+			end
+		
+
+	feature -- Access
+
+		request: WSF_REQUEST
+				-- Access to request data.
+				-- Header, Query, Post, Input data..
+
+		response: WSF_RESPONSE
+				-- Access to output stream, back to the client.
+
+	feature -- Execution
+
+		execute
+				-- Execute Current `request',
+				-- getting data from `request'
+				-- and response to client via `response'.
+			deferred
+			ensure
+				is_valid_end_of_execution: is_valid_end_of_execution
+			end
+
+	end
+</code>
+
+And the related request execution routines are extracted from WSF_SERVICE which becomes almost useless. The "service" part is not mostly responsible of launching the expected connector and set optional options, and declare the type of "execution" interface.
+
+As a result, the well known WSF_DEFAULT_SERVICE has now a formal generic that should conform to WSF_EXECUTION with a `make' creation procedure. See update code:
+
+<code lang="eiffel">
+	class
+		APPLICATION
+
+	inherit
+		WSF_DEFAULT_SERVICE [APPLICATION_EXECUTION]
+			redefine
+				initialize
+			end
+
+	create
+		make_and_launch
+
+	feature {NONE} -- Initialization
+
+		initialize
+				-- Initialize current service.
+			do
+				set_service_option ("port", 9090)
+			end
+
+	end
+</code>
+
+Where APPLICATION_EXECUTION is an implementation of the WSF_EXECUTION interface (with the `make' creation procedure).
+
+In addition to add better and safer concurrency support, there are other advantages:
+- we now have a clear separation between the service launcher, and the request execution itself.
+- the WSF_EXECUTION is created per request, with two main attributes <code>request: WSF_REQUEST</code> and <code>response: WSF_RESPONSE</code>.
+
+# How to migrate to new design
+- you can check the various example from the EWF repository, there should all be migrated to new design and comparing previous and new code, this will show you how the migration was done.
+- a frequent process:
+   - identify the root class of your service, (the class implementing the WSF_SERVICE), let us name it APPLICATION_SERVICE
+   - copy the APPLICATION_SERVICE file to APPLICATION_EXECUTION file.
+   - change the class name to be APPLICATION_EXECUTION, and replace _SERVICE occurences by _EXECUTION (note the new WSF_ROUTED_EXECUTION and so on, which are mainly migration from previous WSF_ROUTED_SERVICE .., and also  WSF_FILTERED_ROUTED_EXECUTION which is new.
+   - replace "make_and_launch" by "make", remove the initialize redefinition if any.
+   - in the APPLICATION_SERVICE class, remove most of the ROUTED, FILTERED ... inheritance, and keep WSF_DEFAULT_SERVICE, with a new formal generic i.e WSF_DEFAULT_SERVICE [APPLICATION_EXECUTION].
+      - in the eventual redefined initialize, remove code related to routers, filters, ...
+	  - remove all the execution related code.
+   - And you should be done.
+   - To be short, this is mostly creating a new _EXECUTION class, and move the execution related code into this class from the _SERVICE class.
+- Then, you can replace the usage of nino connector by using the new "Standalone" connector, and switch to SCOOP concurrency mode, to ensure you are not messing up with concurrency. Your own code/libraris may not be SCOOP compliant, we recommend to migrate to SCOOP, but as an intermediate solutioņ, you can use the other concurrency mode (none or thread).
+
+Note: the new design impacts the _SERVICE classes, connectors, but WSF_REQUEST, WSF_RESPONSE , WSF_ROUTER are compatible, so the migration is really easy.
+
+We may take the opportunity to update the design deeper according to user feedback, and eventually "wsf" library will be renamed "wsf2".
+This is work in progress, all comments , feedback, suggestions, bug report are welcome. 
+Hopefully before the final version of the new design is out.
+
+

README.md

@@ -3,6 +3,27 @@
 
 ## Overview
 
+The Eiffel Web Framework (EWF) provides Eiffel users with a layer to build anything on top of the http protocol such as websites, web API/services. 
+
+This layer is multi-platform: it can be set on Windows, Linux operating systems, and in addition it can run on top of any httpd servers such as Apache2, IIS, nginx, lighttpd. EWF includes as well a standalone httpd web server component, written in Eiffel, which enables users to run easily a web server on their machine, or even embed this component in any application written with Eiffel.
+
+Currently EWF offers a collection of Eiffel libraries designed to be integrated with each others, and among other functionalities, it give simple access to the request data, to handle content negotiation, url dispatcher, integrate with openid system, and so on. 
+
+There is a growing ecosystem around EWF, that provides useful components:
+* OpenID and OAuth consumer library
+* Various hypermedia format such as HAL, Collection+json, …
+* Websocket server and client
+* Template engine
+* API Auto-documentation with swagger
+* A simple experimental CMS.
+* ...
+
+So if you want to build a website, a web api, RESTful service, …or even if you want to consume other web api, EWF is a solution.
+
+EWF brings with it all the advantages of the Eiffel technology and tools with its powerful features such as Design by Contract, debugging, testing tools which enable to build efficient systems expected to be repeatedly refined, extended, and improved in a predictable and controllable way so as to become with time bugfree systems. Enjoy the full power of debugging your web server application from the IDE.
+
+## Project
+
 Official project site for Eiffel Web Framework:
 
 * http://eiffelwebframework.github.com/EWF/
@@ -14,26 +35,21 @@ For more information please have a look at the related wiki:
 For download, check
 * https://github.com/EiffelWebFramework/EWF/downloads
 
+Tasks and issues are managed with github issue system
+* See https://github.com/EiffelWebFramework/EWF/issues
+* And visual dashboard: https://waffle.io/eiffelwebframework/ewf
+* Forum/group post: https://groups.google.com/forum/#!forum/eiffel-web-framework
+
 ## Requirements
-* Compiling from EiffelStudio 7.0
-* Developped using EiffelStudio 7.1 (on Windows, Linux)
-* Tested using EiffelStudio 7.1 with "jenkins" CI server (not anymore compatible with 6.8 due to use of `TABLE_ITERABLE')
+* Compiling from EiffelStudio 13.11 to 15.05 and more recent version of the compiler.
+* Currently being developped using EiffelStudio 15.01 (on Windows, Linux)
+* Tested using EiffelStudio 15.01 with "jenkins" CI server (not anymore compatible with 6.8 due to use of `TABLE_ITERABLE')
 * The code have to allow __void-safe__ compilation and non void-safe system (see [more about void-safety](http://docs.eiffel.com/book/method/void-safe-programming-eiffel) )
 
 ## How to get the source code?
 
-Using git version >= 1.6.5
-* git clone --recursive https://github.com/EiffelWebFramework/EWF.git
-
-Otherwise, try
+Using git 
 * git clone https://github.com/EiffelWebFramework/EWF.git
-* cd Eiffel-Web-Framework
-* git submodule update --init
-* git submodule foreach --recursive git checkout master
-
-An alternative to the last 2 instructions is to use the script from tools folder:
-* cd tools
-* update_git_working_copy
 
 * And to build the required and related Clibs
   * cd contrib/ise_library/cURL
@@ -51,7 +67,7 @@ An alternative to the last 2 instructions is to use the script from tools folder
 ### protocol
 * __http__: HTTP related classes, constants for status code, content types, ... [read more](library/protocol/http)
 * __uri_template__: URI Template library (parsing and expander) [read more](library/protocol/uri_template)
-* __CONNEG__: CONNEG library (Content-type Negociation) [read more](library/protocol/CONNEG)
+* __CONNEG__: Content negotiation library (Content-type Negociation) [read more](library/protocol/content_negotiation)
 
 ### client
 * __http_client__: simple HTTP client based on cURL [read more](library/client/http_client)
@@ -59,10 +75,6 @@ An alternative to the last 2 instructions is to use the script from tools folder
 ### text
 * __encoder__: Various simpler encoders: base64, url-encoder, xml entities, html entities [read more](library/text/encoder)
 
-### crypto
-* eel
-* eapml
-
 ### Others
 * error: very simple/basic library to handle error
 
@@ -75,6 +87,24 @@ An alternative to the last 2 instructions is to use the script from tools folder
 ## Examples
 ..
 
+## Contributing to this project
+
+Anyone and everyone is welcome to contribute. Please take a moment to
+review the [guidelines for contributing](CONTRIBUTING.md).
+
+* [Bug reports](CONTRIBUTING.md#bugs)
+* [Feature requests](CONTRIBUTING.md#features)
+* [Pull requests](CONTRIBUTING.md#pull-requests)
+
+## Community
+
+Keep track of development and community news.
+
+* Follow [@EiffelWeb](https://twitter.com/EiffelWeb) on Twitter
+* [Forum](https://groups.google.com/forum/#!forum/eiffel-web-framework) on Google groups.
+* Follow our [page](https://plus.google.com/u/0/110650349519032194479) and [community](https://plus.google.com/communities/110457383244374256721) on Google+
+* Have a question that's not a feature request or bug report? [Ask on the mailing list](http://groups.google.com/group/eiffel-web-framework)
+
 
 For more information please have a look at the related wiki:
 * https://github.com/EiffelWebFramework/EWF/wiki

contrib/ise_library/build.eant

@@ -29,7 +29,6 @@
 
 	<target name="_build_tpl_" >
 		<argument name="_target_name" />
-		<geant target="${_target_name}" dir="cURL" file="build.eant" reuse_variables="true" />
 	</target>
 	
 </project>

contrib/ise_library/cURL-safe.ecf

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="curl" uuid="D51EF190-6157-4B47-8E73-FA93DCBB7A71" library_target="curl">
-	<target name="curl">
-		<description>cURL: libcURL wrapper library for Eiffel.
-      Copyright (c) 1984-2006, Eiffel Software and others.
-      Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).</description>
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/\.svn$</exclude>
-			<exclude>/EIFGEN.{0,1}$</exclude>
-			<exclude>/temp$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" cat_call_detection="false" is_attached_by_default="true" void_safety="all" namespace="EiffelSoftware.Library">
-		</option>
-		<setting name="dotnet_naming_convention" value="true"/>
-		<external_include location="$(ECF_CONFIG_PATH)\cURL\spec\include">
-			<condition>
-				<platform value="windows"/>
-			</condition>
-		</external_include>
-		<external_include location="$(ECF_CONFIG_PATH)/cURL/spec/include">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_include>
-		<external_object location="$(ECF_CONFIG_PATH)/cURL/spec/$(ISE_PLATFORM)/lib/eiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)/cURL/spec/$(ISE_PLATFORM)/lib/MTeiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="true"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\eiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="false"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\mteiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="true"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\ileiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<dotnet value="true"/>
-			</condition>
-		</external_object>
-		<library name="api_wrapper" location="$ISE_LIBRARY\library\api_wrapper\api_wrapper-safe.ecf"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<cluster name="curl" location=".\cURL" recursive="true">
-			<file_rule>
-				<exclude>/spec$</exclude>
-				<exclude>/Clib$</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>/gtk$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform value="windows"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/gtk$</exclude>
-				<condition>
-					<platform value="macintosh"/>
-					<custom name="vision_implementation" value="cocoa"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform excluded_value="windows"/>
-					<custom name="vision_implementation" excluded_value="cocoa"/>
-				</condition>
-			</file_rule>
-		</cluster>
-	</target>
-	<target name="curl_dotnet" extends="curl">
-		<setting name="msil_generation" value="true"/>
-	</target>
-</system>

contrib/ise_library/cURL.ecf

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="curl" uuid="D51EF190-6157-4B47-8E73-FA93DCBB7A71" library_target="curl">
-	<target name="curl">
-		<description>cURL: libcURL wrapper library for Eiffel.
-      Copyright (c) 1984-2006, Eiffel Software and others.
-      Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).</description>
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/\.svn$</exclude>
-			<exclude>/EIFGEN.{0,1}$</exclude>
-			<exclude>/temp$</exclude>
-		</file_rule>
-		<option warning="true" namespace="EiffelSoftware.Library">
-		</option>
-		<setting name="dotnet_naming_convention" value="true"/>
-		<external_include location="$(ECF_CONFIG_PATH)\cURL\spec\include">
-			<condition>
-				<platform value="windows"/>
-			</condition>
-		</external_include>
-		<external_include location="$(ECF_CONFIG_PATH)/cURL/spec/include">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_include>
-		<external_object location="$(ECF_CONFIG_PATH)/cURL/spec/$(ISE_PLATFORM)/lib/eiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)/cURL/spec/$(ISE_PLATFORM)/lib/MTeiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="true"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\eiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="false"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\mteiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="true"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ECF_CONFIG_PATH)\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\ileiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<dotnet value="true"/>
-			</condition>
-		</external_object>
-		<library name="api_wrapper" location="$ISE_LIBRARY\library\api_wrapper\api_wrapper.ecf"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<cluster name="curl" location=".\cURL" recursive="true">
-			<file_rule>
-				<exclude>/spec$</exclude>
-				<exclude>/Clib$</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>/gtk$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform value="windows"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/gtk$</exclude>
-				<condition>
-					<platform value="macintosh"/>
-					<custom name="vision_implementation" value="cocoa"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform excluded_value="windows"/>
-					<custom name="vision_implementation" excluded_value="cocoa"/>
-				</condition>
-			</file_rule>
-		</cluster>
-	</target>
-	<target name="curl_dotnet" extends="curl">
-		<setting name="msil_generation" value="true"/>
-	</target>
-</system>

contrib/ise_library/cURL/Clib/Makefile-win.SH

@@ -1,58 +0,0 @@
-TOP = ..
-DIR = $dir_sep
-OUTDIR= .
-INDIR= .
-CC = $cc
-OUTPUT_CMD = $output_cmd
-CFLAGS = -I"$rt_include" -I..$(DIR)spec$(DIR)include -I. \
-	-I..$(DIR)..$(DIR)..$(DIR)C_library$(DIR)libpng  -I..$(DIR)..$(DIR)..$(DIR)C_library$(DIR)zlib
-JCFLAGS = $(CFLAGS) $ccflags $optimize
-JMTCFLAGS = $(CFLAGS) $mtccflags $optimize
-JILCFLAGS = $(CFLAGS) $mtccflags $optimize -DEIF_IL_DLL
-LN = copy
-MV = $mv
-RM = $del
-MAKE = $make
-MKDIR = $mkdir
-LINK = $link32
-DLL_FLAGS = $dll_flags
-DLL_LIBS = $dll_libs
-OBJECTS = eiffel_curl.$obj
-MT_OBJECTS = MTeiffel_curl.$obj
-IL_OBJECTS = ILeiffel_curl.$obj
-
-.c.$obj:
-	$(CC) -c $(JCFLAGS) $<
-
-all:: $output_libraries
-	$(MAKE) clean
-
-standard:: eiffel_curl.lib ileiffel_curl.lib
-mtstandard:: mteiffel_curl.lib
-
-clean:
-	$(RM) *.$obj
-	$(RM) *.lib
-
-eiffel_curl.lib: $(OBJECTS)
-	$alib_line
-	$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
-	$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
-
-mteiffel_curl.lib: $(MT_OBJECTS)
-	$alib_line
-	$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
-	$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
-
-ileiffel_curl.lib: $(IL_OBJECTS)
-	$alib_line
-	$(MKDIR) ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib
-	$(MV) $@ ..$(DIR)spec$(DIR)$(ISE_C_COMPILER)$(DIR)$(ISE_PLATFORM)$(DIR)lib$(DIR)$@
-
-#Multithreaded targets.
-MTeiffel_curl.$obj: eiffel_curl.c
-	$(CC) $(JMTCFLAGS) $(OUTPUT_CMD)$@ -c $?
-
-#.NET targets.
-ILeiffel_curl.$obj: eiffel_curl.c
-	$(CC) $(JILCFLAGS) $(OUTPUT_CMD)$@ -c $?

contrib/ise_library/cURL/Clib/Makefile.SH

@@ -1,92 +0,0 @@
-case $CONFIG in
-'')
-	if test ! -f config.sh; then
-		(echo "Can't find config.sh."; exit 1)
-	fi 2>/dev/null
-	. ./config.sh
-	;;
-esac
-case "$0" in
-*/*) cd `expr X$0 : 'X\(.*\)/'` ;;
-esac
-echo "Extracting "."/Makefile (with variable substitutions)"
-$spitshell >Makefile <<!GROK!THIS!
-########################################################################
-# Makefile generated from Makefile.SH on $DATE
-
-SHELL = /bin/sh
-AR = ar rc
-CC = $cc
-CTAGS = ctags
-INCLUDE = -I$rt_include -I../spec/include -I../../../C_library/libpng -I../../../C_library/zlib
-CFLAGS = $optimize $ccflags $large -g \$(INCLUDE)
-MTCFLAGS = $optimize $mtccflags $large -g \$(INCLUDE)
-SHAREDLINK = $sharedlink
-LDSHAREDFLAGS = $ldsharedflags
-LN = $ln
-MAKE = $make
-MKDEP = $mkdep \$(DPFLAGS) --
-RANLIB = $ranlib
-RM = $rm -f
-MV = $mv
-MKDIR = $mkdir -p
-PLATFORM = $ISE_PLATFORM
-
-########################################################################
-# New suffixes and associated building rules -- edit with care
-
-
-!GROK!THIS!
-$spitshell >>Makefile <<'!NO!SUBS!'
-
-MT_OBJECTS = MTeiffel_curl.o
-OBJECTS = eiffel_curl.o 
-
-ALL_OBJECTS = $(OBJECTS) $(MT_OBJECTS)
-
-all: $(ALL_OBJECTS)
-	$(MKDIR) ../spec/$(PLATFORM)/lib
-	$(MV) $? ../spec/$(PLATFORM)/lib
-	$(MAKE) clobber
-
-MTeiffel_curl.o: eiffel_curl.c
-	$(CC) -c $(MTCFLAGS) $? -o $@
-
-########################################################################
-# Common rules for all Makefiles -- do not edit
-
-emptyrule::
-
-clean: local_clean
-realclean: local_realclean
-clobber: local_clobber
-
-local_clean::
-	$(RM) core *~ *.o *.so *.a
-
-local_realclean:: local_clean
-
-local_clobber:: local_realclean
-	$(RM) Makefile config.sh
-
-Makefile: Makefile.SH
-	/bin/sh Makefile.SH
-
-tags::
-	$(CTAGS) -w *.[ch]
-	$(CTAGS) -xw *.[ch] > tags
-
-local_clobber::
-	$(RM) tags
-
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
-
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
-	@echo "You must run 'make depend' in $(TOP) first."; exit 1
-!NO!SUBS!
-chmod 644 Makefile
-$eunicefix Makefile
-

contrib/ise_library/cURL/Clib/build.eant

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<project name="build_curl_clib" default="help">
-
-	<description>
-		description: "cURL Clib library compilation"
-	</description>
-
-	<target name="help">
-		<echo message="usage:"/>
-		<echo message=" geant compile"/>
-		<echo message=" geant clean"/>
-		<echo message=" geant clobber"/>
-	</target>
-	
-	<target name="compile" >
-		<exec executable="finish_freezing -library" />
-	</target>
-	
-	<target name="clean" >
-	</target>
-
-	<target name="clobber" depend="clean" />
-	
-</project>

contrib/ise_library/cURL/Clib/eiffel_curl.c

@@ -1,188 +0,0 @@
-/*
-indexing
-	description: "Functions used by the class CURL_FUNCTION."
-	copyright:	"Copyright (c) 1984-2006, Eiffel Software and others"
-	license:	"Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			 Eiffel Software
-			 356 Storke Road, Goleta, CA 93117 USA
-			 Telephone 805-685-1006, Fax 805-685-6869
-			 Website http://www.eiffel.com
-			 Customer support http://support.eiffel.com
-		]"
-*/
-
-#include "eiffel_curl.h"
-
-typedef EIF_INTEGER (* EIF_CURL_PROGRESS_PROC) (
-#ifndef EIF_IL_DLL
-	EIF_REFERENCE,  /* CURL_FUNCTION Eiffel object */
-#endif
-	EIF_POINTER, /* a_user_pointer */
-	EIF_REAL_64, /* a_dltotal */
-	EIF_REAL_64, /* a_dlnow */
-	EIF_REAL_64, /* a_ultotal */
-	EIF_REAL_64  /* a_ulnow */
-	);
-	
-typedef EIF_INTEGER (* EIF_CURL_WRITE_PROC) (
-#ifndef EIF_IL_DLL
-	EIF_REFERENCE,  /* CURL_FUNCTION Eiffel object */
-#endif
-	EIF_POINTER, /* a_data_pointer */
-	EIF_INTEGER, /* a_size */
-	EIF_INTEGER, /* a_nmemb */
-	EIF_POINTER  /* a_write_pointer */
-	);
-
-typedef EIF_INTEGER (* EIF_CURL_READ_PROC) (
-#ifndef EIF_IL_DLL
-	EIF_REFERENCE,  /* CURL_FUNCTION Eiffel object */
-#endif
-	EIF_POINTER, /* a_data_pointer */
-	EIF_INTEGER, /* a_size */
-	EIF_INTEGER, /* a_nmemb */
-	EIF_POINTER  /* a_write_pointer */
-	);
-
-	
-typedef EIF_INTEGER (* EIF_CURL_DEBUG_PROC) (
-#ifndef EIF_IL_DLL
-	EIF_REFERENCE,  /* CURL_FUNCTION Eiffel object */
-#endif
-	EIF_POINTER, /* a_curl_handle */
-	EIF_INTEGER, /* a_curl_infotype */
-	EIF_POINTER, /* a_char_pointer */
-	EIF_INTEGER, /* a_size */
-	EIF_POINTER  /* a_user_pointer */
-	);
-
-static EIF_OBJECT eiffel_function_object = NULL;
-	/* Address of Eiffel object CURL_FUNCTION */
-	
-static EIF_CURL_PROGRESS_PROC eiffel_progress_function = NULL;
-	/* Address of Eiffel CURL_FUNCTION.progress_function */
-
-static EIF_CURL_WRITE_PROC eiffel_write_function = NULL;
-	/* Address of Eiffel CURL_FUNCTION.write_function */
-	
-static EIF_CURL_READ_PROC eiffel_read_function = NULL;
-	/* Address of Eiffel CURL_FUNCTION.read_function */
-	
-static EIF_CURL_DEBUG_PROC eiffel_debug_function = NULL;
-	/* Address of Eiffel CURL_FUNCTION.debug_function */
-
-/* Set Eiffel CURL_FUNCTION object address */
-void c_set_object(EIF_REFERENCE a_address)
-{
-	if (a_address) {
-		eiffel_function_object = eif_protect (a_address);
-	} else {
-		eiffel_function_object = NULL;
-	}
-}
-
-/* Release Eiffel CURL_FUNCTION object address */
-void c_release_object()
-{
-	eif_wean (eiffel_function_object);
-}
-
-/* Set CURL_FUNCTOIN.progress_function address */
-void c_set_progress_function_address( EIF_POINTER a_address)
-{
-	eiffel_progress_function = (EIF_CURL_PROGRESS_PROC) a_address;
-}
-
-/* Set CURL_FUNCTOIN.write_function address */
-void c_set_write_function_address( EIF_POINTER a_address)
-{
-	eiffel_write_function = (EIF_CURL_WRITE_PROC) a_address;
-}
-
-/* Set CURL_FUNCTOIN.read_function address */
-void c_set_read_function_address( EIF_POINTER a_address)
-{
-	eiffel_read_function = (EIF_CURL_READ_PROC) a_address;
-}
-
-/* Set CURL_FUNCTOIN.debug_function address */
-void c_set_debug_function_address (EIF_POINTER a_address)
-{
-	eiffel_debug_function = (EIF_CURL_DEBUG_PROC) a_address;
-}
-
-/* 	Eiffel adapter function for CURLOPT_WRITEFUNCTION
-		We need this function since Eiffel function call need first parameter is EIF_REFERENCE. */
-size_t curl_write_function (void *ptr, size_t size, size_t nmemb, void *data)
-{
-	if (eiffel_function_object) {
-		return (size_t) ((eiffel_write_function) (
-#ifndef EIF_IL_DLL
-			(EIF_REFERENCE) eif_access (eiffel_function_object),
-#endif
-			(EIF_POINTER) ptr,
-			(EIF_INTEGER) size,
-			(EIF_INTEGER) nmemb,
-			(EIF_POINTER) data));
-	} else {
-		return 0;
-	}  
-}
-
-/* 	Eiffel adapter function for CURLOPT_READFUNCTION
-		We need this function since Eiffel function call need first parameter is EIF_REFERENCE. */
-size_t curl_read_function (void *ptr, size_t size, size_t nmemb, void *data)
-{
-	if (eiffel_function_object) {
-		return (size_t) ((eiffel_read_function) (
-#ifndef EIF_IL_DLL
-			(EIF_REFERENCE) eif_access (eiffel_function_object),
-#endif
-			(EIF_POINTER) ptr,
-			(EIF_INTEGER) size,
-			(EIF_INTEGER) nmemb,
-			(EIF_POINTER) data));
-	} else {
-		return 0;
-	}  
-}
-
-
-/* 	Eiffel adapter function for CURLOPT_PROGRESSFUNCTION
-		We need this function since Eiffel function call need first parameter is EIF_REFERENCE. */
-size_t curl_progress_function (void * a_object_id, double a_dltotal, double a_dlnow, double a_ultotal, double a_ulnow)
- {
-	if (eiffel_function_object) {
-		return (size_t) ((eiffel_progress_function) (
-#ifndef EIF_IL_DLL
-			(EIF_REFERENCE) eif_access (eiffel_function_object),
-#endif
-			(EIF_POINTER) a_object_id,
-			(EIF_REAL_64) a_dltotal,
-			(EIF_REAL_64) a_dlnow,
-			(EIF_REAL_64) a_ultotal,
-			(EIF_REAL_64) a_ulnow));
-	} else {
-		return 0;
-	}   
- }
-
-/* 	Eiffel adapter function for CURLOPT_DEBUGFUNCTION
-		We need this function since Eiffel function call need first parameter is EIF_REFERENCE. */ 
-size_t curl_debug_function (CURL * a_curl_handle, curl_infotype a_curl_infotype, unsigned char * a_char_pointer, size_t a_size, void * a_object_id)
- {
-	if (eiffel_function_object) {
-		return (size_t) ((eiffel_debug_function) (
-#ifndef EIF_IL_DLL
-			(EIF_REFERENCE) eif_access (eiffel_function_object),
-#endif
-			(EIF_POINTER) a_curl_handle,
-			(EIF_INTEGER) a_curl_infotype,
-			(EIF_POINTER) a_char_pointer,
-			(EIF_INTEGER) a_size,
-			(EIF_POINTER) a_object_id));
-	} else {
-		return 0;
-	}   
- }

contrib/ise_library/cURL/build.eant

@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<project name="build_curl" default="help">
-
-	<description>
-		description: "cURL library compilation"
-	</description>
-
-	<target name="help">
-		<echo message="usage:"/>
-		<echo message=" geant compile"/>
-		<echo message=" geant clean"/>
-		<echo message=" geant clobber"/>
-	</target>
-	
-	<target name="compile">
-		<echo message="- Compile [cURL]" />
-		<geant target="compile" file="build.eant" dir="Clib" 
-			reuse_variables="true" />
-	</target>
-	
-	<target name="clean">
-		<echo message="- Clean [cURL]" />
-		<delete directory="spec\${ISE_C_COMPILER}\${ISE_PLATFORM}" />
-	</target>
-
-	<target name="clobber" depend="clean" />
-	
-</project>

contrib/ise_library/cURL/cURL-safe.ecf

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="curl" uuid="D51EF190-6157-4B47-8E73-FA93DCBB7A71" library_target="curl">
-	<target name="curl">
-		<description>cURL: libcURL wrapper library for Eiffel.
-      Copyright (c) 1984-2006, Eiffel Software and others.
-      Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).</description>
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/\.svn$</exclude>
-			<exclude>/EIFGEN.{0,1}$</exclude>
-			<exclude>/temp$</exclude>
-		</file_rule>
-		<option warning="true" full_class_checking="true" cat_call_detection="false" is_attached_by_default="true" void_safety="all" namespace="EiffelSoftware.Library">
-		</option>
-		<setting name="dotnet_naming_convention" value="true"/>
-		<external_include location="$(ISE_LIBRARY)\library\cURL\spec\include">
-			<condition>
-				<platform value="windows"/>
-			</condition>
-		</external_include>
-		<external_include location="$(ISE_LIBRARY)/library/cURL/spec/include">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_include>
-		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/eiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/MTeiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="true"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\eiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="false"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\mteiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="true"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\ileiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<dotnet value="true"/>
-			</condition>
-		</external_object>
-		<library name="api_wrapper" location="$ISE_LIBRARY\library\api_wrapper\api_wrapper-safe.ecf"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<cluster name="curl" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/spec$</exclude>
-				<exclude>/Clib$</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>/gtk$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform value="windows"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/gtk$</exclude>
-				<condition>
-					<platform value="macintosh"/>
-					<custom name="vision_implementation" value="cocoa"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform excluded_value="windows"/>
-					<custom name="vision_implementation" excluded_value="cocoa"/>
-				</condition>
-			</file_rule>
-		</cluster>
-	</target>
-	<target name="curl_dotnet" extends="curl">
-		<setting name="msil_generation" value="true"/>
-	</target>
-</system>

contrib/ise_library/cURL/cURL.ecf

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-5-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-5-0 http://www.eiffel.com/developers/xml/configuration-1-5-0.xsd" name="curl" uuid="D51EF190-6157-4B47-8E73-FA93DCBB7A71" library_target="curl">
-	<target name="curl">
-		<description>cURL: libcURL wrapper library for Eiffel.
-      Copyright (c) 1984-2006, Eiffel Software and others.
-      Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt).</description>
-		<root all_classes="true"/>
-		<file_rule>
-			<exclude>/\.svn$</exclude>
-			<exclude>/EIFGEN.{0,1}$</exclude>
-			<exclude>/temp$</exclude>
-		</file_rule>
-		<option warning="true" namespace="EiffelSoftware.Library">
-		</option>
-		<setting name="dotnet_naming_convention" value="true"/>
-		<external_include location="$(ISE_LIBRARY)\library\cURL\spec\include">
-			<condition>
-				<platform value="windows"/>
-			</condition>
-		</external_include>
-		<external_include location="$(ISE_LIBRARY)/library/cURL/spec/include">
-			<condition>
-				<platform excluded_value="windows"/>
-			</condition>
-		</external_include>
-		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/eiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)/library/cURL/spec/$(ISE_PLATFORM)/lib/MTeiffel_curl.o">
-			<condition>
-				<platform excluded_value="windows"/>
-				<multithreaded value="true"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\eiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="false"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\mteiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<multithreaded value="true"/>
-				<dotnet value="false"/>
-			</condition>
-		</external_object>
-		<external_object location="$(ISE_LIBRARY)\library\cURL\spec\$(ISE_C_COMPILER)\$(ISE_PLATFORM)\lib\ileiffel_curl.lib">
-			<condition>
-				<platform value="windows"/>
-				<dotnet value="true"/>
-			</condition>
-		</external_object>
-		<library name="api_wrapper" location="$ISE_LIBRARY\library\api_wrapper\api_wrapper.ecf"/>
-		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<cluster name="curl" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/spec$</exclude>
-				<exclude>/Clib$</exclude>
-			</file_rule>
-			<file_rule>
-				<exclude>/gtk$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform value="windows"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/gtk$</exclude>
-				<condition>
-					<platform value="macintosh"/>
-					<custom name="vision_implementation" value="cocoa"/>
-				</condition>
-			</file_rule>
-			<file_rule>
-				<exclude>/mswin$</exclude>
-				<exclude>/mac$</exclude>
-				<condition>
-					<platform excluded_value="windows"/>
-					<custom name="vision_implementation" excluded_value="cocoa"/>
-				</condition>
-			</file_rule>
-		</cluster>
-	</target>
-	<target name="curl_dotnet" extends="curl">
-		<setting name="msil_generation" value="true"/>
-	</target>
-</system>

contrib/ise_library/cURL/curl_codes.e

@@ -1,336 +0,0 @@
-note
-	description: "[
-						All possible error codes from all sorts of curl functions.
-						Future versions	may return other values, stay prepared.
-																					]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_CODES
-
-feature -- Eiffel cURL: Constants
-
-	eiffelcurle_error_occurred: INTEGER = -1
-			-- Error occurred in Eiffel cURL internals
-
-feature -- Constants
-
-	curle_ok: INTEGER = 0
-			-- Declared as CURLE_OK
-
-	curle_unsupported_protocol: INTEGER = 1
-			-- Declared as CURLE_UNSUPPORTED_PROTOCOL
-
-	curle_failed_init: INTEGER = 2
-			-- Declared as CURLE_FAILED_INIT
-
-  	curle_url_malformat: INTEGER = 3
-  			-- Declared as CURLE_URL_MALFORMAT
-
- 	curle_obsolete4: INTEGER = 4
- 	 		-- Declared as CURLE_OBSOLETE4
- 	 		-- NOT USED
-
- 	curle_couldnt_resolve_proxy: INTEGER = 5
- 			-- Declared as CURLE_COULDNT_RESOLVE_PROXY
-
-  	curle_couldnt_resolve_host: INTEGER = 6
-  			-- Declared as CURLE_COULDNT_RESOLVE_HOST
-
-  	curle_couldnt_connect: INTEGER = 7
-  			-- Declared as CURLE_COULDNT_CONNECT
-
-  	curle_ftp_weird_server_reply: INTEGER = 8
-  			-- Declared as CURLE_FTP_WEIRD_SERVER_REPLY
-
-	curle_remote_access_denied: INTEGER = 9
-			-- Declared as CURLE_REMOTE_ACCESS_DENIED
-			-- A service was denied by the server due to lack of access
-			-- when login fails this is not returned.
-
-	curle_obsolete10: INTEGER = 10
-			-- Declared as CURLE_OBSOLETE10 NOT USED
-
-	curle_ftp_weird_pass_reply: INTEGER = 11
-			-- Declared as CURLE_FTP_WEIRD_PASS_REPLY
-
-  	curle_obsolete12: INTEGER = 12
-  			-- Declared as CURLE_OBSOLETE12 NOT USED
-
-	curle_ftp_weird_pasv_reply: INTEGER = 13
-			-- Declared as CURLE_FTP_WEIRD_PASV_REPLY
-
-  	curle_ftp_weird_227_format: INTEGER = 14
-  			-- Declared as CURLE_FTP_WEIRD_227_FORMAT
-
-	curle_ftp_cant_get_host: INTEGER = 15
-			-- Declared as CURLE_FTP_CANT_GET_HOST
-
-  	curle_obsolete16: INTEGER = 16
-  			-- Declared as CURLE_OBSOLETE16
-  			-- NOT USED
-
-	curle_ftp_couldnt_set_type: INTEGER = 17
-			-- Declared as CURLE_FTP_COULDNT_SET_TYPE
-
-	curle_partial_file: INTEGER = 18
-			-- Declared as CURLE_PARTIAL_FILE
-
-  	curle_ftp_couldnt_retr_file: INTEGER = 19
-  			-- Declared as CURLE_FTP_COULDNT_RETR_FILE
-
-  	curle_obsolete20: INTEGER = 20
-  			-- Declared as CURLE_OBSOLETE20
-  			-- NOT USED
-
-  	curle_quote_error: INTEGER = 21
-  			-- Declared as CURLE_QUOTE_ERROR
-  			-- quote command failure
-
-  	curle_http_returned_error: INTEGER = 22
-  			-- Declared as CURLE_HTTP_RETURNED_ERROR
-
-  	curle_write_error: INTEGER = 23
-  			-- Declared as CURLE_WRITE_ERROR
-
-  	curle_obsolete24: INTEGER = 24
-  			-- Declared as CURLE_OBSOLETE24 NOT USED
-
-	curle_upload_failed: INTEGER = 25
-  			-- Declared as CURLE_UPLOAD_FAILED
-  			-- failed upload "command"
-
-	curle_read_error: INTEGER = 26
-  			-- Declared as CURLE_READ_ERROR
-  			-- couldn't open/read from file
-
-	curle_out_of_memory: INTEGER = 27
-  			-- Declared as CURLE_OUT_OF_MEMORY
-  			-- Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
-  			-- instead of a memory allocation error if CURL_DOES_CONVERSIONS
-  			-- is defined
-
-	curle_operation_timedout: INTEGER = 28
-  			-- Declared as CURLE_OPERATION_TIMEDOUT
-  			-- the timeout time was reached
-
-	curle_obsolete29: INTEGER = 29
-			-- Declared as CURLE_OBSOLETE29
-			-- NOT USED
-
-	curle_ftp_port_failed: INTEGER = 30
-			-- Declared as CURLE_FTP_PORT_FAILED
-			-- FTP PORT operation failed
-
-	curle_ftp_couldnt_use_rest: INTEGER = 31
-			-- Declared as CURLE_FTP_COULDNT_USE_REST
-			-- the REST command failed
-
-	curle_obsolete32: INTEGER = 32
-			-- Declared as CURLE_OBSOLETE32
-			-- NOT USED
-
-	curle_range_error: INTEGER = 33
-			-- Declared as CURLE_RANGE_ERROR
-			-- RANGE "command" didn't work
-
-	curle_http_post_error: INTEGER = 34
-			-- Declared as CURLE_HTTP_POST_ERROR
-
-	curle_ssl_connect_error: INTEGER = 35
-			-- Declared CURLE_SSL_CONNECT_ERROR
-			-- wrong when connecting with SSL
-
-	curle_bad_download_resume: INTEGER = 36
-			-- Declared as CURLE_BAD_DOWNLOAD_RESUME
-			-- couldn't resume download
-
-	curle_file_couldnt_read_file: INTEGER = 37
-			-- Declared as CURLE_FILE_COULDNT_READ_FILE
-
-	curle_ldap_cannot_bind: INTEGER = 38
-			-- Declared as CURLE_LDAP_CANNOT_BIND
-
-	curle_ldap_search_failed: INTEGER = 39
-			-- Declared as CURLE_LDAP_SEARCH_FAILED
-
-	curle_obsolete40: INTEGER = 40
-			-- Declared as CURLE_OBSOLETE40
-			-- NOT USED
-
-	curle_function_not_found: INTEGER = 41
-			-- Declared as CURLE_FUNCTION_NOT_FOUND
-
-	curle_aborted_by_callback: INTEGER = 42
-			-- Declared as CURLE_ABORTED_BY_CALLBACK
-
-	curle_bad_function_argument: INTEGER = 43
-			-- Declared as CURLE_BAD_FUNCTION_ARGUMENT
-
-	curle_obsolete44: INTEGER = 44
-			-- Declared as CURLE_OBSOLETE44
-			-- NOT USED
-
-	curle_interface_failed: INTEGER = 45
-			-- Declared as CURLE_INTERFACE_FAILED
-			-- CURLOPT_INTERFACE failed
-
-	curle_obsolete46: INTEGER = 46
-			-- Declared as CURLE_OBSOLETE46
-			-- NOT USED
-
-	curle_too_many_redirects: INTEGER = 47
-			-- Declared as CURLE_TOO_MANY_REDIRECTS
-			-- catch endless re-direct loops
-
-	curle_unknown_telnet_option: INTEGER = 48
-			-- Declared as CURLE_UNKNOWN_TELNET_OPTION
-			-- User specified an unknown option
-
-	curle_telnet_option_syntax: INTEGER = 49
-			-- Declared as CURLE_TELNET_OPTION_SYNTAX
-			-- Malformed telnet option
-
-	curle_obsolete50: INTEGER = 50
-			-- Declared as CURLE_OBSOLETE50
-			-- NOT USED
-
-	curle_ssl_peer_certificate: INTEGER = 51
-			-- Declared as CURLE_SSL_PEER_CERTIFICATE
-			-- peer's certificate wasn't ok
-
-	curle_got_nothing: INTEGER = 52
-			-- Declared as CURLE_GOT_NOTHING
-			-- when this is a specific error
-
-	curle_ssl_engine_notfound: INTEGER = 53
-			-- Declared as CURLE_SSL_ENGINE_NOTFOUND
-			-- SSL crypto engine not found */
-
-	curle_ssl_engine_setfailed: INTEGER = 54
-			-- Declared as CURLE_SSL_ENGINE_SETFAILED
-			-- can not set SSL crypto engine as default
-
-	curle_send_error: INTEGER = 55
-			-- Declared as CURLE_SEND_ERROR
-			-- failed sending network data
-
-	curle_recv_error: INTEGER = 56
-			-- Declared as CURLE_RECV_ERROR
-			-- failure in receiving network data
-
-	curle_obsolete57: INTEGER = 57
-			-- Declared as CURLE_OBSOLETE57
-			-- NOT IN USE
-
-	curle_ssl_certproblem: INTEGER = 58
-			-- Declared as CURLE_SSL_CERTPROBLEM
-			-- problem with the local certificate
-
-	curle_ssl_cipher: INTEGER = 59
-			-- Declared as CURLE_SSL_CIPHER
-			-- couldn't use specified cipher
-
-	curle_ssl_cacert: INTEGER = 60
-			-- Declared as CURLE_SSL_CACERT
-			-- problem with the CA cert (path?)
-
-	curle_bad_content_encoding: INTEGER = 61
-			-- Declared as CURLE_BAD_CONTENT_ENCODING
-			-- Unrecognized transfer encoding
-
-	curle_ldap_invalid_url: INTEGER = 62
-			-- Declared as CURLE_LDAP_INVALID_URL
-			-- Invalid LDAP URL
-
-	curle_filesize_exceeded: INTEGER = 63
-			-- Declared as CURLE_FILESIZE_EXCEEDED
-			-- Maximum file size exceeded
-
-	curle_use_ssl_failed: INTEGER = 64
-			-- Declared as CURLE_USE_SSL_FAILED
-			-- Requested FTP SSL level failed
-
-	curle_send_fail_rewind: INTEGER = 65
-			-- Declared as CURLE_SEND_FAIL_REWIND
-			-- Sending the data requires a rewind that failed
-
-	curle_ssl_engine_initfailed: INTEGER = 66
-			-- Declared as CURLE_SSL_ENGINE_INITFAILED
-			-- failed to initialise ENGINE
-
-	curle_login_denied: INTEGER = 67
-			-- Declared as CURLE_LOGIN_DENIED
-			-- user, password or similar was not accepted and we failed to login
-
-	curle_tftp_notfound: INTEGER = 68
-			-- Declared as CURLE_TFTP_NOTFOUND
-			-- file not found on server
-
-	curle_tftp_perm: INTEGER = 69
-			-- Declared as CURLE_TFTP_PERM
-			-- permission problem on server
-
-	curle_remote_disk_full: INTEGER = 70
-			-- Declared as CURLE_REMOTE_DISK_FULL
-			-- out of disk space on server
-
-	curle_tftp_illegal: INTEGER = 71
-			-- Declared as CURLE_TFTP_ILLEGAL
-			-- Illegal TFTP operation
-
-	curle_tftp_unknownid: INTEGER = 72
-			-- Declared as CURLE_TFTP_UNKNOWNID
-			-- Unknown transfer ID
-
-	curle_remote_file_exists: INTEGER = 73
-			-- Declared as CURLE_REMOTE_FILE_EXISTS
-			-- File already exists
-
-	curle_tftp_nosuchuser: INTEGER = 74
-			-- Declared as CURLE_TFTP_NOSUCHUSER
-			-- No such user
-
-	curle_conv_failed: INTEGER = 75
-			-- Declared as CURLE_CONV_FAILED
-			-- conversion failed
-
-	curle_conv_reqd: INTEGER = 76
-			-- Declared as CURLE_CONV_REQD
-			-- caller must register conversion callbacks using curl_easy_setopt options
-            -- CURLOPT_CONV_FROM_NETWORK_FUNCTION, CURLOPT_CONV_TO_NETWORK_FUNCTION, and
-            -- CURLOPT_CONV_FROM_UTF8_FUNCTION
-
-	curle_ssl_cacert_badfile: INTEGER = 77
-			-- Declared as CURLE_SSL_CACERT_BADFILE
-			-- could not load CACERT file, missing or wrong format
-
-	curle_remote_file_not_found: INTEGER = 78
-			-- Declared as CURLE_REMOTE_FILE_NOT_FOUND
-			-- remote file not found
-
-	curle_ssh: INTEGER = 79
-			-- Declared as CURLE_SSH
-			-- error from the SSH layer, somewhat generic so the error message will be of
-            -- interest when this has happened
-
-	curle_ssl_shutdown_failed: INTEGER = 80;
-			-- Declared as CURLE_SSL_SHUTDOWN_FAILED
-			-- Failed to shut down the SSL connection
-	
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_default_function.e

@@ -1,104 +0,0 @@
-note
-	description: "[
-					Default implementation of CURL_FUNCTION.
-																				]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_DEFAULT_FUNCTION
-
-inherit
-	CURL_FUNCTION
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make
-			-- Creation method
-		do
-			set_object_and_function_address
-		end
-
-feature -- Command
-
-	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER
-		do
-		end
-
-	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
-		local
-			l_c_string: C_STRING
-		do
-				-- Returns the number of bytes actually saved into object identified by `a_object_id'
-			Result := a_size * a_nmemb
-			create l_c_string.make_shared_from_pointer_and_count (a_data_pointer, Result)
-
-			check attached {CURL_STRING} (create {IDENTIFIED}).id_object (a_object_id.to_integer_32) as l_string then
-				l_string.append (l_c_string.substring (1, Result))
-			end
-		end
-
-	read_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
-			-- A callback readfunction
-		do
-		end
-
-	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER
-		local
-			l_c_string: C_STRING
-		do
-			inspect
-				a_curl_infotype
-			when {CURL_INFO_TYPE}.curlinfo_data_in then
-				dump ("<= Recv data", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_data_out then
-				dump ("=> Send data", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_header_in then
-				dump ("<= Recv header", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_header_out then
-				dump ("=> Send header", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_ssl_data_in then
-				dump ("<= Recv SSL data", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_ssl_data_out then
-				dump ("=> Send SSL data", a_char_pointer, a_size)
-			when {CURL_INFO_TYPE}.curlinfo_text then
-				create l_c_string.make_by_pointer_and_count (a_char_pointer, a_size)
-				print ("%N== Info: " + l_c_string.string)
-			else
-				check type_unknow: False end
-			end
-		end
-
-feature {NONE} -- Implementation
-
-	dump (a_text: STRING; a_char_pointer: POINTER; a_size: INTEGER)
-			-- Dump debug information
-		require
-			not_void: a_text /= Void
-			exists: a_char_pointer /= default_pointer
-			non_negative: a_size >= 0
-		local
-			l_c_string: C_STRING
-		do
-			create l_c_string.make_shared_from_pointer_and_count (a_char_pointer, a_size)
-			print ("%N" + a_text + "%N" + l_c_string.string)
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_easy_externals.e

@@ -1,409 +0,0 @@
-note
-	description: "[
-					cURL easy externals.
-					For more informaton see:
-					http://curl.haxx.se/libcurl/c/
-																		]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_EASY_EXTERNALS
-
-feature -- Command
-
-	init: POINTER
-			-- Declared as curl_easy_init().
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_init")
-			if l_api /= default_pointer then
-				Result := c_init (l_api)
-			end
-		ensure
-			exists: Result /= default_pointer
-		end
-
-	setopt_string (a_curl_handle: POINTER; a_opt: INTEGER; a_string: READABLE_STRING_GENERAL)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-			not_void: a_string /= Void
-		local
-			l_api: POINTER
-			l_c_str: C_STRING
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				create l_c_str.make (a_string)
-				c_setopt (l_api, a_curl_handle, a_opt, l_c_str.item)
-			end
-		end
-
-	setopt_form (a_curl_handle: POINTER; a_opt: INTEGER; a_form: CURL_FORM)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-			not_void: a_form /= Void and then a_form.is_exists
-		do
-			setopt_void_star (a_curl_handle, a_opt, a_form.item)
-		end
-
-	setopt_slist (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_slist: POINTER)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: a_opt = {CURL_OPT_CONSTANTS}.curlopt_httpheader
-			exists: a_curl_slist /= default_pointer
-		do
-			setopt_void_star (a_curl_handle, a_opt, a_curl_slist)
-		end
-
-	setopt_curl_string (a_curl_handle: POINTER; a_opt: INTEGER; a_curl_string: CURL_STRING)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-			not_void: a_curl_string /= Void
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				c_setopt_int (l_api, a_curl_handle, a_opt, a_curl_string.object_id)
-			end
-		end
-
-	setopt_integer (a_curl_handle: POINTER; a_opt: INTEGER; a_integer: INTEGER)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				c_setopt_int (l_api, a_curl_handle, a_opt, a_integer)
-			end
-		end
-
-	setopt_file (a_curl_handle: POINTER; a_opt: INTEGER; a_file: FILE)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: a_opt = {CURL_OPT_CONSTANTS}.curlopt_readdata
-			readable: a_file /= Void and then a_file.file_readable
-		do
-			setopt_void_star (a_curl_handle, a_opt, a_file.file_pointer)
-		end
-
-	perform (a_curl_handle: POINTER): INTEGER
-			-- Declared as curl_easy_perform().
-			-- Result is one value from {CURL_CODES}
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_perform")
-			if l_api /= default_pointer then
-				Result := c_perform (l_api, a_curl_handle)
-			else
-				Result := {CURL_CODES}.eiffelcurle_error_occurred
-			end
-		end
-
-	cleanup (a_curl_handle: POINTER)
-			-- Declared as curl_easy_cleanup().
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_cleanup")
-			if l_api /= default_pointer then
-				c_cleanup (l_api, a_curl_handle)
-			end
-		end
-
-feature -- Query
-
-	getinfo (a_curl_handle: POINTER; a_info: INTEGER; a_data: CELL [detachable ANY]): INTEGER
-			-- `curl_getinfo
-			--|* Request internal information from the curl session with this function.  The
- 			--|* third argument MUST be a pointer to a long, a pointer to a char * or a
- 			--|* pointer to a double (as the documentation describes elsewhere).  The data
- 			--|* pointed to will be filled in accordingly and can be relied upon only if the
- 			--|* function returns CURLE_OK.  This function is intended to get used *AFTER* a
- 			--|* performed transfer, all results from this function are undefined until the
- 			--|* transfer is completed.
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_INFO_CONSTANTS}).is_valid (a_info)
-		local
-			l_api: POINTER
-			mp: detachable MANAGED_POINTER
-			l: INTEGER
-			cs: C_STRING
-			d: REAL_64
-		do
-			a_data.replace (Void)
-			l_api := api_loader.api_pointer ("curl_easy_getinfo")
-			if l_api /= default_pointer then
-				if a_info & {CURL_INFO_CONSTANTS}.curlinfo_long /= 0 then
-					create mp.make ({PLATFORM}.integer_32_bytes)
-				elseif a_info & {CURL_INFO_CONSTANTS}.curlinfo_string /= 0 then
-					create mp.make ({PLATFORM}.pointer_bytes)
-				elseif a_info & {CURL_INFO_CONSTANTS}.curlinfo_double /= 0 then
-					create mp.make ({PLATFORM}.real_64_bytes)
-				end
-				if mp /= Void then
-					Result := c_getinfo (l_api, a_curl_handle, a_info, mp.item)
-					if Result = {CURL_CODES}.curle_ok then
-						if a_info & {CURL_INFO_CONSTANTS}.curlinfo_long /= 0 then
-							l := mp.read_integer_32 (0)
-							a_data.put (l)
-						elseif a_info & {CURL_INFO_CONSTANTS}.curlinfo_string /= 0 then
-							create cs.make_shared_from_pointer (mp.read_pointer (0))
-							a_data.put (cs.string)
-						elseif a_info & {CURL_INFO_CONSTANTS}.curlinfo_double /= 0 then
-							d := mp.read_real_64 (0)
-							a_data.put (d)
-						end
-					end
-				end
-			end
-		end
-
-	is_dynamic_library_exists: BOOLEAN
-			-- If dll/so files exist?
-		do
-			Result := api_loader.is_interface_usable
-		end
-
-feature -- Special setting
-
-	set_curl_function (a_curl_function: CURL_FUNCTION)
-			-- Set `curl_function' with `a_curl_function'
-		do
-			internal_curl_function := a_curl_function
-		ensure
-			set: a_curl_function /= Void implies curl_function = a_curl_function
-		end
-
-	curl_function: CURL_FUNCTION
-			-- cURL functions in curl_easy_setopt.
-		do
-			if attached internal_curl_function as l_curl_function then
-				Result := l_curl_function
-			else
-				create {CURL_DEFAULT_FUNCTION} Result.make
-				internal_curl_function := Result
-			end
-		ensure
-			not_void: Result /= Void
-		end
-
-	set_write_function (a_curl_handle: POINTER)
-				-- Set cURL write function
-				-- Set cURL write function with Eiffel default write function.
-				-- So we can use CURL_STRING as parameter in {CURL_EASY_EXTERNALS}.setopt_curl_string when the option is {CURL_OPT_CONSTANTS}.curlopt_writedata
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				curl_function.c_set_write_function (l_api, a_curl_handle)
-			end
-		end
-
-	set_read_function (a_curl_handle: POINTER)
-				-- Set cURL read function
-				-- Set cURL read function with Eiffel default read function.
-				-- So we can use a c file pointer as parameter in {CURL_EASY_EXTERNALS}.setopt_file_pointer when the option is {CURL_OPT_CONSTANTS}.curlopt_readdata
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				curl_function.c_set_read_function (l_api, a_curl_handle)
-			end
-		end
-
-	set_progress_function (a_curl_handle: POINTER)
-				-- Set cURL progress function for upload/download progress.
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				curl_function.c_set_progress_function (l_api, a_curl_handle)
-			end
-		end
-
-	set_debug_function (a_curl_handle: POINTER)
-				-- Set cURL debug function
-		require
-			exists: a_curl_handle /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				curl_function.c_set_debug_function (l_api, a_curl_handle)
-			end
-		end
-
-feature {NONE} -- Implementation
-
-	internal_curl_function: detachable CURL_FUNCTION
-			-- cURL functions.
-
-	api_loader: DYNAMIC_MODULE
-			-- Module name.
-		local
-			l_utility: CURL_UTILITY
-		once
-			create l_utility
-			Result := l_utility.api_loader
-		end
-
-	setopt_void_star (a_curl_handle: POINTER; a_opt: INTEGER; a_data:POINTER)
-			-- Declared as curl_easy_setopt().
-		require
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_easy_setopt")
-			if l_api /= default_pointer then
-				c_setopt (l_api, a_curl_handle, a_opt, a_data)
-			end
-		end
-
-feature {NONE} -- C externals
-
-	c_init (a_api: POINTER): POINTER
-			-- Declared curl_easy_init ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURL *, ()) $a_api)();
-			]"
-		end
-
-	c_cleanup (a_api: POINTER; a_curl_handle: POINTER)
-			-- Decalred as curl_easy_cleanup ().
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_handle /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, (CURL *)) $a_api)((CURL *)$a_curl_handle);
-			]"
-		end
-
-	c_perform (a_api: POINTER; a_curl_handle: POINTER): INTEGER
-			-- Declared as curl_easy_perform().
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_handle /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLcode, (CURL *)) $a_api)
-											((CURL *) $a_curl_handle);
-			]"
-		end
-
-	c_setopt_int (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: INTEGER)
-			-- Same as `c_setopt' except we can pass `a_data' as integer.
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)$a_opt,
-												$a_data);			
-			}
-			]"
-		end
-
-	c_setopt (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: POINTER)
-			-- C implementation of `setopt_void_star'.
-			-- Declared as curl_easy_setopt ().
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)$a_opt,
-												$a_data);			
-			}
-			]"
-		end
-
-	c_getinfo (a_api: POINTER; a_curl_handle: POINTER; a_opt: INTEGER; a_data: POINTER): INTEGER
-			-- C implementation of `curl_easy_getinfo'.
-			-- Declared as curl_easy_setopt ().
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_handle /= default_pointer
-			valid: (create {CURL_OPT_CONSTANTS}).is_valid (a_opt)
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLcode, (CURL *, CURLINFO info, ...)) $a_api)
-												((CURL *) $a_curl_handle,
-												(CURLINFO)$a_opt,
-												$a_data);
-			]"
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2010, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_externals.e

@@ -1,254 +0,0 @@
-note
-	description: "[
-					cURL externals.
-					For more information, see:
-					http://curl.haxx.se/libcurl/c/
-																		]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_EXTERNALS
-
-feature -- Command
-
-	global_init
-			-- Declared as curl_global_init().
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-		local
-			l_ptr: POINTER
-		do
-			l_ptr := api_loader.api_pointer ("curl_global_init")
-			if l_ptr /= default_pointer then
-				c_curl_global_init (l_ptr, {CURL_GLOBAL_CONSTANTS}.curl_global_all);
-			end
-		end
-
-	global_cleanup
-			-- Declared as curl_global_cleanup().
-		local
-			l_ptr: POINTER
-		do
-			l_ptr := api_loader.api_pointer ("curl_global_cleanup")
-			if l_ptr /= default_pointer then
-				c_curl_global_cleanup (l_ptr);
-			end
-		end
-
-	formadd_string_string (a_form: CURL_FORM; a_last_pointer: CURL_FORM; a_arg_1: INTEGER; a_arg_1_value: READABLE_STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: READABLE_STRING_GENERAL; a_arg_3: INTEGER)
-			-- Declared as curl_formadd ().
-		require
-			not_void: a_form /= Void
-			not_void: a_last_pointer /= Void
-			valid: (create {CURL_FORM_CONSTANTS}).is_valid (a_arg_1)
-			not_void: a_arg_1_value /= Void
-			valid: (create {CURL_FORM_CONSTANTS}).is_valid (a_arg_2)
-			not_void: a_arg_2_value /= Void
-			valid: (create {CURL_FORM_CONSTANTS}).is_valid (a_arg_3)
-		local
-			l_form_pointer, l_last_pointer: POINTER
-		do
-			l_form_pointer := a_form.item
-			l_last_pointer := a_last_pointer.item
-
-			internal_formadd_string_string ($l_form_pointer, $l_last_pointer, a_arg_1, a_arg_1_value, a_arg_2, a_arg_2_value, a_arg_3)
-
-			if a_form.item /= l_form_pointer then
-				check not_set: a_form.item = default_pointer end
-				a_form.set_item (l_form_pointer)
-			end
-			if a_last_pointer.item /= l_last_pointer then
-				a_last_pointer.set_item (l_last_pointer)
-			end
-		end
-
-	slist_append (a_list: POINTER; a_string: READABLE_STRING_GENERAL): POINTER
-			-- Declared as curl_slist_append ().
-			-- note: call with a null `a_list' to get initialized pointer as Result
-		require
-			not_void: a_string /= Void
-		local
-			l_c_string: C_STRING
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_slist_append")
-			if l_api /= default_pointer then
-				create l_c_string.make (a_string)
-				Result := c_slist_append (l_api, a_list, l_c_string.item)
-			end
-		end
-
-	slist_free_all (a_curl_slist: POINTER)
-			-- Declared as curl_slist_free_all ().
-			-- See: http://curl.haxx.se/libcurl/c/curl_slist_free_all.html
-			-- curl_slist_free_all - free an entire curl_slist list
-			-- This must be called when the data has been used, which typically means after the curl_easy_perform(3) has been called.
-		require
-			exists: a_curl_slist /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_slist_free_all")
-			if l_api /= default_pointer then
-				c_slist_free_all (l_api, a_curl_slist)
-			end
-		end
-
-feature -- Query
-
-	is_dynamic_library_exists: BOOLEAN
-			-- If dll/so files exist?
-		do
-			Result := api_loader.is_interface_usable
-		end
-
-feature {CURL_FORM} -- Internal command
-
-	formfree (a_curl_form: POINTER)
-			-- Declared as curl_formfree ().
-			-- See: http://curl.askapache.com/libcurl/c/curl_formfree.html
-			-- curl_formfree() is used to clean up data previously built/appended with curl_formadd(3).
-			-- This must be called when the data has been used, which typically means after the curl_easy_perform(3) has been called.
-		require
-			exists: a_curl_form /= default_pointer
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_formfree")
-			if l_api /= default_pointer then
-				c_formfree (l_api, a_curl_form)
-			end
-		end
-
-feature {NONE} -- Implementation
-
-	api_loader: DYNAMIC_MODULE
-			-- Module name.
-		local
-			l_utility: CURL_UTILITY
-		once
-			create l_utility
-			Result := l_utility.api_loader
-		end
-
-	internal_formadd_string_string (a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: READABLE_STRING_GENERAL; a_arg_2: INTEGER; a_arg_2_value: READABLE_STRING_GENERAL; a_arg_3: INTEGER)
-			-- Declared as curl_formadd ().
-		local
-			l_c_string_1, l_c_string_2: C_STRING
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_formadd");
-			if l_api /= default_pointer then
-				create l_c_string_1.make (a_arg_1_value)
-				create l_c_string_2.make (a_arg_2_value)
-				c_formadd_string_string (l_api, a_form, a_last_pointer, a_arg_1, l_c_string_1.item, a_arg_2, l_c_string_2.item, a_arg_3)
-			end
-		end
-
-feature {NONE} -- C externals
-
-	c_formadd_string_string (a_api: POINTER; a_form: TYPED_POINTER [POINTER]; a_last_pointer: TYPED_POINTER [POINTER]; a_arg_1: INTEGER; a_arg_1_value: POINTER; a_arg_2: INTEGER; a_arg_2_value: POINTER; a_arg_3: INTEGER)
-			-- C implementation of formadd_string_string ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (struct curl_httppost **, struct curl_httppost **, int, char *, int, char *, int)) $a_api)
-																						((struct curl_httppost **)$a_form,
-																						(struct curl_httppost **)$a_last_pointer,
-																						(int)$a_arg_1,
-																						(char *)$a_arg_1_value,
-																						(int)$a_arg_2,
-																						(char *)$a_arg_2_value,
-																						(int)$a_arg_3);
-			}
-			]"
-		end
-
-	c_formfree (a_api: POINTER; a_curl_form: POINTER)
-			-- Declared as curl_formfree ().
-		require
-			exists: a_api /= default_pointer
-			exists: a_curl_form /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, (struct curl_httppost *)) $a_api)
-												((struct curl_httppost *) $a_curl_form);
-			]"
-		end
-
-	c_curl_global_init (a_api: POINTER; a_opt: NATURAL_64)
-			-- `a_api' point to API curl_global_init ()
-			-- `a_opt' is intialization option.
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, (long)) $a_api)((long) $a_opt);
-			]"
-		end
-
-	c_curl_global_cleanup (a_api: POINTER)
-			-- `a_api' point to API curl_global_cleanup()
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, ()) $a_api)();
-			]"
-		end
-
-	c_slist_append (a_api: POINTER; a_list_pointer: POINTER; a_string: POINTER): POINTER
-			-- Declared as curl_slist_append ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-			{
-				return (FUNCTION_CAST(void *, (struct curl_slist *, const char *)) $a_api)
-											((struct curl_slist *)$a_list_pointer, 
-											(const char *)$a_string);
-			}
-			]"
-		end
-	
-	c_slist_free_all (a_api: POINTER; a_list_pointer: POINTER)
-			-- Declared as void curl_slist_free_all(struct curl_slist * list)
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void *, (struct curl_slist *)) $a_api)
-											((struct curl_slist *)$a_list_pointer);
-			]"
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2010, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_form.e

@@ -1,94 +0,0 @@
-note
-	description: "[
-					cURL form.
-					For more informaton see:
-					http://curl.haxx.se/libcurl/c/curl_formadd.html
-																		]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_FORM
-
-inherit
-	DISPOSABLE
-
-create
-	make,
-	share_with_pointer
-
-feature {NONE} -- Initialization
-
-	make
-			-- Creation method.
-		do
-		end
-
-	share_with_pointer (a_pointer: POINTER)
-			-- Creation method.
-			-- `item' share with `a_pointer'.
-		require
-			exists: a_pointer /= default_pointer
-		do
-			item := a_pointer
-		ensure
-			set: item = a_pointer
-		end
-
-feature -- Query
-
-	item: POINTER
-			-- C pointer of Current.
-
-	is_exists: BOOLEAN
-			-- If C pointer exists?
-		do
-			Result := item /= default_pointer
-		end
-
-feature -- Command
-
-	dispose
-			-- Free memory if possible.
-		local
-			l_curl: CURL_EXTERNALS
-		do
-			if item /= default_pointer then
-				create l_curl
-				l_curl.formfree (item)
-				item := default_pointer
-			end
-		end
-
-	release_item
-			-- Release item
-			-- NOT free memory! This is useful if Current generated by {CURL_EXTERNALS}.formadd_string_string.
-		do
-			item := default_pointer
-		end
-
-feature {CURL_EXTERNALS} -- Internal command	
-
-	set_item (a_item: POINTER)
-			-- Set `item' with `a_item'
-		do
-			item := a_item
-		ensure
-			set: item = a_item
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_form_constants.e

@@ -1,78 +0,0 @@
-note
-	description: "[
-					cURL form constants.
-					For more informaton see:
-					http://curl.haxx.se/libcurl/c/curl_formadd.html
-																		]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_FORM_CONSTANTS
-
-feature -- Query
-
-	curlform_copyname: INTEGER
-			-- Declared as CURLFORM_COPYNAME
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				CURLFORM_COPYNAME
-			]"
-		end
-
-	curlform_copycontents: INTEGER
-			-- Declared as CURLFORM_COPYCONTENTS
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				CURLFORM_COPYCONTENTS
-			]"
-		end
-
-	curlform_end: INTEGER
-			-- Declared as CURLFORM_END
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				CURLFORM_END
-			]"
-		end
-
-	curlform_file: INTEGER
-			-- Declared as CURLFORM_FILE
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				CURLFORM_FILE
-			]"
-		end
-
-	is_valid (a_integer: INTEGER): BOOLEAN
-			-- If `a_integer' valid?
-		do
-			Result := 	a_integer = curlform_copycontents or
-						a_integer = curlform_copyname or
-						a_integer =	curlform_end or
-						a_integer = curlform_file
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_function.e

@@ -1,257 +0,0 @@
-note
-	description: "[
-						cURL curl_easy_setopt callback functions' Eiffel wrappers.
-						We need this class since cURL need a c function pointer as value but
-						Eiffel function need frist parameter of any funciton call is object address.
-						Client programmers can inherit this class to fit their needs.
-
-						Note: descendants of this class have to call `set_object_and_function_address',
-						otherwise cURL would not know how to call Eiffel features (such as `write_function').
-						See example: $ISE_LIBRARY\examples\cURL\upload_and_read_function
-						
-						See http://curl.haxx.se/libcurl/c/curl_easy_setopt.html for libcurl documentation					
-				]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-deferred class
-	CURL_FUNCTION
-
-inherit
-	DISPOSABLE
-
-feature -- Interactive with C
-
-	set_object_and_function_address
-			-- Set object and function addresses.
-			-- Call this feature before call `c_set_progress_function', `c_set_debug_function' and `c_set_write_function, c_set_read_function'.
-		do
-			c_set_object ($Current)
-			c_set_progress_function_address ($progress_function)
-			c_set_write_function_address ($write_function)
-			c_set_read_function_address ($read_function)
-			c_set_debug_function_address ($debug_function)
-		end
-
-	c_set_progress_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
-				-- Setting CURLOPT_PROGRESSFUNCTION option of `a_curl_handle'.
-				-- We need this function since cURL need a c function pointer as value.
-		require
-			exists: a_setopt_api /= default_pointer
-		external
-			"C inline use <eiffel_curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_setopt_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)CURLOPT_PROGRESSFUNCTION,
-												curl_progress_function);
-			}
-			]"
-		end
-
-	c_set_debug_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
-				-- Setting CURLOPT_DEBUGFUNCTION option of `a_curl_handle'.
-				-- We need this function since cURL need a c function pointer as value.
-		require
-			exists: a_curl_handle /= default_pointer
-		external
-			"C inline use <eiffel_curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_setopt_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)CURLOPT_DEBUGFUNCTION,
-												curl_debug_function);
-																													
-			}
-			]"
-		end
-
-	c_set_write_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
-				-- Setting CURLOPT_WRITEFUNCTION option of `a_curl_handle'.
-				-- We need this function since cURL need a c function pointer as value.
-		require
-			exists: a_setopt_api /= default_pointer
-		external
-			"C inline use <eiffel_curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_setopt_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)CURLOPT_WRITEFUNCTION,
-												curl_write_function);
-			}
-			]"
-		end
-
-	c_set_read_function (a_setopt_api: POINTER; a_curl_handle: POINTER)
-				-- Setting CURLOPT_READFUNCTION option of `a_curl_handle'.
-				-- We need this function since cURL need a c function pointer as value.
-		require
-			exists: a_setopt_api /= default_pointer
-		external
-			"C inline use <eiffel_curl.h>"
-		alias
-			"[
-			{
-				(FUNCTION_CAST(void, (CURL *, CURLoption, ...)) $a_setopt_api)
-												((CURL *) $a_curl_handle,
-												(CURLoption)CURLOPT_READFUNCTION,
-												curl_read_function);
-			}
-			]"
-		end
-
-feature -- cURL curl_easy_setopt functions
-
-	progress_function (a_object_id: POINTER; a_download_total, a_download_now, a_upload_total, a_upload_now: REAL_64): INTEGER
-			-- Function correspond to {CURL_OPT_CONSTANTS}.curlopt_progressfunction
-			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
-			-- may changed during GC.
-		deferred
-		end
-
-	write_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
-			-- Function called by libcurl as soon as there is data received that needs to be saved.
-			-- The size of the data pointed to by `a_data_pointer' is `a_size' multiplied with `a_nmemb', it will not be null terminated.
-			-- Returns the number of bytes actually taken care of
-			--
-			-- Function corresponds to {CURL_OPT_CONSTANTS}.curlopt_writefunction
-			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
-			-- may changed during GC.
-			--| libcurl doc:
-			--|  Function pointer that should match the following prototype: size_t function( char *ptr, size_t size, size_t nmemb, void *userdata);
-			--|	 This function gets called by libcurl as soon as there is data received that needs to be saved.
-			--|	 The size of the data pointed to by ptr is size multiplied with nmemb, it will not be zero terminated.
-			--|	 Return the number of bytes actually taken care of.
-			--|  If that amount differs from the amount passed to your function, it'll signal an error to the library.
-			--|  This will abort the transfer and return CURLE_WRITE_ERROR.
-			--|	 From 7.18.0, the function can return CURL_WRITEFUNC_PAUSE which then will cause writing to this connection to become paused.
-			--|  See curl_easy_pause(3) for further details.
-			--|
-			--|  This function may be called with zero bytes data if the transferred file is empty.
-			--|
-			--|  Set this option to NULL to get the internal default function.
-			--|  The internal default function will write the data to the FILE * given with CURLOPT_WRITEDATA.
-			--|
-			--|  Set the userdata argument with the CURLOPT_WRITEDATA option.
-			--|
-			--|  The callback function will be passed as much data as possible in all invokes,
-			--|  but you cannot possibly make any assumptions. It may be one byte, it may be thousands.
-			--|  The maximum amount of body data that can be passed to the write callback is defined
-			--|  in the curl.h header file: CURL_MAX_WRITE_SIZE (the usual default is 16K).
-			--|  If you however have CURLOPT_HEADER set, which sends header data to the write callback,
-			--|  you can get up to CURL_MAX_HTTP_HEADER bytes of header data passed into it. This usually means 100K.			
-		deferred
-		end
-
-	read_function (a_data_pointer: POINTER; a_size, a_nmemb: INTEGER; a_object_id: POINTER): INTEGER
-			-- Function called by libcurl as soon as it needs to read data in order to send it to the peer.
-			-- The data area pointed at by the pointer `a_data_pointer' may be filled with at most
-			-- `a_size' multiplied with `a_nmemb' number of bytes. 
-			-- Returns the actual number of bytes stored in that memory area.
-			-- Returning 0 will signal end-of-file to the library and cause it to stop the current transfer.
-			-- 
-			-- Function corresponds to {CURL_OPT_CONSTANTS}.curlopt_readfunction
-			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
-			-- may changed during GC.
-			--| libcurl doc:
-			--|  Function pointer that should match the following prototype: size_t function( void *ptr, size_t size, size_t nmemb, void *userdata);
-			--|  This function gets called by libcurl as soon as it needs to read data in order to send it to the peer.
-			--|  The data area pointed at by the pointer ptr may be filled with at most size multiplied with nmemb number of bytes. 
-			--|  Your function must return the actual number of bytes that you stored in that memory area.
-			--|  Returning 0 will signal end-of-file to the library and cause it to stop the current transfer.
-			--|  
-			--|  If you stop the current transfer by returning 0 "pre-maturely" (i.e before the server expected it,
-			--|  like when you've said you will upload N bytes and you upload less than N bytes),
-			--|  you may experience that the server "hangs" waiting for the rest of the data that won't come.
-			--|  
-			--|  The read callback may return CURL_READFUNC_ABORT to stop the current operation immediately,
-			--|  resulting in a CURLE_ABORTED_BY_CALLBACK error code from the transfer (Added in 7.12.1)
-			--|
-			--|  From 7.18.0, the function can return CURL_READFUNC_PAUSE which then will cause reading from this connection to become paused.
-			--|  See curl_easy_pause(3) for further details.
-			--|  
-			--|  Bugs: when doing TFTP uploads, you must return the exact amount of data that the callback wants,
-			--|  or it will be considered the final packet by the server end and the transfer will end there.
-			--|  
-			--|  If you set this callback pointer to NULL, or don't set it at all, the default internal read function will be used.
-			--|  It is doing an fread() on the FILE * userdata set with CURLOPT_READDATA.
-		deferred
-		end
-
-	debug_function (a_curl_handle: POINTER; a_curl_infotype: INTEGER; a_char_pointer: POINTER; a_size: INTEGER; a_object_id: POINTER): INTEGER
-			-- Function correspond to {CURL_OPT_CONSTANTS}.curlopt_debugfunction
-			-- Note, pass a {IDENTIFIED}.object_id as `a_object_id' value is helpful since we can't directly pass an Eiffel Object address which
-			-- may changed during GC.			
-		require
-			vaild: (create {CURL_INFO_TYPE}).is_valid (a_curl_infotype)
-		deferred
-		end
-
-feature {NONE} -- Externals
-
-	c_set_object (a_object: POINTER)
-			-- Set Current object address.
-		external
-			"C signature (EIF_REFERENCE) use %"eiffel_curl.h%""
-		end
-
-	c_release_object
-			-- Release Current pointer in C
-		external
-			"C use %"eiffel_curl.h%""
-		end
-
-	c_set_progress_function_address (a_address: POINTER)
-			-- Set progress function address.
-		external
-			"C use %"eiffel_curl.h%""
-		end
-
-	c_set_write_function_address (a_address: POINTER)
-			-- Set write function address.
-		external
-			"C use %"eiffel_curl.h%""
-		end
-
-	c_set_read_function_address (a_address: POINTER)
-			-- Set read function address.
-		external
-			"C use %"eiffel_curl.h%""
-		end
-
-	c_set_debug_function_address (a_address: POINTER)
-			-- Set write function address.
-		external
-			"C use %"eiffel_curl.h%""
-		end
-
-feature {NONE} -- Implementation
-
-	dispose
-			-- Wean `Current'
-		do
-			c_release_object
-			c_set_object (default_pointer)
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_global_constants.e

@@ -1,78 +0,0 @@
-note
-	description: "[
-					cURL library constants used by curl_global_init () 
-																				]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_GLOBAL_CONSTANTS
-
-feature -- Query
-
-	curl_global_ssl: NATURAL_64
-			-- Delcared as CURL_GLOBAL_SSL
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return CURL_GLOBAL_SSL;
-			]"
-		end
-
-	curl_global_win32: NATURAL_64
-			-- Delcared as CURL_GLOBAL_WIN32
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return CURL_GLOBAL_WIN32;
-			]"
-		end
-
-	curl_global_all: NATURAL_64
-			-- Delcared as CURL_GLOBAL_ALL
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return CURL_GLOBAL_ALL;
-			]"
-		end
-
-	curl_global_nothing: NATURAL_64
-			-- Delcared as CURL_GLOBAL_NOTHING
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return CURL_GLOBAL_NOTHING;
-			]"
-		end
-
-	curl_global_default: NATURAL_64
-			-- Delcared as CURL_GLOBAL_DEFAULT
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return CURL_GLOBAL_DEFAULT;
-			]"
-		end
-		
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end
-

contrib/ise_library/cURL/curl_info_constants.e

@@ -1,122 +0,0 @@
-note
-	description: "[
-						cURL library info constants.
-																			]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_INFO_CONSTANTS
-
-feature -- Constants
-
-	curlinfo_string: INTEGER = 0x100000
-			-- Declared as CURLINFO_STRING
-
-	curlinfo_long: INTEGER = 0x200000
-			-- Declared as CURLINFO_LONG
-
-	curlinfo_double: INTEGER = 0x300000
-			-- Declared as CURLINFO_DOUBLE
-
-	curlinfo_slist: INTEGER = 0x400000
-			-- Declared as CURLINFO_SLIST
-
-	curlinfo_mask: INTEGER = 0x0fffff
-			-- Declared as CURLINFO_MASK
-
-	curlinfo_typemask: INTEGER = 0xf00000
-			-- Declared as CURLINFO_TYPEMASK
-
-feature -- Info constants
-
-	curlinfo_effective_url: INTEGER = 0x100001  			-- CURLINFO_STRING + 1,
-	curlinfo_response_code: INTEGER = 0x200002				-- CURLINFO_LONG   + 2,
-	curlinfo_total_time: INTEGER = 0x300003					-- CURLINFO_DOUBLE + 3,
-	curlinfo_namelookup_time: INTEGER = 0x300004			-- CURLINFO_DOUBLE + 4,
-	curlinfo_connect_time: INTEGER = 0x300005				-- CURLINFO_DOUBLE + 5,
-	curlinfo_pretransfer_time: INTEGER = 0x300006			-- CURLINFO_DOUBLE + 6,
-	curlinfo_size_upload: INTEGER = 0x300007				-- CURLINFO_DOUBLE + 7,
-	curlinfo_size_download: INTEGER = 0x300008				-- CURLINFO_DOUBLE + 8,
-	curlinfo_speed_download: INTEGER = 0x300009				-- CURLINFO_DOUBLE + 9,
-	curlinfo_speed_upload: INTEGER = 0x30000a				-- CURLINFO_DOUBLE + 10,
-	curlinfo_header_size: INTEGER = 0x20000b				-- CURLINFO_LONG   + 11,
-	curlinfo_request_size: INTEGER = 0x20000c				-- CURLINFO_LONG   + 12,
-	curlinfo_ssl_verifyresult: INTEGER = 0x20000d			-- CURLINFO_LONG   + 13,
-	curlinfo_filetime: INTEGER = 0x20000e					-- CURLINFO_LONG   + 14,
-	curlinfo_content_length_download: INTEGER = 0x30000f	-- CURLINFO_DOUBLE + 15,
-	curlinfo_content_length_upload: INTEGER = 0x300010		-- CURLINFO_DOUBLE + 16,
-	curlinfo_starttransfer_time: INTEGER = 0x300011			-- CURLINFO_DOUBLE + 17,
-	curlinfo_content_type: INTEGER = 0x100012				-- CURLINFO_STRING + 18,
-	curlinfo_redirect_time: INTEGER = 0x300013				-- CURLINFO_DOUBLE + 19,
-	curlinfo_redirect_count: INTEGER = 0x200014				-- CURLINFO_LONG   + 20,
-	curlinfo_private: INTEGER = 0x100015					-- CURLINFO_STRING + 21,
-	curlinfo_http_connectcode: INTEGER = 0x200016			-- CURLINFO_LONG   + 22,
-	curlinfo_httpauth_avail: INTEGER = 0x200017				-- CURLINFO_LONG   + 23,
-	curlinfo_proxyauth_avail: INTEGER = 0x200018			-- CURLINFO_LONG   + 24,
-	curlinfo_os_errno: INTEGER = 0x200019					-- CURLINFO_LONG   + 25,
-	curlinfo_num_connects: INTEGER = 0x20001a				-- CURLINFO_LONG   + 26,
-	curlinfo_ssl_engines: INTEGER = 0x40001b				-- CURLINFO_SLIST  + 27,
-	curlinfo_cookielist: INTEGER = 0x40001c					-- CURLINFO_SLIST  + 28,
-	curlinfo_lastsocket: INTEGER = 0x20001d					-- CURLINFO_LONG   + 29,
-	curlinfo_ftp_entry_path: INTEGER = 0x10001e				-- CURLINFO_STRING + 30,
-
-feature -- Contract support
-
-	is_valid (a_code: INTEGER): BOOLEAN
-			-- Is `a_code' valid?
-		do
-			inspect a_code
-			when
-				curlinfo_effective_url,
-				curlinfo_response_code,
-				curlinfo_total_time,
-				curlinfo_namelookup_time,
-				curlinfo_connect_time,
-				curlinfo_pretransfer_time,
-				curlinfo_size_upload,
-				curlinfo_size_download,
-				curlinfo_speed_download,
-				curlinfo_speed_upload,
-				curlinfo_header_size,
-				curlinfo_request_size,
-				curlinfo_ssl_verifyresult,
-				curlinfo_filetime,
-				curlinfo_content_length_download,
-				curlinfo_content_length_upload,
-				curlinfo_starttransfer_time,
-				curlinfo_content_type,
-				curlinfo_redirect_time,
-				curlinfo_redirect_count,
-				curlinfo_private,
-				curlinfo_http_connectcode,
-				curlinfo_httpauth_avail,
-				curlinfo_proxyauth_avail,
-				curlinfo_os_errno,
-				curlinfo_num_connects,
-				curlinfo_ssl_engines,
-				curlinfo_cookielist,
-				curlinfo_lastsocket,
-				curlinfo_ftp_entry_path 
-			then
-				Result := True
-			else
-				Result := False
-			end
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_info_type.e

@@ -1,69 +0,0 @@
-note
-	description: "[
-						cURL library info type constants.
-																			]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_INFO_TYPE
-
-feature -- Enumeration
-
-	curlinfo_text: INTEGER = 0
-			-- Declared as CURLINFO_TEXT
-
-	curlinfo_header_in: INTEGER = 1
-			-- Declared as CURLINFO_HEADER_IN
-
-	curlinfo_header_out: INTEGER = 2
-			-- Declared as CURLINFO_HEADER_OUT
-
-	curlinfo_data_in: INTEGER = 3
-			-- Declared as CURLINFO_DATA_IN
-
-	curlinfo_data_out: INTEGER = 4
-			-- Declared as CURLINFO_DATA_OUT
-
-	curlinfo_ssl_data_in: INTEGER = 5
-	 		-- Declared as CURLINFO_SSL_DATA_IN
-
-	curlinfo_ssl_data_out: INTEGER = 6
-			-- Declared as CURLINFO_SSL_DATA_OUT
-
-feature -- Contract support
-
-	is_valid (a_type: INTEGER): BOOLEAN
-			-- If `a_type' valid?
-		do
-			inspect a_type
-			when
-				curlinfo_data_in,
-				curlinfo_data_out,
-				curlinfo_header_in,
-				curlinfo_header_out,
-				curlinfo_ssl_data_in,
-				curlinfo_ssl_data_out,
-				curlinfo_text
-			then
-				Result := True
-			else
-				Result := False
-			end
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/curl_msg.e

@@ -1,51 +0,0 @@
-note
-	description: "[
-		C CURLMSG enum
-	]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_MSG
-
-feature -- Query
-
-	curlmsg_done: INTEGER
-			-- Declared as CURLMSG_DONE.
-			-- This easy handle has completed.
-			-- 'result' contains the CURLcode of the transfer			
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"return CURLMSG_DONE;"
-		end
-
-	curlmsg_none: INTEGER
-			-- Declared as CURLMSG_NONE.
-			-- First, not used
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"return CURLMSG_NONE;"
-		end
-
-	curlmsg_last: INTEGER
-			-- Declared as CURLMSG_LAST.
-			-- Last, not used
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"return CURLMSG_LAST;"
-		end
-
-note
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end

contrib/ise_library/cURL/curl_msg_struct.e

@@ -1,83 +0,0 @@
-note
-	description: "[
-	
-		C Struct CURLMsg wrapper
-		Read multi stack informationals
-		
-		This class is used by {CURL_MSG_STRUCT}.info_read
-		
-		More info:
-		http://curl.haxx.se/libcurl/c/curl_multi_info_read.html
-	]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_MSG_STRUCT
-
-create
-	make
-
-feature {NONE} -- Initialization
-
-	make (a_pointer: POINTER)
-			-- Creation method
-			-- Bind message structure to the address `a_pointer'".
-		require
-			not_default: a_pointer /= default_pointer
-		do
-			item := a_pointer
-		ensure
-			set: item = a_pointer
-		end
-
-feature -- Query
-
-	curl_handle: POINTER
-			-- CURL easy_handle
-			-- The handle it concerns
-		do
-			Result := c_curl_handle (item)
-		end
-
-	msg: INTEGER
-			-- What does this message mean?
-			-- It's one value from {CURLMSG}
-		do
-			Result := c_msg (item)
-		end
-
-feature {NONE} -- Implementation
-
-	item: POINTER
-			-- C struct item
-
-feature {NONE} -- C externals
-
-	c_curl_handle (a_item: POINTER): POINTER
-			-- cURL easy handle it concerns
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"return (CURL *)((CURLMsg *)$a_item)->easy_handle;"
-		end
-
-	c_msg (a_item: POINTER): INTEGER
-			-- Get msg
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"return (CURLMSG)((CURLMsg *)$a_item)->msg;"
-		end
-
-;note
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end

contrib/ise_library/cURL/curl_multi_codes.e

@@ -1,48 +0,0 @@
-note
-	description: "[
-		The generic return code used by functions in the libcurl multi interface.
-		Also consider curl_multi_strerror(3).
-	]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_MULTI_CODES
-
-feature -- Query
-
-	curlm_call_multi_perform: INTEGER = -1
-			-- This is not really an error. It means you should call curl_multi_perform(3) again without doing select() or similar in between.
-
-	curlm_ok: INTEGER = 0
-			-- Things are fine.
-
-	curlm_bad_handle: INTEGER = 1
-			-- The passed-in handle is not a valid CURLM handle.
-
-	curlm_bad_easy_handle: INTEGER = 2
-			-- An easy handle was not good/valid. It could mean that it isn't an easy handle at all, or possibly that the handle already is in used by this or another multi handle.
-
-	curlm_out_of_memory: INTEGER = 3
-			-- You are doomed.
-
-	curlm_internal_error: INTEGER = 4
-			-- This can only be returned if libcurl bugs. Please report it to us!
-
-	curlm_bad_socket: INTEGER = 5
-			-- The passed-in socket is not a valid one that libcurl already knows about. (Added in 7.15.4)
-
-	curlm_unknown_option: INTEGER = 6
-			-- curl_multi_setopt() with unsupported option (Added in 7.15.4)
-
-note
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end

contrib/ise_library/cURL/curl_multi_externals.e

@@ -1,251 +0,0 @@
-note
-	description: "[
-		The multi interface offers several abilities that the easy interface doesn't. They are mainly:
-		1. Enable a "pull" interface. The application that uses libcurl decides where and when to ask libcurl to get/send data.
-		2. Enable multiple simultaneous transfers in the same thread without making it complicated for the application.
-		3. Enable the application to wait for action on its own file descriptors and curl's file descriptors simultaneous easily.
-		
-		More info: http://curl.haxx.se/libcurl/c/libcurl-multi.html
-	]"
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_MULTI_EXTERNALS
-
-feature -- Command
-
-	init
-			-- Create a multi handle.
-			-- If success, Result is a cURL multi hanlde just created.
-			-- This feature maybe failed in some cases: cannot find required DLL, etc.
-			-- Then the post condition would be violated.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_init")
-			if l_api /= default_pointer then
-				item := c_init (l_api)
-			end
-		end
-
-	add_handle (a_easy_handle: POINTER)
-			-- Add an easy handle to a multi session.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-			is_multi_handle_exists: is_exists
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_add_handle")
-			if l_api /= default_pointer then
-				c_add_handle (l_api, item, a_easy_handle)
-			end
-		end
-
-	remove_handle (a_easy_handle: POINTER)
-			-- Remove an easy handle from a multi session.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-			is_multi_handle_exists: is_exists
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_remove_handle")
-			if l_api /= default_pointer then
-				c_remove_handle (l_api, item, a_easy_handle)
-			end
-		end
-
-	cleanup: INTEGER
-			-- Close down a multi session.
-			-- Result is one value from {CURL_MULTI_CODES}.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-			is_multi_handle_exists: is_exists
-		local
-			l_api: POINTER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_cleanup")
-			if l_api /= default_pointer then
-				Result := c_cleanup (l_api, item)
-			end
-		end
-
-	perform (a_running_handle: CELL [INTEGER]): INTEGER
-			-- Reads/writes available data from each easy handle.
-			-- Result is one value from {CURL_MULTI_CODES}.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-			is_multi_handle_exists: is_exists
-		local
-			l_api: POINTER
-			l_running_handle: INTEGER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_perform")
-			if l_api /= default_pointer then
-				Result := c_perform (l_api, item, $l_running_handle)
-				a_running_handle.put (l_running_handle)
-			end
-		end
-
-	info_read (a_msgs_in_queue: CELL [INTEGER]): POINTER
-			-- Read multi stack informationals.
-			-- The result is C struct CURLMsg {CURL_MSG_STRUCT}.
-			-- Repeated calls to this function will return a new struct each time, until a NULL
-			-- is returned as a signal that there is no more to get at this point. The integer
-			-- pointed to with msgs_in_queue will contain the number of remaining messages after
-			-- this function was called.
-			-- When you fetch a message using this function, it is removed from the internal queue
-			-- so calling this function again will not return the same message again. It will instead
-			-- return new messages at each new invoke until the queue is emptied.
-		require
-			dynamic_library_exists: is_dynamic_library_exists
-			is_multi_handle_exists: is_exists
-		local
-			l_api: POINTER
-			l_msgs_in_queue: INTEGER
-		do
-			l_api := api_loader.api_pointer ("curl_multi_info_read")
-			if l_api /= default_pointer then
-				Result := c_info_read (l_api, item, $l_msgs_in_queue)
-				a_msgs_in_queue.put (l_msgs_in_queue)
-			end
-		end
-
-	is_dynamic_library_exists: BOOLEAN
-			-- Are required .dll/.so files available?
-		do
-			Result := api_loader.is_interface_usable
-		end
-
--- Feature not yet wrapped/tested
---	curl_multi_assign
---	curl_multi_fdset
---	curl_multi_setopt
---	curl_multi_socket
---	curl_multi_socket_action
---	curl_multi_strerror
---	curl_multi_timeout
-
-feature -- Query
-
-	is_exists: BOOLEAN
-			-- If C pointer exists?
-		do
-			Result := item /= default_pointer
-		end
-
-feature {NONE} -- Implementation
-
-	item: POINTER
-		-- C pointer item for cURL multi
-
-feature {NONE} -- C externals
-
-	c_init (a_api: POINTER): POINTER
-			-- Declared as curl_multi_init ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLM *, ()) $a_api)();
-			]"
-		end
-
-	c_cleanup (a_api: POINTER; a_multi_handle: POINTER): INTEGER
-			-- Declared as curl_multi_cleanup ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLMcode, (CURLM *)) $a_api)
-														((CURLM *)$a_multi_handle);
-			]"
-		end
-
-	c_add_handle (a_api: POINTER; a_multi_handle: POINTER; a_easy_handle: POINTER)
-			-- Declared as curl_multi_add_handle ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, (CURLM *, CURL *)) $a_api)
-												((CURLM *) $a_multi_handle,
-												(CURL *) $a_easy_handle);
-			]"
-		end
-
-	c_remove_handle (a_api: POINTER; a_multi_handle: POINTER; a_easy_handle: POINTER)
-			-- Declared as curl_multi_remove_handle ().
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				(FUNCTION_CAST(void, (CURLM *, CURL *)) $a_api)
-												((CURLM *) $a_multi_handle,
-												(CURL *) $a_easy_handle);
-			]"
-		end
-
-	c_perform (a_api: POINTER; a_multi_handle: POINTER; a_running_handles: TYPED_POINTER [INTEGER]): INTEGER
-			-- Declared as curl_multi_perform.
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLMcode, (CURLM *, int *)) $a_api)
-												((CURLM *) $a_multi_handle,
-												(int *) $a_running_handles);
-			]"
-		end
-
-	c_info_read (a_api: POINTER; a_multi_handle: POINTER; a_msgs_in_queue: TYPED_POINTER [INTEGER]): POINTER
-				-- Declared as curl_multi_info_read.
-		require
-			exists: a_api /= default_pointer
-		external
-			"C inline use <curl/curl.h>"
-		alias
-			"[
-				return (FUNCTION_CAST(CURLMsg *, (CURLM *, int *)) $a_api)
-												((CURLM *) $a_multi_handle,
-												(int *) $a_msgs_in_queue);
-			]"
-		end
-
-feature {NONE} -- Implementation
-
-	api_loader: DYNAMIC_MODULE
-			-- Module name.
-		local
-			l_utility: CURL_UTILITY
-		once
-			create l_utility
-			Result := l_utility.api_loader
-		end
-
-
-note
-	copyright: "Copyright (c) 1984-2012, Eiffel Software and others"
-	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			5949 Hollister Ave., Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-end

contrib/ise_library/cURL/curl_string.e

@@ -1,50 +0,0 @@
-note
-	description: "[
-					String used by cURL wrapper library.
-					Only added features from IDENTIFIED.
-																					]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_STRING
-
-inherit
-	STRING
-		select
-			is_equal,
-			copy,
-			out
-		end
-
-	IDENTIFIED
-		rename
-			is_equal as identified_is_equal,
-			copy as identified_copy,
-			out as identified_out
-		end
-
-create
-	make,
-	make_empty,
-	make_filled,
-	make_from_string,
-	make_from_c,
-	make_from_cil
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end
-

contrib/ise_library/cURL/curl_utility.e

@@ -1,51 +0,0 @@
-note
-	description: "[
-					Utilities for Eiffel cURL wrapper library.
-																		]"
-	status: "See notice at end of class."
-	legal: "See notice at end of class."
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	CURL_UTILITY
-
-feature -- Query
-
-	api_loader: DYNAMIC_MODULE
-			-- API dynamic loader
-		local
-			l_platform: PLATFORM
-		once
-			create l_platform
-			if l_platform.is_unix or l_platform.is_mac then
-				create Result.make_with_version (module_name, "3")
-			else
-				check is_window: l_platform.is_windows end
-				create Result.make (module_name)
-			end
-		ensure
-			not_void: Result /= Void
-		end
-		
-	module_name: STRING
-			-- Module name.
-		once
-				Result := "libcurl"
-		ensure
-			not_void: Result /= Void
-		end
-
-note
-	library:   "cURL: Library of reusable components for Eiffel."
-	copyright: "Copyright (c) 1984-2006, Eiffel Software and others"
-	license:   "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			Eiffel Software
-			356 Storke Road, Goleta, CA 93117 USA
-			Telephone 805-685-1006, Fax 805-685-6869
-			Website http://www.eiffel.com
-			Customer support http://support.eiffel.com
-		]"
-
-end

contrib/ise_library/cURL/license.lic

@@ -1 +0,0 @@
-reference:forum2

contrib/ise_library/cURL/readme.txt

@@ -1,5 +0,0 @@
-When your Eiffel executable running, Eiffel cURL library needs 3 DLLs, they are:
-
-libcurl.dll, libeay32.dll and ssleay32.dll
-
-Please make sure the 3 DLLs files can be found in your environment PATH or in same folder of your executable.

contrib/ise_library/cURL/spec/include/curl/curlver.h

@@ -1,67 +0,0 @@
-#ifndef __CURL_CURLVER_H
-#define __CURL_CURLVER_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-
-/* This header file contains nothing but libcurl version info, generated by
-   a script at release-time. This was made its own header file in 7.11.2 */
-
-/* This is the version number of the libcurl package from which this header
-   file origins: */
-#define LIBCURL_VERSION "7.17.0"
-
-/* The numeric version number is also available "in parts" by using these
-   defines: */
-#define LIBCURL_VERSION_MAJOR 7
-#define LIBCURL_VERSION_MINOR 17
-#define LIBCURL_VERSION_PATCH 0
-
-/* This is the numeric version of the libcurl version number, meant for easier
-   parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
-   always follow this syntax:
-
-         0xXXYYZZ
-
-   Where XX, YY and ZZ are the main version, release and patch numbers in
-   hexadecimal (using 8 bits each). All three numbers are always represented
-   using two digits.  1.2 would appear as "0x010200" while version 9.11.7
-   appears as "0x090b07".
-
-   This 6-digit (24 bits) hexadecimal number does not show pre-release number,
-   and it is always a greater number in a more recent release. It makes
-   comparisons with greater than and less than work.
-*/
-#define LIBCURL_VERSION_NUM 0x071100
-
-/*
- * This is the date and time when the full source package was created. The
- * timestamp is not stored in CVS, as the timestamp is properly set in the
- * tarballs by the maketgz script.
- *
- * The format of the date should follow this template:
- *
- * "Mon Feb 12 11:35:33 UTC 2007"
- */
-#define LIBCURL_TIMESTAMP "Thu Sep 13 20:22:24 UTC 2007"
-
-#endif /* __CURL_CURLVER_H */

contrib/ise_library/cURL/spec/include/curl/easy.h

@@ -1,81 +0,0 @@
-#ifndef __CURL_EASY_H
-#define __CURL_EASY_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN CURL *curl_easy_init(void);
-CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
-CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
-CURL_EXTERN void curl_easy_cleanup(CURL *curl);
-
-/*
- * NAME curl_easy_getinfo()
- *
- * DESCRIPTION
- *
- * Request internal information from the curl session with this function.  The
- * third argument MUST be a pointer to a long, a pointer to a char * or a
- * pointer to a double (as the documentation describes elsewhere).  The data
- * pointed to will be filled in accordingly and can be relied upon only if the
- * function returns CURLE_OK.  This function is intended to get used *AFTER* a
- * performed transfer, all results from this function are undefined until the
- * transfer is completed.
- */
-CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
-
-
-/*
- * NAME curl_easy_duphandle()
- *
- * DESCRIPTION
- *
- * Creates a new curl session handle with the same options set for the handle
- * passed in. Duplicating a handle could only be a matter of cloning data and
- * options, internal state info and things like persistant connections cannot
- * be transfered. It is useful in multithreaded applications when you can run
- * curl_easy_duphandle() for each new thread to avoid a series of identical
- * curl_easy_setopt() invokes in every thread.
- */
-CURL_EXTERN CURL* curl_easy_duphandle(CURL *curl);
-
-/*
- * NAME curl_easy_reset()
- *
- * DESCRIPTION
- *
- * Re-initializes a CURL handle to the default values. This puts back the
- * handle to the same state as it was in when it was just created.
- *
- * It does keep: live connections, the Session ID cache, the DNS cache and the
- * cookies.
- */
-CURL_EXTERN void curl_easy_reset(CURL *curl);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

contrib/ise_library/cURL/spec/include/curl/mprintf.h

@@ -1,80 +0,0 @@
-#ifndef __CURL_MPRINTF_H
-#define __CURL_MPRINTF_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h> /* needed for FILE */
-
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-CURL_EXTERN int curl_mprintf(const char *format, ...);
-CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
-CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
-CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength, const char *format, ...);
-CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
-CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
-CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
-CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength, const char *format, va_list args);
-CURL_EXTERN char *curl_maprintf(const char *format, ...);
-CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
-
-#ifdef _MPRINTF_REPLACE
-# undef printf
-# undef fprintf
-# undef sprintf
-# undef vsprintf
-# undef snprintf
-# undef vprintf
-# undef vfprintf
-# undef vsnprintf
-# undef aprintf
-# undef vaprintf
-# define printf curl_mprintf
-# define fprintf curl_mfprintf
-#ifdef CURLDEBUG
-/* When built with CURLDEBUG we define away the sprintf() functions since we
-   don't want internal code to be using them */
-# define sprintf sprintf_was_used
-# define vsprintf vsprintf_was_used
-#else
-# define sprintf curl_msprintf
-# define vsprintf curl_mvsprintf
-#endif
-# define snprintf curl_msnprintf
-# define vprintf curl_mvprintf
-# define vfprintf curl_mvfprintf
-# define vsnprintf curl_mvsnprintf
-# define aprintf curl_maprintf
-# define vaprintf curl_mvaprintf
-#endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* __CURL_MPRINTF_H */

contrib/ise_library/cURL/spec/include/curl/multi.h

@@ -1,346 +0,0 @@
-#ifndef __CURL_MULTI_H
-#define __CURL_MULTI_H
-/***************************************************************************
- *                                  _   _ ____  _
- *  Project                     ___| | | |  _ \| |
- *                             / __| | | | |_) | |
- *                            | (__| |_| |  _ <| |___
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-/*
-  This is an "external" header file. Don't give away any internals here!
-
-  GOALS
-
-  o Enable a "pull" interface. The application that uses libcurl decides where
-    and when to ask libcurl to get/send data.
-
-  o Enable multiple simultaneous transfers in the same thread without making it
-    complicated for the application.
-
-  o Enable the application to select() on its own file descriptors and curl's
-    file descriptors simultaneous easily.
-
-*/
-
-/*
- * This header file should not really need to include "curl.h" since curl.h
- * itself includes this file and we expect user applications to do #include
- * <curl/curl.h> without the need for especially including multi.h.
- *
- * For some reason we added this include here at one point, and rather than to
- * break existing (wrongly written) libcurl applications, we leave it as-is
- * but with this warning attached.
- */
-#include "curl.h"
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void CURLM;
-
-typedef enum {
-  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
-                                    curl_multi_socket*() soon */
-  CURLM_OK,
-  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
-  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
-  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
-  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
-  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
-  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
-  CURLM_LAST
-} CURLMcode;
-
-/* just to make code nicer when using curl_multi_socket() you can now check
-   for CURLM_CALL_MULTI_SOCKET too in the same style it works for
-   curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
-#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
-
-typedef enum {
-  CURLMSG_NONE, /* first, not used */
-  CURLMSG_DONE, /* This easy handle has completed. 'result' contains
-                   the CURLcode of the transfer */
-  CURLMSG_LAST /* last, not used */
-} CURLMSG;
-
-struct CURLMsg {
-  CURLMSG msg;       /* what this message means */
-  CURL *easy_handle; /* the handle it concerns */
-  union {
-    void *whatever;    /* message-specific data */
-    CURLcode result;   /* return code for transfer */
-  } data;
-};
-typedef struct CURLMsg CURLMsg;
-
-/*
- * Name:    curl_multi_init()
- *
- * Desc:    inititalize multi-style curl usage
- *
- * Returns: a new CURLM handle to use in all 'curl_multi' functions.
- */
-CURL_EXTERN CURLM *curl_multi_init(void);
-
-/*
- * Name:    curl_multi_add_handle()
- *
- * Desc:    add a standard curl handle to the multi stack
- *
- * Returns: CURLMcode type, general multi error code.
- */
-CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
-                                            CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_remove_handle()
-  *
-  * Desc:    removes a curl handle from the multi stack again
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-                                               CURL *curl_handle);
-
- /*
-  * Name:    curl_multi_fdset()
-  *
-  * Desc:    Ask curl for its fd_set sets. The app can use these to select() or
-  *          poll() on. We want curl_multi_perform() called as soon as one of
-  *          them are ready.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
-                                       fd_set *read_fd_set,
-                                       fd_set *write_fd_set,
-                                       fd_set *exc_fd_set,
-                                       int *max_fd);
-
- /*
-  * Name:    curl_multi_perform()
-  *
-  * Desc:    When the app thinks there's data available for curl it calls this
-  *          function to read/write whatever there is right now. This returns
-  *          as soon as the reads and writes are done. This function does not
-  *          require that there actually is data available for reading or that
-  *          data can be written, it can be called just in case. It returns
-  *          the number of handles that still transfer data in the second
-  *          argument's integer-pointer.
-  *
-  * Returns: CURLMcode type, general multi error code. *NOTE* that this only
-  *          returns errors etc regarding the whole multi stack. There might
-  *          still have occurred problems on invidual transfers even when this
-  *          returns OK.
-  */
-CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
-                                         int *running_handles);
-
- /*
-  * Name:    curl_multi_cleanup()
-  *
-  * Desc:    Cleans up and removes a whole multi stack. It does not free or
-  *          touch any individual easy handles in any way. We need to define
-  *          in what state those handles will be if this function is called
-  *          in the middle of a transfer.
-  *
-  * Returns: CURLMcode type, general multi error code.
-  */
-CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
-
-/*
- * Name:    curl_multi_info_read()
- *
- * Desc:    Ask the multi handle if there's any messages/informationals from
- *          the individual transfers. Messages include informationals such as
- *          error code from the transfer or just the fact that a transfer is
- *          completed. More details on these should be written down as well.
- *
- *          Repeated calls to this function will return a new struct each
- *          time, until a special "end of msgs" struct is returned as a signal
- *          that there is no more to get at this point.
- *
- *          The data the returned pointer points to will not survive calling
- *          curl_multi_cleanup().
- *
- *          The 'CURLMsg' struct is meant to be very simple and only contain
- *          very basic informations. If more involved information is wanted,
- *          we will provide the particular "transfer handle" in that struct
- *          and that should/could/would be used in subsequent
- *          curl_easy_getinfo() calls (or similar). The point being that we
- *          must never expose complex structs to applications, as then we'll
- *          undoubtably get backwards compatibility problems in the future.
- *
- * Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
- *          of structs. It also writes the number of messages left in the
- *          queue (after this read) in the integer the second argument points
- *          to.
- */
-CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
-                                          int *msgs_in_queue);
-
-/*
- * Name:    curl_multi_strerror()
- *
- * Desc:    The curl_multi_strerror function may be used to turn a CURLMcode
- *          value into the equivalent human readable error string.  This is
- *          useful for printing meaningful error messages.
- *
- * Returns: A pointer to a zero-terminated error message.
- */
-CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
-
-/*
- * Name:    curl_multi_socket() and
- *          curl_multi_socket_all()
- *
- * Desc:    An alternative version of curl_multi_perform() that allows the
- *          application to pass in one of the file descriptors that have been
- *          detected to have "action" on them and let libcurl perform.
- *          See man page for details.
- */
-#define CURL_POLL_NONE   0
-#define CURL_POLL_IN     1
-#define CURL_POLL_OUT    2
-#define CURL_POLL_INOUT  3
-#define CURL_POLL_REMOVE 4
-
-#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
-
-#define CURL_CSELECT_IN   0x01
-#define CURL_CSELECT_OUT  0x02
-#define CURL_CSELECT_ERR  0x04
-
-typedef int (*curl_socket_callback)(CURL *easy,      /* easy handle */
-                                    curl_socket_t s, /* socket */
-                                    int what,        /* see above */
-                                    void *userp,     /* private callback
-                                                        pointer */
-                                    void *socketp);  /* private socket
-                                                        pointer */
-/*
- * Name:    curl_multi_timer_callback
- *
- * Desc:    Called by libcurl whenever the library detects a change in the
- *          maximum number of milliseconds the app is allowed to wait before
- *          curl_multi_socket() or curl_multi_perform() must be called
- *          (to allow libcurl's timed events to take place).
- *
- * Returns: The callback should return zero.
- */
-typedef int (*curl_multi_timer_callback)(CURLM *multi,    /* multi handle */
-                                         long timeout_ms, /* see above */
-                                         void *userp);    /* private callback
-                                                             pointer */
-
-CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
-                                        int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
-                                               curl_socket_t s,
-                                               int ev_bitmask,
-                                               int *running_handles);
-
-CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
-                                            int *running_handles);
-
-#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
-/* This macro below was added in 7.16.3 to push users who recompile to use
-   the new curl_multi_socket_action() instead of the old curl_multi_socket()
-*/
-#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
-#endif
-
-/*
- * Name:    curl_multi_timeout()
- *
- * Desc:    Returns the maximum number of milliseconds the app is allowed to
- *          wait before curl_multi_socket() or curl_multi_perform() must be
- *          called (to allow libcurl's timed events to take place).
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
-                                         long *milliseconds);
-
-#undef CINIT /* re-using the same name as in curl.h */
-
-#ifdef CURL_ISOCPP
-#define CINIT(name,type,number) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + number
-#else
-/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
-#define LONG          CURLOPTTYPE_LONG
-#define OBJECTPOINT   CURLOPTTYPE_OBJECTPOINT
-#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
-#define OFF_T         CURLOPTTYPE_OFF_T
-#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
-#endif
-
-typedef enum {
-  /* This is the socket callback function pointer */
-  CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
-
-  /* This is the argument passed to the socket callback */
-  CINIT(SOCKETDATA, OBJECTPOINT, 2),
-
-    /* set to 1 to enable pipelining for this multi handle */
-  CINIT(PIPELINING, LONG, 3),
-
-   /* This is the timer callback function pointer */
-  CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
-
-  /* This is the argument passed to the timer callback */
-  CINIT(TIMERDATA, OBJECTPOINT, 5),
-
-  /* maximum number of entries in the connection cache */
-  CINIT(MAXCONNECTS, LONG, 6),
-
-  CURLMOPT_LASTENTRY /* the last unused */
-} CURLMoption;
-
-
-/*
- * Name:    curl_multi_setopt()
- *
- * Desc:    Sets options for the multi handle.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
-                                        CURLMoption option, ...);
-
-
-/*
- * Name:    curl_multi_assign()
- *
- * Desc:    This function sets an association in the multi handle between the
- *          given socket and a private pointer of the application. This is
- *          (only) useful for curl_multi_socket uses.
- *
- * Returns: CURLM error code.
- */
-CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
-                                        curl_socket_t sockfd, void *sockp);
-
-#ifdef __cplusplus
-} /* end of extern "C" */
-#endif
-
-#endif

contrib/ise_library/cURL/spec/include/curl/stdcheaders.h

@@ -1,34 +0,0 @@
-#ifndef __STDC_HEADERS_H
-#define __STDC_HEADERS_H
-/***************************************************************************
- *                                  _   _ ____  _     
- *  Project                     ___| | | |  _ \| |    
- *                             / __| | | | |_) | |    
- *                            | (__| |_| |  _ <| |___ 
- *                             \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2004, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at http://curl.haxx.se/docs/copyright.html.
- * 
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- * $Id$
- ***************************************************************************/
-
-#include <sys/types.h>
-
-size_t fread (void *, size_t, size_t, FILE *);
-size_t fwrite (const void *, size_t, size_t, FILE *);
-
-int strcasecmp(const char *, const char *);
-int strncasecmp(const char *, const char *, size_t);
-
-#endif

contrib/ise_library/cURL/spec/include/curl/types.h

@@ -1 +0,0 @@
-/* not used */

contrib/ise_library/cURL/spec/include/eiffel_curl.h

@@ -1,47 +0,0 @@
-/*
-indexing
-	description: "Functions used by the class CURL_FUNCTION."
-	copyright:	"Copyright (c) 1984-2006, Eiffel Software and others"
-	license:	"Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
-	source: "[
-			 Eiffel Software
-			 356 Storke Road, Goleta, CA 93117 USA
-			 Telephone 805-685-1006, Fax 805-685-6869
-			 Website http://www.eiffel.com
-			 Customer support http://support.eiffel.com
-		]"
-*/
-
-#ifndef _eiffel_curl_h_
-#define _eiffel_curl_h_
-
-#include "eif_eiffel.h"
-
-/* unix-specific */
-#ifndef EIF_WINDOWS 
-#include <sys/time.h>
-#include <unistd.h> 
-#endif
-
-#include <curl/curl.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void c_set_object(EIF_REFERENCE a_address);
-extern void c_release_object(void);
-extern void c_set_progress_function_address( EIF_POINTER a_address);
-extern void c_set_read_function_address( EIF_POINTER a_address);
-extern void c_set_write_function_address( EIF_POINTER a_address);
-extern void c_set_debug_function_address (EIF_POINTER a_address);
-extern size_t curl_write_function (void *ptr, size_t size, size_t nmemb, void *data);
-extern size_t curl_read_function (void *ptr, size_t size, size_t nmemb, void *data);
-extern size_t curl_progress_function (void * a_object_id, double a_dltotal, double a_dlnow, double a_ultotal, double a_ulnow);
-extern size_t curl_debug_function (CURL * a_curl_handle, curl_infotype a_curl_infotype, unsigned char * a_char_pointer, size_t a_size, void * a_object_id);
- 
-#ifdef __cplusplus
-}
-#endif
-
-#endif	

contrib/library/network/server/nino/library/spec/before_15_01/tcp_stream_socket.e

@@ -0,0 +1,82 @@
+note
+	description: "Summary description for {TCP_STREAM_SOCKET}."
+	date: "$Date: 2015-02-16 19:53:13 +0100 (lun., 16 févr. 2015) $"
+	revision: "$Revision: 96642 $"
+
+class
+	TCP_STREAM_SOCKET
+
+inherit
+	NETWORK_STREAM_SOCKET
+		redefine
+			make
+		end
+
+create
+	make_server_by_address_and_port,
+	make_server_by_port
+
+create {NETWORK_STREAM_SOCKET}
+	make_from_descriptor_and_address
+
+feature {NONE} -- Initialization
+
+	make
+			-- Create a network stream socket.
+		do
+			Precursor
+			set_reuse_address
+		end
+
+	make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
+			-- Create server socket on `an_address' and `a_port'.
+		require
+			valid_port: a_port >= 0
+		do
+			make
+			create address.make_from_address_and_port (an_address, a_port)
+			bind
+		end
+
+feature -- Basic operation
+
+	send_message (a_msg: STRING)
+		local
+			a_package : PACKET
+			a_data : MANAGED_POINTER
+			c_string : C_STRING
+		do
+			create c_string.make (a_msg)
+			create a_data.make_from_pointer (c_string.item, a_msg.count + 1)
+			create a_package.make_from_managed_pointer (a_data)
+			send (a_package, 1)
+		end
+
+feature -- Output
+
+	put_readable_string_8 (s: READABLE_STRING_8)
+			-- Write readable string `s' to socket.
+		local
+			ext: C_STRING
+		do
+			create ext.make (s)
+			put_managed_pointer (ext.managed_data, 0, s.count)
+		end
+
+feature -- Status report
+
+	try_ready_for_reading: BOOLEAN
+			-- Is data available for reading from the socket right now?
+		require
+			socket_exists: exists
+		local
+			retval: INTEGER
+		do
+			retval := c_select_poll_with_timeout (descriptor, True, 0)
+			Result := (retval > 0)
+		end
+
+note
+	copyright: "2011-2015, Javier Velilla and others"
+	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
+end

contrib/library/network/server/nino/library/tcp_stream_socket.e

@@ -8,16 +8,27 @@ class
 
 inherit
 	NETWORK_STREAM_SOCKET
+		redefine
+			make
+		end
 
 create
 	make_server_by_address_and_port,
 	make_server_by_port
 
 create {NETWORK_STREAM_SOCKET}
-	make_from_descriptor_and_address
+	make_from_descriptor_and_address,
+	make_empty
 
 feature {NONE} -- Initialization
 
+	make
+			-- Create a network stream socket.
+		do
+			Precursor
+			set_reuse_address
+		end
+
 	make_server_by_address_and_port (an_address: INET_ADDRESS; a_port: INTEGER)
 			-- Create server socket on `an_address' and `a_port'.
 		require
@@ -67,6 +78,6 @@ feature -- Status report
 		end
 
 note
-	copyright: "2011-2011, Javier Velilla and others"
+	copyright: "2011-2015, Javier Velilla and others"
 	license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
 end

contrib/library/network/server/nino/nino-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="nino" uuid="32C1D67D-33DE-4F1E-864B-D45388F2E3E6" library_target="nino">
 	<target name="nino">
 		<root all_classes="true"/>
 		<file_rule>
@@ -8,13 +8,28 @@
 			<exclude>/CVS$</exclude>
 			<exclude>/.svn$</exclude>
 		</file_rule>
-		<option warning="true" is_attached_by_default="true" void_safety="all">
+		<option warning="true" full_class_checking="false" is_attached_by_default="true" void_safety="all" syntax="transitional">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net-safe.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread-safe.ecf"/>
-		<cluster name="nino" location=".\library\" recursive="true"/>
+		<cluster name="nino" location=".\library\" recursive="true">
+			<file_rule>
+				<exclude>spec</exclude>
+			</file_rule>
+			<file_rule>
+				<exclude>tcp_stream_socket.e</exclude>
+				<condition>
+					<version type="compiler" max="15.01.9.6506"/>
+				</condition>
+			</file_rule>
+		</cluster>
+		<cluster name="spec_before_15_01" location=".\library\spec\before_15_01\" recursive="true">
+			<condition>
+				<version type="compiler" max="15.01.9.6506"/>
+			</condition>
+		</cluster>
 	</target>
 </system>

contrib/library/network/server/nino/nino.ecf

@@ -15,6 +15,21 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
 		<library name="net" location="$ISE_LIBRARY\library\net\net.ecf"/>
 		<library name="thread" location="$ISE_LIBRARY\library\thread\thread.ecf"/>
-		<cluster name="nino" location=".\library\" recursive="true"/>
+		<cluster name="nino" location=".\library\" recursive="true">
+			<file_rule>
+				<exclude>spec</exclude>
+			</file_rule>
+			<file_rule>
+				<exclude>tcp_stream_socket.e</exclude>
+				<condition>
+					<version type="compiler" max="15.01.9.6506"/>
+				</condition>
+			</file_rule>
+		</cluster>
+		<cluster name="spec_before_15_01" location=".\library\spec\before_15_01\" recursive="true">
+			<condition>
+				<version type="compiler" max="15.01.9.6506"/>
+			</condition>
+		</cluster>
 	</target>
 </system>

contrib/library/network/server/nino/nino.rc

@@ -1 +0,0 @@
-

contrib/library/text/parser/json/.gitattributes

@@ -0,0 +1,10 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+# * text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.e text
+*.ecf text
+*.bat text
+*.json text
+*.txt text

contrib/library/text/parser/json/.gitignore

@@ -1,2 +1,2 @@
 *.swp
-EIFGENs
+EIFGENs/

contrib/library/text/parser/json/History.txt

@@ -1,10 +1,12 @@
-History file for EJSON
+History file for EJSON
 ======================
 
 team: ""
 date: "2011-07-06"
 revision: "0.3.0"
 
+WARNING: THIS FILE IS NOT UP TO DATE
+
 
 +++++++++++++++++++++Important Changes since 0.2.0 version++++++++++++++++++++++++++++++++++++++++++++++
 

contrib/library/text/parser/json/License.txt

@@ -1,4 +1,5 @@
-Copyright (c)  2010 Javier Velilla and others, http://ejson.origo.ethz.ch
+Copyright (c)  2010-2014 Javier Velilla, Jocelyn Fiat and others,
+https://github.com/eiffelhub/json .
 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

contrib/library/text/parser/json/Readme.txt

@@ -1,21 +1,26 @@
 Readme file for eJSON
 =====================
 
-team: "Javier Velilla,Jocelyn Fiat, Paul Cohen"
-date: "$Date$"
-revision: "$Revision$"
+team: "Javier Velilla, Jocelyn Fiat"
+previous contributors: "Paul Cohen"
+date: "2014-nov-17"
 
 1. Introduction
 ---------------
 
 eJSON stands for Eiffel JSON library and is a small Eiffel library for dealing
-with the JSON format. The objective of the library is to provide two basic
-features Eiffel2JSON and JSON2Eiffel.
+with the JSON format. This library provides a JSON parser and visitors,
+including a pretty printer.
+
+The converters part is now obsolete and not recommended (remember: the
+objective of converters were to provide two basic features Eiffel2JSON and
+JSON2Eiffel). There will be a new design for converters as a standalone
+library on top of Current json library.
 
 2. Legal stuff
 --------------
 
-eJSON is copyrighted by the author Javier Velilla and others. It is licensed
+eJSON is copyrighted by the author Javier Velilla, Jocelyn Fiat and others. It is licensed
 under the MIT License. See the file license.txt in the same directory as this
 readme file.
 
@@ -46,11 +51,9 @@ Currently the only documentation on eJSON is available at:
 
 EJSON requires that you have:
 
-1. Gobo 3.9 installed or later
-2. One of the following compiler combinations installed:
-   * ISE Eiffel 6.5 or later.
+1. One of the following compiler combinations installed:
+   * ISE Eiffel 13.11 or later.
    * gec [try to test]
-   * tecomp [try to test]
 
 eJSON probably works fine with other versions of the above compilers.
 There are no known platform dependencies (Windows, Linux).
@@ -58,6 +61,8 @@ There are no known platform dependencies (Windows, Linux).
 To install eJSON simply extract the ejson-X.Y.Z.zip file to some appropriate
 place on your hard disk. There are no requirements on environment variables or
 registry variables. 
+Note eJSON is also delivered within EiffelStudio release, under
+$ISE_LIBRARY/contrib/library/text/parser/json
 
 To verify that everything works you should compile the example programs and/or
 the test program.
@@ -70,18 +75,18 @@ installation.
 
 Directory   Description
 ---------   -----------
-doc         Contains the eJSON.pdf documentation file.
-examples    Contains the two example programs.
-ejson       Contains the actual eJSON library classes.
-test        Contains a test program for eJSON.
+doc         Contains documentation file.
+examples    Contains example codes.
+library     Contains the actual eJSON library classes.
+test        Contains test suite for eJSON.
 
 7. Contacting the Team
 ----------------------
 
 Contact the team: 
 
+ https://github.com/eiffelhub/json/issues
  Javier Velilla «javier.hector@gmail.com»
- Paul Cohen «paco@seibostudios.se»
  Jocelyn Fiat «jfiat@eiffel.com»
 
 8. Releases
@@ -92,6 +97,16 @@ history.txt.
 
 Version Date            Description
 ------- ----            -----------
+0.6.0   2014-11-17      Fixed various issue with parsing string (such as \t and related),
+						Implemented escaping of slash '/' only in case of '</' to avoid 
+						  potential issue with javascript and </script>
+						Many feature renaming to match Eiffel style and naming convention, 
+						  kept previous feature as obsolete.
+				        Restructured the library to make easy extraction of "converter" 
+						  classes if needed in the future.
+				        Marked converters classes as obsolete.
+0.5.0   2013-11-dd      Added JSON_ITERATOR, simplified JSON_OBJECT
+0.4.0   2012-12-12      Updated documentation URI
 0.3.0   2011-07-06      JSON Factory Converters
 0.2.0   2010-02-07      Adapted to EiffelStudio 6.4 or later, supports void-safety
 0.1.0   2010-02-07      First release, Adapted to SmartEiffel 1.2r7 and EiffelStudio 6.2 or previous

contrib/library/text/parser/json/doc/user_guide.mediawiki

@@ -0,0 +1,295 @@
+== Preface ==
+
+This document is a living document! As always read and try out the code to understand what's really going on.
+
+=== About the project ===
+
+The eJSON project was started by Javier Velilla in 2008. The aim was simply to
+provide JSON support to Eiffel programmers. A couple of other people have been
+involved to various extent since the start; Berend de Boer, Jocelyn Fiat and
+Manu Stapf. In 2009 Paul Cohen joined the project as an active developer and
+later Jocelyn Fiat.
+
+The current active maintainers:
+- Javier Velilla
+- Jocelyn Fiat
+
+The formal name of the project is “eJSON”.
+
+For questions regarding eJSON please contact
+- <javier.hector at gmail.com> 
+- <jfiat at eiffel.com>
+- or directly on [https://github.com/eiffelhub/json/issues]
+
+=== Current version and status ===
+
+The latest release is 0.6.0. eJSON has been improved and cleaned.
+The converters are not obsolete.
+
+
+== Introduction ==
+
+=== What is JSON? ===
+
+JSON (JavaScript Object Notation) is a lightweight computer data interchange format. It is a text-based, human-readable format for representing simple data structures and associative arrays (called objects). See the [http://en.wikipedia.org/wiki/JSON Wikipedia article on JSON], [http://www.json.org www.json.org] and [http://www.json.com www.json.com] for more information.
+
+The JSON format is specified in [http://www.ietf.org/rfc/rfc4627.txt IETF RFC 4627] by Douglas Crockford. The official [http://www.iana.org/assignments/media-types Internet MIME media type] for JSON is "application/json". The recommended file name extension for JSON files is ".json".
+
+=== Advantages ===
+
+1. Lightweight data-interchange format.
+2. Easy for humans to read and write.
+3. Enables easy integration with AJAX/JavaScript web applications. See the article [http://www.developer.com/lang/jscript/article.php/3596836 Speeding Up AJAX with JSON] for a good short discussion on this subject.
+4. JSON data structures translate with ease into the native data structures universal to almost all programming languages used today.
+
+=== Use in Eiffel applications ===
+
+JSON can be used as a general serialization format for Eiffel objects. As such it could be used as a:
+
+* Data representation format in REST-based web service applications written in Eiffel.
+* Serialization format for Eiffel objects in persistence solutions.
+* File format for configuration files in Eiffel systems.
+
+=== Prerequisites ===
+
+eJSON works today with EiffelStudio 13.11
+There is an optional extension that requires the latest snapshot of the Gobo Eiffel libraries (a working snapshot is distributed with EiffelStudio). The depencencies on Gobo are on Gobo's unicode
+and regex libraries and for some of the extra features in eJSON, on Gobos structure classes DS_HASH_TABLE and DS_LINKED_LIST.
+
+eJSON is intended to work with all ECMA compliant Eiffel compilers.
+
+=== Installation ===
+
+You can either download a given release and install on your machine or you can get the latest snapshot of the code.
+To download go to the [http://ejson.origo.ethz.ch/download download page]. 
+To get the latest snapshot of the code do:
+
+:   $ git clone https://github.com/eiffelhub/json.git json
+
+*[https://github.com/eiffelhub/json/releases download page]
+*[https://github.com/eiffelhub/json github project]
+
+Note that the latest json release is also delivered with EiffelStudio installation under <code>$ISE_LIBRARY/contrib/library/text/parser/json</code>.
+
+
+=== Cluster and directory layout ===
+
+ 	json/
+ 	  library/ (Root directory for eJSON library classes)
+ 		kernel/ (All classes in this cluster should eventually only depend on ECMA Eiffel and FreeELKS).
+ 		  json_array.e
+ 		  json_boolean.e
+ 		  json_null.e
+ 		  json_number.e
+ 		  json_object.e
+ 		  json_string.e
+ 		  json_value.e
+		parser/
+		  json_parser.e
+		  json_parser_access.e
+		  json_reader.e
+		  json_tokens.e
+		utility/
+		  file/
+		     json_file_reader.e
+		  visitor/
+			json_visitor.e
+			json_iterator.e
+			json_pretty_string_visitor.e
+			print_json_visitor.e
+	    converters/ (JSON core converter classes !OBSOLETE!)
+ 		  json_converter.e
+ 		  json_hash_table_converter.e
+ 		  json_list_converter.e
+ 		  json_linked_list_converter.e
+ 		  json_arrayed_list_converter.e
+		  support/
+		    ejson.e
+			shared_ejson.e
+	    gobo_converters/ (JSON core converter classes support for GOBO !OBSOLETE!)
+		  converters/
+ 			json_ds_hash_table_converter.e
+ 			json_ds_linked_list_converter.e
+		  shared_gobo_ejson.e
+ 	  test/ (Contains autotest suite)
+ 		autotest/ (AutoTest based unit test).
+ 	  examples/ (Example code)
+
+=== Future development ===
+
+Here is a list of suggestions for future development of eJSON.
+* Ongoing: Provide a JSON_FACTORY class for easy conversion between arbitrary JSON and Eiffel values.
+* Ongoing: Provide a mechanism for users to add custom converters between JSON values and user space Eiffel classes.
+* Ongoing: Implement a full test framework for eJSON.
+* Suggestion: Investigate performance and improve it if neccessary.
+* Suggestion: Support JSON references. See [http://www.json.com/2007/10/19/json-referencing-proposal-and-library JSON Referencing Proposal and Library] and [http://www.sitepen.com/blog/2008/06/17/json-referencing-in-dojo JSON referencing in Dojo] for more information.
+* Suggestion: Support JSON path. See [http://goessner.net/articles/JsonPath JSONPath - XPath for JSON] for more information.
+* Suggestion: Support JSON schema validation. See [http://json-schema.org JSON Schema Proposal] for more information.
+* Suggestion: Support RDF JSON serialization. See [http://n2.talis.com/wiki/RDF_JSON_Specification RDF JSON Specification] for more information.
+* Suggestion: Add support to JSON classes for conversion from Eiffel manifest values. So one can write things like:
+
+== A simple example ==
+
+There are two basic approaches to using eJSON; either you use the basic JSON_VALUE classes, converting to and from JSON values to corresponding Eiffel instances or you use the high level eJSON interface class SHARED_EJSON. Of course you can use a mix of both approaches if you find it appropriate!
+
+Here is an example of how to create a JSON number value from an INTEGER and then obtain the JSON representation for that value.
+
+ 	simple_example is
+ 		local
+ 			i: INTEGER
+ 			jn: JSON_NUMBER
+ 			s: STRING
+ 		do
+ 			i := 42
+ 			create jn.make_integer (i)
+ 			s := jn.representation -- s.is_equal ("42")
+ 		end
+
+== Mapping of JSON values to Eiffel values == 
+
+=== JSON number ===
+
+JSON numbers are represented by the class JSON_NUMBER. JSON number values can be converted to/from NATURAL_*, INTEGER_* and REAL_64 values. For floating point values REAL_* is used. The complete mapping is as follows:
+
+JSON number ->  Eiffel:
+* -128 <= n <= +127 -> INTEGER_8
+* n can't be represented by INTEGER_8 and -32768 <= n <= +32767 -> INTEGER_16
+* n can't be represented by INTEGER_16 and -2147483648 <= n <= +2147483647 -> INTEGER_32
+* n can't be represented by INTEGER_32 and -9223372036854775808 <= n <= +9223372036854775807 -> INTEGER_64 
+* n can't be represented by INTEGER_64 and 9223372036854775808 <= n <= 18446744073709551615 -> NATURAL_64
+* n has fractional dot '.' -> REAL_64.
+* n -> eJSON exception if number can't be represented by a INTEGER_64, NATURAL_64 or REAL_64.
+
+Eiffel -> JSON number:
+* NATURAL_8, NATURAL_16, NATURAL_32, NATURAL_64, NATURAL -> JSON number
+* INTEGER_8, INTEGER_16, INTEGER_32, INTEGER_64, INTEGER -> JSON number
+* REAL_32, REAL_64, REAL -> JSON number
+
+You can use the following creation routines to create JSON_NUMBER instances:
+
+* JSON_NUMBER.make_integer 
+* JSON_NUMBER.make_real
+* JSON_NUMBER.make_natural
+
+ 	eiffel_to_json_number_representation is
+ 		local
+ 			i: INTEGER
+ 			r: REAL 
+ 			jn: JSON_NUMBER
+ 		do
+ 			print ("JSON representation of Eiffel INTEGER: '")
+ 			i := 123
+ 			create jn.make_integer (i)
+ 			print (jn.representation)
+ 			print ("'%N")
+ 			print ("JSON representation of Eiffel REAL: '")
+ 			r := 12.3
+ 			create jn.make_real (r)
+ 			print (jn.representation)
+ 			print ("'%N")
+ 		end
+
+The output of the above code will be: 
+
+ 	JSON representation of Eiffel INTEGER: '123'
+ 	JSON representation of Eiffel REAL: '12.300000190734863'
+
+=== JSON boolean ===
+
+JSON boolean values are represented by the class JSON_BOOLEAN. The JSON boolean value "true" is converted to/from the BOOLEAN value "True" and the JSON boolean value "false is converted to/from the BOOLEAN value "False".
+
+ 	eiffel_to_json_boolean_representation is
+ 		local
+ 			b: BOOLEAN
+ 			jb: JSON_BOOLEAN
+ 		do
+ 			print ("JSON representation of Eiffel BOOLEAN: '")
+ 			b := True
+ 			create jb.make (b)
+ 			print (jb.representation)
+ 			print ("'%N")
+ 			print("JSON representation of Eiffel BOOLEAN: '")
+ 			b := False
+ 			create jb.make (b)
+ 			print (jb.representation)
+ 			print ("'%N")
+ 		end
+
+The output of the above code will be: 
+
+ 	JSON representation of Eiffel BOOLEAN: 'true'
+ 	JSON representation of Eiffel BOOLEAN: 'false'
+
+=== JSON string ===
+
+JSON strings are represented by the class JSON_STRING. JSON string values can be converted to/from STRING_32, STRING and CHARACTER values. The complete mapping is as follows:
+
+JSON string ->  Eiffel:
+* All JSON strings -> STRING or STRING_32
+
+Eiffel -> JSON string:
+* STRING_32 -> JSON string
+* STRING -> JSON string
+* CHARACTER -> JSON string
+
+ 	eiffel_to_json_string_representation is
+ 		local
+ 			s: STRING
+ 			js: JSON_STRING
+ 		do
+ 			print ("JSON representation of Eiffel STRING: '")
+ 			s := "JSON rocks!"
+ 			create js.make_from_string (s)
+ 			print (js.representation)
+ 			print ("'%N")
+ 		end
+
+The output of the above code will be: 
+
+ 	JSON representation of Eiffel STRING: '"JSON rocks!"'
+
+Note: JSON escape unicode characters, as well a other specific characters, to get the unescaped string value, use either 'unescaped_string_8' or 'unescaped_string_32'.
+
+=== JSON null ===
+
+The JSON null value is represented by the class JSON_NULL. The JSON null value can be converted to/from Void.
+
+ 	eiffel_to_json_null_representation is
+ 		local
+ 			a: ANY
+ 			jn: JSON_NULL
+ 		do
+ 			create jn
+ 			print ("JSON representation for JSON null value: '")
+ 			print (jn.representation)
+ 			print ("'%N")
+ 			a := Void
+ 			if attached {JSON_NULL} json.value (a) as l_jn then -- json from SHARED_EJSON!
+ 				print ("JSON representation of Eiffel Void reference: '")
+ 				print (l_jn.representation)
+ 				print ("'%N")
+ 			end
+ 		end
+
+The output of the above code will be: 
+
+ 	JSON representation for JSON null value: 'null'
+ 	JSON representation of Eiffel Void reference: 'null'
+
+=== JSON array ===
+
+JSON array is represented by the class JSON_ARRAY. 
+
+=== JSON object ===
+
+JSON object is represented by the class JSON_OBJECT. 
+
+
+== The eJSON visitor pattern ==
+
+TBD. See examples.
+
+== The eJSON file reader class ==
+
+TBD.
+

contrib/library/text/parser/json/examples/basic/basic.e

@@ -0,0 +1,83 @@
+class
+	BASIC
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+			-- Initialize `Current'.
+		local
+			parser: JSON_PARSER
+			printer: JSON_PRETTY_STRING_VISITOR
+			s: STRING_32
+		do
+				-- Create parser for content `json_content'
+			create parser.make_with_string (json_content)
+				-- Parse the content
+			parser.parse_content
+			if
+				parser.is_valid and then
+				attached parser.parsed_json_value as jv
+			then
+					-- Json content is valid, and well parser.
+					-- and the parsed json value is `jv'
+
+					-- Let's access the glossary/title value
+				if
+					attached {JSON_OBJECT} jv as j_object and then
+					attached {JSON_OBJECT} j_object.item ("glossary") as j_glossary and then
+					attached {JSON_STRING} j_glossary.item ("title") as j_title
+				then
+					print ("The glossary title is %"" + j_title.unescaped_string_8 + "%".%N")
+				else
+					print ("The glossary title was not found!%N")
+				end
+
+					-- Pretty print the parsed JSON
+				create s.make_empty
+				create printer.make (s)
+				jv.accept (printer)
+				print ("The JSON formatted using a pretty printer:%N")
+				print (s)
+			end
+		end
+
+feature -- Status
+
+feature -- Access
+
+	json_content: STRING = "[
+{
+    "glossary": {
+        "title": "example glossary",
+		"GlossDiv": {
+            "title": "S",
+			"GlossList": {
+                "GlossEntry": {
+                    "ID": "SGML",
+					"SortAs": "SGML",
+					"GlossTerm": "Standard Generalized Markup Language",
+					"Acronym": "SGML",
+					"Abbrev": "ISO 8879:1986",
+					"GlossDef": {
+                        "para": "A meta-markup language, used to create markup languages such as DocBook.",
+						"GlossSeeAlso": ["GML", "XML"]
+                    },
+					"GlossSee": "markup"
+                }
+            }
+        }
+    }
+}
+	]"
+
+feature -- Change
+
+feature {NONE} -- Implementation
+
+invariant
+--	invariant_clause: True
+
+end

contrib/library/text/parser/json/examples/basic/basic.ecf

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-13-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-13-0 http://www.eiffel.com/developers/xml/configuration-1-13-0.xsd" name="basic" uuid="5156B9EE-0436-42A3-BDA1-74710DF05A35">
+	<target name="basic">
+		<root class="BASIC" feature="make"/>
+		<setting name="console_application" value="true"/>
+		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="json" location="..\..\library\json-safe.ecf" readonly="false"/>
+		<cluster name="basic" location=".\"/>
+	</target>
+</system>

contrib/library/text/parser/json/library/converter/json_arrayed_list_converter.e

@@ -5,9 +5,14 @@ note
 	revision: "$Revision$"
 	file: "$HeadURL: $"
 
-class JSON_ARRAYED_LIST_CONVERTER
+class
+	JSON_ARRAYED_LIST_CONVERTER
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
 
 inherit
+
 	JSON_LIST_CONVERTER
 		redefine
 			object
@@ -27,4 +32,7 @@ feature {NONE} -- Factory
 			create Result.make (nb)
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/converter/json_converter.e

@@ -0,0 +1,44 @@
+note
+	description: "A JSON converter"
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+	file: "$HeadURL: $"
+
+deferred class
+	JSON_CONVERTER
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
+inherit
+
+	SHARED_EJSON
+
+feature -- Access
+
+	object: ANY
+			-- Eiffel object
+		deferred
+		end
+
+feature -- Conversion
+
+	from_json (j: attached like to_json): detachable like object
+			-- Convert from JSON value.
+			-- Returns Void if unable to convert
+		deferred
+		end
+
+	to_json (o: like object): detachable JSON_VALUE
+			-- Convert to JSON value
+		deferred
+		end
+
+invariant
+	has_eiffel_object: object /= Void -- An empty object must be created at creation time!
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/converter/json_hash_table_converter.e

@@ -0,0 +1,88 @@
+note
+	description: "A JSON converter for HASH_TABLE [ANY, HASHABLE]"
+	author: "Paul Cohen"
+	date: "$Date: 2014-01-30 15:27:41 +0100 (jeu., 30 janv. 2014) $"
+	revision: "$Revision: 94128 $"
+	file: "$HeadURL: $"
+
+class
+	JSON_HASH_TABLE_CONVERTER
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
+inherit
+
+	JSON_CONVERTER
+
+create
+	make
+
+feature {NONE} -- Initialization
+
+	make
+		do
+			create object.make (0)
+		end
+
+feature -- Access
+
+	object: HASH_TABLE [ANY, HASHABLE]
+
+feature -- Conversion
+
+	from_json (j: attached like to_json): like object
+		do
+			create Result.make (j.count)
+			across
+				j as ic
+			loop
+				if attached json.object (ic.item, Void) as l_object then
+					if attached {HASHABLE} json.object (ic.key, Void) as h then
+						Result.put (l_object, h)
+					else
+						check
+							key_is_hashable: False
+						end
+					end
+				else
+					check
+						object_attached: False
+					end
+				end
+			end
+		end
+
+	to_json (o: like object): detachable JSON_OBJECT
+		local
+			js: JSON_STRING
+			failed: BOOLEAN
+		do
+			create Result.make
+			across
+				o as c
+			loop
+				if attached {JSON_STRING} json.value (c.key) as l_key then
+					js := l_key
+				else
+					if attached {READABLE_STRING_GENERAL} c.key as s_key then
+						create js.make_from_string_general (s_key)
+					else
+						create js.make_from_string (c.key.out)
+					end
+				end
+				if attached json.value (c.item) as jv then
+					Result.put (jv, js)
+				else
+					failed := True
+				end
+			end
+			if failed then
+				Result := Void
+			end
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end -- class JSON_HASH_TABLE_CONVERTER

contrib/library/text/parser/json/library/converter/json_linked_list_converter.e

@@ -5,9 +5,14 @@ note
 	revision: "$Revision$"
 	file: "$HeadURL: $"
 
-class JSON_LINKED_LIST_CONVERTER
+class
+	JSON_LINKED_LIST_CONVERTER
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
 
 inherit
+
 	JSON_LIST_CONVERTER
 		redefine
 			object
@@ -27,4 +32,7 @@ feature {NONE} -- Factory
 			create Result.make
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class JSON_LINKED_LIST_CONVERTER

contrib/library/text/parser/json/library/converter/json_list_converter.e

@@ -0,0 +1,80 @@
+note
+	description: "A JSON converter for LIST [ANY]"
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision$"
+	file: "$HeadURL: $"
+
+deferred class
+	JSON_LIST_CONVERTER
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
+inherit
+
+	JSON_CONVERTER
+
+feature {NONE} -- Initialization
+
+	make
+		do
+			object := new_object (0)
+		end
+
+feature -- Access
+
+	object: LIST [detachable ANY]
+
+feature {NONE} -- Factory
+
+	new_object (nb: INTEGER): like object
+		deferred
+		ensure
+			Result /= Void
+		end
+
+feature -- Conversion
+
+	from_json (j: attached like to_json): detachable like object
+		local
+			i: INTEGER
+		do
+			Result := new_object (j.count)
+			from
+				i := 1
+			until
+				i > j.count
+			loop
+				Result.extend (json.object (j [i], Void))
+				i := i + 1
+			end
+		end
+
+	to_json (o: like object): detachable JSON_ARRAY
+		local
+			c: ITERATION_CURSOR [detachable ANY]
+			failed: BOOLEAN
+		do
+			create Result.make (o.count)
+			from
+				c := o.new_cursor
+			until
+				c.after
+			loop
+				if attached json.value (c.item) as jv then
+					Result.add (jv)
+				else
+					failed := True
+				end
+				c.forth
+			end
+			if failed then
+				Result := Void
+			end
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/converter/support/ejson.e

@@ -5,9 +5,14 @@ note
 	revision: "$Revision$"
 	file: "$HeadURL: $"
 
-class EJSON
+class
+	EJSON
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
 
 inherit
+
 	EXCEPTIONS
 
 feature -- Access
@@ -25,7 +30,7 @@ feature -- Access
 			if an_object = Void then
 				create {JSON_NULL} Result
 			elseif attached {BOOLEAN} an_object as b then
-				create {JSON_BOOLEAN} Result.make_boolean (b)
+				create {JSON_BOOLEAN} Result.make (b)
 			elseif attached {INTEGER_8} an_object as i8 then
 				create {JSON_NUMBER} Result.make_integer (i8)
 			elseif attached {INTEGER_16} an_object as i16 then
@@ -47,7 +52,7 @@ feature -- Access
 			elseif attached {REAL_64} an_object as r64 then
 				create {JSON_NUMBER} Result.make_real (r64)
 			elseif attached {ARRAY [detachable ANY]} an_object as a then
-				create ja.make_array
+				create ja.make (a.count)
 				from
 					i := a.lower
 				until
@@ -56,22 +61,22 @@ feature -- Access
 					if attached value (a @ i) as v then
 						ja.add (v)
 					else
-						check value_attached: False end
+						check
+							value_attached: False
+						end
 					end
 					i := i + 1
 				end
 				Result := ja
 			elseif attached {CHARACTER_8} an_object as c8 then
-				create {JSON_STRING} Result.make_json (c8.out)
+				create {JSON_STRING} Result.make_from_string (c8.out)
 			elseif attached {CHARACTER_32} an_object as c32 then
-				create {JSON_STRING} Result.make_json (c32.out)
-
+				create {JSON_STRING} Result.make_from_string_32 (create {STRING_32}.make_filled (c32, 1))
 			elseif attached {STRING_8} an_object as s8 then
-				create {JSON_STRING} Result.make_json (s8)
+				create {JSON_STRING} Result.make_from_string (s8)
 			elseif attached {STRING_32} an_object as s32 then
-				create {JSON_STRING} Result.make_json_from_string_32 (s32)
+				create {JSON_STRING} Result.make_from_string_32 (s32)
 			end
-
 			if Result = Void then
 					-- Now check the converters
 				if an_object /= Void and then attached converter_for (an_object) as jc then
@@ -160,12 +165,10 @@ feature -- Access
 			-- "eJSON exception" if unable to convert value.
 		require
 			json_not_void: json /= Void
-		local
-			jv: detachable JSON_VALUE
 		do
 			json_parser.set_representation (json)
-			jv := json_parser.parse
-			if jv /= Void then
+			json_parser.parse_content
+			if json_parser.is_valid and then attached json_parser.parsed_json_value as jv then
 				Result := object (jv, base_class)
 			end
 		end
@@ -190,8 +193,8 @@ feature -- Access
 			js_key, js_value: JSON_STRING
 		do
 			create Result.make
-			create js_key.make_json ("$ref")
-			create js_value.make_json (s)
+			create js_key.make_from_string ("$ref")
+			create js_value.make_from_string (s)
 			Result.put (js_value, js_key)
 		end
 
@@ -205,7 +208,7 @@ feature -- Access
 		local
 			c: ITERATION_CURSOR [STRING]
 		do
-			create Result.make_array
+			create Result.make (l.count)
 			from
 				c := l.new_cursor
 			until
@@ -262,7 +265,10 @@ feature {NONE} -- Implementation (JSON parser)
 
 	json_parser: JSON_PARSER
 		once
-			create Result.make_parser ("")
+			create Result.make_with_string ("{}")
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end -- class EJSON

contrib/library/text/parser/json/library/converter/support/shared_ejson.e

@@ -0,0 +1,43 @@
+note
+	description: "[
+		Shared factory class for creating JSON objects. Maps JSON
+		objects to ELKS HASH_TABLEs and JSON arrays to ELKS
+		LINKED_LISTs. Use non-conforming inheritance from this 
+		class to ensure that your classes share the same 
+		JSON_FACTORY instance.
+	]"
+	author: "Paul Cohen"
+	date: "$Date$"
+	revision: "$Revision: 89185 $"
+	file: "$HeadURL: $"
+
+class
+	SHARED_EJSON
+
+obsolete
+	"This JSON converter design has issues [Sept/2014]."
+
+feature -- Access
+
+	json: EJSON
+			-- A shared EJSON instance with default converters for
+			--LINKED_LIST [ANY] and HASH_TABLE [ANY, HASHABLE]
+		local
+			jalc: JSON_ARRAYED_LIST_CONVERTER
+			jllc: JSON_LINKED_LIST_CONVERTER
+			jhtc: JSON_HASH_TABLE_CONVERTER
+		once
+			create Result
+			create jalc.make
+			Result.add_converter (jalc)
+			create jllc.make
+			Result.add_converter (jllc)
+			create jhtc.make
+			Result.add_converter (jhtc)
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+
+end -- class SHARED_EJSON

contrib/library/text/parser/json/library/extras/file/json_file_reader.e

@@ -1,38 +0,0 @@
-note
-	description: "Objects that ..."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	JSON_FILE_READER
-
-feature -- Access
-
-	read_json_from (a_path: STRING): detachable STRING
-		local
-			l_file: PLAIN_TEXT_FILE
-			template_content: STRING
-			l_last_string: detachable STRING
-		do
-			create l_file.make (a_path)
-				-- We perform several checks until we make a real attempt to open the file.
-			if not l_file.exists then
-				print ("error: '" + a_path + "' does not exist%N")
-			else
-				if not l_file.is_readable then
-					print ("error: '" + a_path + "' is not readable.%N")
-				else
-					l_file.open_read
-					create template_content.make_empty
-					l_file.read_stream (l_file.count)
-					l_last_string := l_file.last_string
-					check l_last_string /= Void end -- implied by postcondition of `l_file.read_stream'
-					template_content.append (l_last_string.string)
-					Result := template_content
-					l_file.close
-				end
-			end
-		end
-
-end

contrib/library/text/parser/json/library/json-safe.ecf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-12-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-12-0 http://www.eiffel.com/developers/xml/configuration-1-12-0.xsd" name="json" uuid="4E21C3BD-7951-4C6E-A673-431E762D7414" library_target="json">
 	<target name="json">
 		<root all_classes="true"/>
 		<file_rule>
@@ -9,20 +9,13 @@
 		</file_rule>
 		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
-			<warning name="export_class_missing" enabled="false"/>
-			<warning name="old_verbatim_strings" enabled="false"/>
-			<warning name="syntax" enabled="false"/>
-			<warning name="vjrv" enabled="false"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf" readonly="true"/>
-		<cluster name="json" location=".\" recursive="true">
-			<file_rule>
-				<exclude>^/gobo$</exclude>
-				<exclude>^/kernel$</exclude>
-				<exclude>^/extras$</exclude>
-			</file_rule>
-			<cluster name="kernel" location=".\kernel\" recursive="true"/>
-			<cluster name="extras" location=".\extras\" recursive="true"/>
+		<cluster name="json" location=".\">
+			<cluster name="json_kernel" location=".\kernel\" recursive="true"/>
+			<cluster name="json_parser" location=".\parser\" recursive="true"/>
+			<cluster name="json_utility" location=".\utility\" recursive="true"/>
 		</cluster>
+		<cluster name="json_converter" location=".\converter\" recursive="true"/>
 	</target>
 </system>

contrib/library/text/parser/json/library/json.ecf

@@ -9,20 +9,13 @@
 		</file_rule>
 		<option trace="false" profile="false" debug="false" warning="true" full_class_checking="true" void_safety="none" syntax="standard" namespace="EJSON.Library">
 			<assertions/>
-			<warning name="export_class_missing" enabled="false"/>
-			<warning name="old_verbatim_strings" enabled="false"/>
-			<warning name="syntax" enabled="false"/>
-			<warning name="vjrv" enabled="false"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
-		<cluster name="json" location=".\" recursive="true">
-			<file_rule>
-				<exclude>^/gobo$</exclude>
-				<exclude>^/kernel$</exclude>
-				<exclude>^/extras$</exclude>
-			</file_rule>
-			<cluster name="kernel" location=".\kernel\" recursive="true"/>
-			<cluster name="extras" location=".\extras\" recursive="true"/>
+		<cluster name="json" location=".\" >
+			<cluster name="json_kernel" location=".\kernel" recursive="true"/>
+			<cluster name="json_parser" location=".\parser" recursive="true"/>
+			<cluster name="json_utility" location=".\utility" recursive="true"/>
 		</cluster>
+		<cluster name="json_converter" location=".\converter" recursive="true"/>
 	</target>
 </system>

contrib/library/text/parser/json/library/json.rc

@@ -1 +0,0 @@
-

contrib/library/text/parser/json/library/json_gobo_extension.ecf

@@ -12,6 +12,6 @@
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf" readonly="true"/>
 		<library name="json" location="json.ecf" readonly="true"/>
 		<library name="gobo_structure" location="$ISE_LIBRARY\library\gobo\gobo_structure.ecf"/>
-		<cluster name="json_gobo" location=".\gobo" recursive="true" />
+		<cluster name="json_gobo_converter" location=".\gobo_converter" recursive="true" />
 	</target>
 </system>

contrib/library/text/parser/json/library/kernel/converters/json_converter.e

@@ -1,36 +0,0 @@
-note
-	description: "A JSON converter"
-	author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
-	file: "$HeadURL: $"
-
-deferred class JSON_CONVERTER
-
-inherit
-    SHARED_EJSON
-
-feature -- Access
-
-    object: ANY
-            -- Eiffel object
-        deferred
-        end
-
-feature -- Conversion
-
-    from_json (j: attached like to_json): detachable like object
-            -- Convert from JSON value. 
-			-- Returns Void if unable to convert
-        deferred
-        end
-
-    to_json (o: like object): detachable JSON_VALUE
-            -- Convert to JSON value
-        deferred
-        end
-
-invariant
-    has_eiffel_object: object /= Void -- An empty object must be created at creation time!
-
-end

contrib/library/text/parser/json/library/kernel/converters/json_hash_table_converter.e

@@ -1,92 +0,0 @@
-note
-    description: "A JSON converter for HASH_TABLE [ANY, HASHABLE]"
-    author: "Paul Cohen"
-	date: "$Date$"
-	revision: "$Revision$"
-    file: "$HeadURL: $"
-
-class JSON_HASH_TABLE_CONVERTER
-
-inherit
-    JSON_CONVERTER
-
-create
-    make
-
-feature {NONE} -- Initialization
-
-    make
-        do
-            create object.make (0)
-        end
-
-feature -- Access
-
-    object: HASH_TABLE [ANY, HASHABLE]
-
-feature -- Conversion
-
-    from_json (j: attached like to_json): like object
-        local
-            keys: ARRAY [JSON_STRING]
-            i: INTEGER
-            h: detachable HASHABLE
-            jv: detachable JSON_VALUE
-            a: detachable ANY
-        do
-            keys := j.current_keys
-            create Result.make (keys.count)
-            from
-                i := 1
-            until
-                i > keys.count
-            loop
-                h ?= json.object (keys [i], Void)
-                check h /= Void end
-                jv := j.item (keys [i])
-                if jv /= Void then
-	                a := json.object (jv, Void)
-	                if a /= Void then
-	                	Result.put (a, h)
-	                else
-	                	check a_attached: a /= Void end
-	                end
-				else
-					check j_has_item: False end
-                end
-                i := i + 1
-            end
-        end
-
-    to_json (o: like object): detachable JSON_OBJECT
-        local
-        	c: HASH_TABLE_ITERATION_CURSOR [ANY, HASHABLE]
-            js: JSON_STRING
-            jv: detachable JSON_VALUE
-            failed: BOOLEAN
-        do
-            create Result.make
-            from
-            	c := o.new_cursor
-            until
-                c.after
-            loop
-                if attached {JSON_STRING} json.value (c.key) as l_key then
-                    js := l_key
-                else
-                    create js.make_json (c.key.out)
-                end
-                jv := json.value (c.item)
-                if jv /= Void then
-                    Result.put (jv, js)
-                else
-                    failed := True
-                end
-                c.forth
-            end
-            if failed then
-                Result := Void
-            end
-        end
-
-end -- class JSON_HASH_TABLE_CONVERTER

contrib/library/text/parser/json/library/kernel/converters/json_list_converter.e

@@ -1,74 +0,0 @@
-note
-    description: "A JSON converter for LIST [ANY]"
-    author: "Paul Cohen"
-    date: "$Date$"
-    revision: "$Revision$"
-    file: "$HeadURL: $"
-
-deferred class JSON_LIST_CONVERTER
-
-inherit
-    JSON_CONVERTER
-
-feature {NONE} -- Initialization
-
-    make
-		do
-			object := new_object (0)
-        end
-
-feature -- Access
-
-    object: LIST [detachable ANY]
-
-feature {NONE} -- Factory
-
-	new_object (nb: INTEGER): like object
-		deferred
-		ensure
-			Result /= Void
-		end
-
-feature -- Conversion
-
-    from_json (j: attached like to_json): detachable like object
-        local
-            i: INTEGER
-        do
-           	Result := new_object (j.count)
-            from
-                i := 1
-            until
-                i > j.count
-            loop
-                Result.extend (json.object (j [i], Void))
-                i := i + 1
-            end
-        end
-
-    to_json (o: like object): detachable JSON_ARRAY
-        local
-            c: ITERATION_CURSOR [detachable ANY]
-            jv: detachable JSON_VALUE
-			failed: BOOLEAN
-        do
-            create Result.make_array
-            from
-            	c := o.new_cursor
-            until
-                c.after
-            loop
-                jv := json.value (c.item)
-            	if jv /= Void then
-            		Result.add (jv)
-            	else
-					failed := True
-            	end
-				c.forth
-            end
-			if failed then
-				Result := Void
-			end
-        end
-
-end -- class JSON_ARRAYED_LIST_CONVERTER

contrib/library/text/parser/json/library/kernel/json_array.e

@@ -7,28 +7,45 @@ note
 		    []
 		    [elements]
 	]"
-
-    author: "Javier Velilla"
-    date: "2008/08/24"
-    revision: "Revision 0.1"
+	author: "$Author$"
+	date: "$date$"
+	revision: "$Revision$"
 
 class
 	JSON_ARRAY
 
 inherit
+
 	JSON_VALUE
 
+	ITERABLE [JSON_VALUE]
+
 	DEBUG_OUTPUT
 
 create
+	make, make_empty,
 	make_array
 
 feature {NONE} -- Initialization
 
+	make (nb: INTEGER)
+			-- Initialize JSON array with capacity of `nb' items.
+		do
+			create items.make (nb)
+		end
+
+	make_empty
+			-- Initialize empty JSON array.
+		do
+			make (0)
+		end
+
 	make_array
 			-- Initialize JSON Array
+		obsolete
+			"Use `make' Sept/2014"
 		do
-            create values.make (10)
+			make (10)
 		end
 
 feature -- Access
@@ -38,24 +55,19 @@ feature -- Access
 		require
 			is_valid_index: valid_index (i)
 		do
-            Result := values.i_th (i)
+			Result := items.i_th (i)
 		end
 
 	representation: STRING
-        local
-            i: INTEGER
 		do
 			Result := "["
-            from
-                i := 1
-            until
-                i > count
+			across
+				items as ic
 			loop
-                Result.append (i_th (i).representation)
-                i := i + 1
-                if i <= count then
+				if Result.count > 1 then
 					Result.append_character (',')
 				end
+				Result.append (ic.item.representation)
 			end
 			Result.append_character (']')
 		end
@@ -69,12 +81,20 @@ feature -- Visitor pattern
 			a_visitor.visit_json_array (Current)
 		end
 
+feature -- Access
+
+	new_cursor: ITERATION_CURSOR [JSON_VALUE]
+			-- Fresh cursor associated with current structure
+		do
+			Result := items.new_cursor
+		end
+
 feature -- Mesurement
 
 	count: INTEGER
 			-- Number of items.
 		do
-            Result := values.count
+			Result := items.count
 		end
 
 feature -- Status report
@@ -87,39 +107,67 @@ feature -- Status report
 
 feature -- Change Element
 
-    add (value: JSON_VALUE)
+	put_front (v: JSON_VALUE)
 		require
-            value_not_null: value /= void
+			v_not_void: v /= Void
 		do
-            values.extend (value)
+			items.put_front (v)
 		ensure
-            has_new_value: old values.count + 1 = values.count and
-                              values.has (value)
+			has_new_value: old items.count + 1 = items.count and items.first = v
+		end
+
+	add, extend (v: JSON_VALUE)
+		require
+			v_not_void: v /= Void
+		do
+			items.extend (v)
+		ensure
+			has_new_value: old items.count + 1 = items.count and items.has (v)
+		end
+
+	prune_all (v: JSON_VALUE)
+			-- Remove all occurrences of `v'.
+		require
+			v_not_void: v /= Void
+		do
+			items.prune_all (v)
+		ensure
+			not_has_new_value: not items.has (v)
+		end
+
+	wipe_out
+			-- Remove all items.
+		do
+			items.wipe_out
  		end
 
 feature -- Report
 
 	hash_code: INTEGER
 			-- Hash code value
+		local
+			l_started: BOOLEAN
 		do
-            from
-                values.start
-                Result := values.item.hash_code
-            until
-                values.off
+			across
+				items as ic
 			loop
-                Result:= ((Result \\ 8388593) |<< 8) + values.item.hash_code
-                values.forth
+				if l_started then
+					Result := ((Result \\ 8388593) |<< 8) + ic.item.hash_code
+				else
+					Result := ic.item.hash_code
+					l_started := True
 				end
-            Result := Result \\ values.count
+			end
+			Result := Result \\ items.count
 		end
 
 feature -- Conversion
 
 	array_representation: ARRAYED_LIST [JSON_VALUE]
-            -- Representation as a sequences of values
+			-- Representation as a sequences of values.
+			-- be careful, modifying the return object may have impact on the original JSON_ARRAY object.		
 		do
-            Result := values
+			Result := items
 		end
 
 feature -- Status report
@@ -127,15 +175,18 @@ feature -- Status report
 	debug_output: STRING
 			-- String that should be displayed in debugger to represent `Current'.
 		do
-            Result := count.out
+			Result := count.out + " item(s)"
 		end
 
 feature {NONE} -- Implementation
 
-    values: ARRAYED_LIST [JSON_VALUE]
+	items: ARRAYED_LIST [JSON_VALUE]
 			-- Value container
 
 invariant
-     value_not_void: values /= Void
+	items_not_void: items /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_boolean.e

@@ -1,24 +1,47 @@
 note
-    description: "JSON Truth values"
-    author: "Javier Velilla"
-    date: "2008/08/24"
-    revision: "Revision 0.1"
+	description: "JSON Boolean values"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 
 class
 	JSON_BOOLEAN
 
 inherit
+
 	JSON_VALUE
 
 create
+	make,
+	make_true, make_false,
 	make_boolean
 
 feature {NONE} -- Initialization
 
-    make_boolean (an_item: BOOLEAN)
-            --Initialize.
+	make (a_value: BOOLEAN)
+			-- Initialize Current JSON boolean with `a_boolean'.
 		do
-            item := an_item
+			item := a_value
+		end
+
+	make_true
+			-- Initialize Current JSON boolean with True.
+		do
+			make (True)
+		end
+
+	make_false
+			-- Initialize Current JSON boolean with False.
+		do
+			make (False)
+		end
+
+	make_boolean (a_item: BOOLEAN)
+			-- Initialize.
+		obsolete
+			"Use `make' Sept/2014"
+		do
+			make (a_item)
 		end
 
 feature -- Access
@@ -58,4 +81,7 @@ feature -- Status report
 			Result := item.out
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_null.e

@@ -8,6 +8,7 @@ class
 	JSON_NULL
 
 inherit
+
 	JSON_VALUE
 
 feature --Access
@@ -44,4 +45,7 @@ feature {NONE}-- Implementation
 
 	null_value: STRING = "null"
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_number.e

@@ -1,24 +1,22 @@
 note
-
 	description: "JSON Numbers, octal and hexadecimal formats are not used."
-    author: "Javier Velilla"
-    date: "2008/08/24"
-    revision: "Revision 0.1"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
 
 class
 	JSON_NUMBER
 
 inherit
+
 	JSON_VALUE
 		redefine
 			is_equal
 		end
 
 create
-    make_integer,
-    make_natural,
-    make_real
+	make_integer, make_natural, make_real
 
 feature {NONE} -- initialization
 
@@ -26,21 +24,21 @@ feature {NONE} -- initialization
 			-- Initialize an instance of JSON_NUMBER from the integer value of `an_argument'.
 		do
 			item := an_argument.out
-            numeric_type := INTEGER_TYPE
+			numeric_type := integer_type
 		end
 
 	make_natural (an_argument: NATURAL_64)
 			-- Initialize an instance of JSON_NUMBER from the unsigned integer value of `an_argument'.
 		do
 			item := an_argument.out
-            numeric_type := NATURAL_TYPE
+			numeric_type := natural_type
 		end
 
-    make_real (an_argument: DOUBLE)
+	make_real (an_argument: REAL_64)
 			-- Initialize an instance of JSON_NUMBER from the floating point value of `an_argument'.
 		do
 			item := an_argument.out
-            numeric_type := DOUBLE_TYPE
+			numeric_type := double_type
 		end
 
 feature -- Access
@@ -48,6 +46,9 @@ feature -- Access
 	item: STRING
 			-- Content
 
+	numeric_type: INTEGER
+			-- Type of number (integer, natural or real).
+
 	hash_code: INTEGER
 			--Hash code value
 		do
@@ -59,6 +60,52 @@ feature -- Access
 			Result := item
 		end
 
+feature -- Conversion
+
+	integer_64_item: INTEGER_64
+			-- Associated integer value.
+		require
+			is_integer: is_integer
+		do
+			Result := item.to_integer_64
+		end
+
+	natural_64_item: NATURAL_64
+			-- Associated natural value.
+		require
+			is_natural: is_natural
+		do
+			Result := item.to_natural_64
+		end
+
+	double_item, real_64_item: REAL_64
+			-- Associated real value.
+		require
+			is_real: is_real
+		do
+			Result := item.to_real_64
+		end
+
+feature -- Status report
+
+	is_integer: BOOLEAN
+			-- Is Current an integer number?
+		do
+			Result := numeric_type = integer_type
+		end
+
+	is_natural: BOOLEAN
+			-- Is Current a natural number?
+		do
+			Result := numeric_type = natural_type
+		end
+
+	is_double, is_real: BOOLEAN
+			-- Is Current a real number?
+		do
+			Result := numeric_type = real_type
+		end
+
 feature -- Visitor pattern
 
 	accept (a_visitor: JSON_VISITOR)
@@ -87,13 +134,16 @@ feature -- Status report
 
 feature -- Implementation
 
-    INTEGER_TYPE: INTEGER = 1
-    DOUBLE_TYPE: INTEGER = 2
-    NATURAL_TYPE: INTEGER = 3
+	integer_type: INTEGER = 1
 
-    numeric_type: INTEGER
+	double_type, real_type: INTEGER = 2
+
+	natural_type: INTEGER = 3
 
 invariant
 	item_not_void: item /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_object.e

@@ -1,114 +1,251 @@
 note
-
 	description: "[
 		            An JSON_OBJECT represent an object in JSON.
 		            An object is an unordered set of name/value pairs
 		
 					Examples:
-
 						object
 						{}
-                        {"key","value"}
-
+						{"key": value}
+						{"key": "value"}
 	]"
-    author: "Javier Velilla"
-    date: "2008/08/24"
-    revision: "Revision 0.1"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
 
 class
 	JSON_OBJECT
 
 inherit
+
 	JSON_VALUE
 
 	TABLE_ITERABLE [JSON_VALUE, JSON_STRING]
 
+	DEBUG_OUTPUT
+
 create
-    make
+	make_empty, make_with_capacity, make
 
 feature {NONE} -- Initialization
 
-    make
-            -- Initialize
+	make_with_capacity (nb: INTEGER)
+			-- Initialize with a capacity of `nb' items.
 		do
-            create object.make (10)
+			create items.make (nb)
+		end
+
+	make_empty
+			-- Initialize as empty object.
+		do
+			make_with_capacity (0)
+		end
+
+	make
+			-- Initialize with default capacity.
+		do
+			make_with_capacity (3)
 		end
 
 feature -- Change Element
 
-    put (value: detachable JSON_VALUE; key: JSON_STRING)
-            -- Assuming there is no item of key `key',
-            -- insert `value' with `key'.
+	put (a_value: detachable JSON_VALUE; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
 		require
-            key_not_present: not has_key (key)
-        local
-            l_value: like value
+			a_key_not_present: not has_key (a_key)
 		do
-            l_value := value
-            if l_value = Void then
-                create {JSON_NULL} l_value
+			if a_value = Void then
+				items.extend (create {JSON_NULL}, a_key)
+			else
+				items.extend (a_value, a_key)
 			end
-            object.extend (l_value, key)
 		end
 
-    replace (value: detachable JSON_VALUE; key: JSON_STRING)
-            -- Assuming there is no item of key `key',
-            -- insert `value' with `key'.
+	put_string (a_value: READABLE_STRING_GENERAL; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		require
+			key_not_present: not has_key (a_key)
 		local
-            l_value: like value
+			l_value: JSON_STRING
 		do
-            l_value := value
-            if l_value = Void then
-                create {JSON_NULL} l_value
+			if attached {READABLE_STRING_8} a_value as s then
+				create l_value.make_from_string (s)
+			else
+				create l_value.make_from_string_32 (a_value.as_string_32)
 			end
-            object.force (l_value, key)
+			put (l_value, a_key)
+		end
+
+	put_integer (a_value: INTEGER_64; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		require
+			key_not_present: not has_key (a_key)
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_integer (a_value)
+			put (l_value, a_key)
+		end
+
+	put_natural (a_value: NATURAL_64; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		require
+			key_not_present: not has_key (a_key)
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_natural (a_value)
+			put (l_value, a_key)
+		end
+
+	put_real (a_value: DOUBLE; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		require
+			key_not_present: not has_key (a_key)
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_real (a_value)
+			put (l_value, a_key)
+		end
+
+	put_boolean (a_value: BOOLEAN; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		require
+			key_not_present: not has_key (a_key)
+		local
+			l_value: JSON_BOOLEAN
+		do
+			create l_value.make (a_value)
+			put (l_value, a_key)
+		end
+
+	replace (a_value: detachable JSON_VALUE; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		do
+			if a_value = Void then
+				items.force (create {JSON_NULL}, a_key)
+			else
+				items.force (a_value, a_key)
+			end
+		end
+
+	replace_with_string (a_value: READABLE_STRING_GENERAL; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		local
+			l_value: JSON_STRING
+		do
+			if attached {READABLE_STRING_8} a_value as s then
+				create l_value.make_from_string (s)
+			else
+				create l_value.make_from_string_32 (a_value.as_string_32)
+			end
+			replace (l_value, a_key)
+		end
+
+	replace_with_integer (a_value: INTEGER_64; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_integer (a_value)
+			replace (l_value, a_key)
+		end
+
+	replace_with_with_natural (a_value: NATURAL_64; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_natural (a_value)
+			replace (l_value, a_key)
+		end
+
+	replace_with_real (a_value: DOUBLE; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		local
+			l_value: JSON_NUMBER
+		do
+			create l_value.make_real (a_value)
+			replace (l_value, a_key)
+		end
+
+	replace_with_boolean (a_value: BOOLEAN; a_key: JSON_STRING)
+			-- Assuming there is no item of key `a_key',
+			-- insert `a_value' with `a_key'.
+		local
+			l_value: JSON_BOOLEAN
+		do
+			create l_value.make (a_value)
+			replace (l_value, a_key)
+		end
+
+	remove (a_key: JSON_STRING)
+			-- Remove item indexed by `a_key' if any.
+		do
+			items.remove (a_key)
+		end
+
+	wipe_out
+			-- Reset all items to default values; reset status.
+		do
+			items.wipe_out
+		end
+
+feature -- Status report
+
+	has_key (a_key: JSON_STRING): BOOLEAN
+			-- has the JSON_OBJECT contains a specific key `a_key'.
+		do
+			Result := items.has (a_key)
+		end
+
+	has_item (a_value: JSON_VALUE): BOOLEAN
+			-- has the JSON_OBJECT contain a specfic item `a_value'
+		do
+			Result := items.has_item (a_value)
 		end
 
 feature -- Access
 
-    has_key (key: JSON_STRING): BOOLEAN
-            -- has the JSON_OBJECT contains a specific key 'key'.
+	item (a_key: JSON_STRING): detachable JSON_VALUE
+			-- the json_value associated with a key `a_key'.
 		do
-            Result := object.has (key)
-        end
-
-    has_item (value: JSON_VALUE): BOOLEAN
-            -- has the JSON_OBJECT contain a specfic item 'value'
-        do
-            Result := object.has_item (value)
-        end
-
-    item (key: JSON_STRING): detachable JSON_VALUE
-            -- the json_value associated with a key.
-        do
-            Result := object.item (key)
+			Result := items.item (a_key)
 		end
 
 	current_keys: ARRAY [JSON_STRING]
-            -- array containing actually used keys
+			-- Array containing actually used keys.
 		do
-            Result := object.current_keys
+			Result := items.current_keys
 		end
 
 	representation: STRING
-        local
-            t: HASH_TABLE [JSON_VALUE, JSON_STRING]
+			-- <Precursor>
 		do
-            Result := "{"
-            from
-                t := map_representation
-                t.start
-            until
-                t.after
+			create Result.make (2)
+			Result.append_character ('{')
+			across
+				items as ic
 			loop
-                Result.append (t.key_for_iteration.representation)
-                Result.append (":")
-                Result.append (t.item_for_iteration.representation)
-                t.forth
-                if not t.after then
+				if Result.count > 1 then
 					Result.append_character (',')
 				end
+				Result.append (ic.key.representation)
+				Result.append_character (':')
+				Result.append (ic.item.representation)
 			end
 			Result.append_character ('}')
 		end
@@ -116,9 +253,9 @@ feature -- Access
 feature -- Mesurement
 
 	count: INTEGER
-			-- Number of field
+			-- Number of field.
 		do
-			Result := object.count
+			Result := items.count
 		end
 
 feature -- Access
@@ -126,7 +263,7 @@ feature -- Access
 	new_cursor: TABLE_ITERATION_CURSOR [JSON_VALUE, JSON_STRING]
 			-- Fresh cursor associated with current structure
 		do
-			Result := object.new_cursor
+			Result := items.new_cursor
 		end
 
 feature -- Status report
@@ -134,7 +271,7 @@ feature -- Status report
 	is_empty: BOOLEAN
 			-- Is empty object?
 		do
-			Result := object.is_empty
+			Result := items.is_empty
 		end
 
 feature -- Visitor pattern
@@ -151,7 +288,7 @@ feature -- Conversion
 	map_representation: HASH_TABLE [JSON_VALUE, JSON_STRING]
 			-- A representation that maps keys to values
 		do
-            Result := object
+			Result := items
 		end
 
 feature -- Report
@@ -160,13 +297,13 @@ feature -- Report
 			-- Hash code value
 		do
 			from
-                object.start
-                Result := object.out.hash_code
+				items.start
+				Result := items.out.hash_code
 			until
-                object.off
+				items.off
 			loop
-                Result := ((Result \\ 8388593) |<< 8)  + object.item_for_iteration.hash_code
-                object.forth
+				Result := ((Result \\ 8388593) |<< 8) + items.item_for_iteration.hash_code
+				items.forth
 			end
 				-- Ensure it is a positive value.
 			Result := Result.hash_code
@@ -177,15 +314,18 @@ feature -- Status report
 	debug_output: STRING
 			-- String that should be displayed in debugger to represent `Current'.
 		do
-            Result := object.count.out
+			Result := count.out + "item(s)"
 		end
 
 feature {NONE} -- Implementation
 
-    object: HASH_TABLE [JSON_VALUE, JSON_STRING]
+	items: HASH_TABLE [JSON_VALUE, JSON_STRING]
 			-- Value container
 
 invariant
-    object_not_null: object /= Void
+	items_not_void: items /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_string.e

@@ -1,39 +1,92 @@
 note
-
 	description: "[
 		A JSON_STRING represent a string in JSON.
 		A string is a collection of zero or more Unicodes characters, wrapped in double
 		quotes, using blackslash espaces.
 	]"
-
-    author: "Javier Velilla"
-    date: "2008/08/24"
-    revision: "Revision 0.1"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
 	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
 
-
 class
 	JSON_STRING
 
 inherit
+
 	JSON_VALUE
 		redefine
 			is_equal
 		end
 
 create
-    make_json,
-	make_json_from_string_32,
-	make_with_escaped_json
+	make_from_string, make_from_string_32, make_from_string_general,
+	make_from_escaped_json_string,
+	make_with_escaped_json, make_json, make_json_from_string_32
 
 convert
-	make_json ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
-	make_json_from_string_32 ({READABLE_STRING_32, STRING_32, IMMUTABLE_STRING_32})
+	make_from_string ({READABLE_STRING_8, STRING_8, IMMUTABLE_STRING_8}),
+	make_from_string_32 ({READABLE_STRING_32, STRING_32, IMMUTABLE_STRING_32}),
+	make_from_string_general ({READABLE_STRING_GENERAL, STRING_GENERAL, IMMUTABLE_STRING_GENERAL})
 
 feature {NONE} -- Initialization
 
+	make_from_string (s: READABLE_STRING_8)
+			-- Initialize from ascii string `s'.
+		require
+			s_not_void: s /= Void
+		do
+			make_from_escaped_json_string (escaped_json_string (s))
+		end
+
+	make_from_string_32 (s: READABLE_STRING_32)
+			-- Initialize from unicode string `s'.
+		require
+			s_not_void: s /= Void
+		do
+			make_from_escaped_json_string (escaped_json_string (s))
+		end
+
+	make_from_string_general (s: READABLE_STRING_GENERAL)
+			-- Initialize from string `s'.
+		require
+			s_not_void: s /= Void
+		do
+			if attached {READABLE_STRING_8} s as s8 then
+				make_from_string (s8)
+			else
+				make_from_string_32 (s.as_string_32)
+			end
+		end
+
+	make_from_escaped_json_string (a_escaped_string: READABLE_STRING_8)
+			-- Initialize with `a_escaped_string' already JSON escaped.
+		require
+			a_escaped_string_not_void: a_escaped_string /= Void
+		do
+			item := a_escaped_string
+		end
+
+	make_with_escaped_json (a_escaped_string: READABLE_STRING_8)
+			-- Initialize with `a_escaped_string' already JSON escaped.
+		obsolete
+			"Use `make_from_escaped_json_string' Sept/2014"
+		require
+			a_escaped_string_not_void: a_escaped_string /= Void
+		do
+			make_from_escaped_json_string (a_escaped_string)
+		end
+
+	make_from_json_string (a_json: JSON_STRING)
+			-- Initialize with `a_json' string value.
+		do
+			make_from_escaped_json_string (a_json.item)
+		end
+
 	make_json (s: READABLE_STRING_8)
 			-- Initialize.
+		obsolete
+			"Use `make_from_string' Sept/2014"
 		require
 			item_not_void: s /= Void
 		do
@@ -42,18 +95,12 @@ feature {NONE} -- Initialization
 
 	make_json_from_string_32 (s: READABLE_STRING_32)
 			-- Initialize from STRING_32 `s'.
+		obsolete
+			"Use `make_from_string_32' Sept/2014"
 		require
 			item_not_void: s /= Void
 		do
-            make_with_escaped_json (escaped_json_string_32 (s))
-        end
-
-    make_with_escaped_json (s: READABLE_STRING_8)
-            -- Initialize with an_item already escaped
-        require
-            item_not_void: s /= Void
-        do
-            item := s
+			make_with_escaped_json (escaped_json_string (s))
 		end
 
 feature -- Access
@@ -61,103 +108,33 @@ feature -- Access
 	item: STRING
 			-- Contents with escaped entities if any
 
+feature -- Conversion
+
 	unescaped_string_8: STRING_8
-			-- Unescaped string from `item'
+			-- Unescaped ascii string from `item'.
+			--| note: valid only if `item' does not encode any unicode character.
 		local
 			s: like item
-			i, n: INTEGER
-			c: CHARACTER
 		do
 			s := item
-			n := s.count
-			create Result.make (n)
-			from i := 1 until i > n loop
-				c := s[i]
-				if c = '\' then
-					if i < n then
-						inspect s[i+1]
-						when '\' then
-							Result.append_character ('\')
-							i := i + 2
-						when '%"' then
-							Result.append_character ('%"')
-							i := i + 2
-						when 'n' then
-							Result.append_character ('%N')
-							i := i + 2
-						when 'r' then
-							Result.append_character ('%R')
-							i := i + 2
-						when 'u' then
-							--| Leave unicode \uXXXX unescaped
-							Result.append_character ('\')
-							i := i + 1
-						else
-							Result.append_character ('\')
-							i := i + 1
-						end
-					else
-						Result.append_character ('\')
-						i := i + 1
-					end
-				else
-					Result.append_character (c)
-					i := i + 1
-				end
-			end
+			create Result.make (s.count)
+			unescape_to_string_8 (Result)
 		end
 
 	unescaped_string_32: STRING_32
-			-- Unescaped string 32 from `item'
+			-- Unescaped uncode string from `item'
+			--| some encoders uses UTF-8 , and not the recommended pure json encoding
+			--| thus, let's support the UTF-8 encoding during decoding.
 		local
-			s: like item
-			i, n: INTEGER
-			c: CHARACTER
-			hex: STRING
+			s: READABLE_STRING_8
 		do
 			s := item
-			n := s.count
-			create Result.make (n)
-			from i := 1 until i > n loop
-				c := s[i]
-				if c = '\' then
-					if i < n then
-						inspect s[i+1]
-						when '\' then
-							Result.append_character ('\')
-							i := i + 2
-						when '%"' then
-							Result.append_character ('%"')
-							i := i + 2
-						when 'n' then
-							Result.append_character ('%N')
-							i := i + 2
-						when 'r' then
-							Result.append_character ('%R')
-							i := i + 2
-						when 'u' then
-							hex := s.substring (i+2, i+2+4 - 1)
-							if hex.count = 4 then
-								Result.append_code (hexadecimal_to_natural_32 (hex))
-							end
-							i := i + 2 + 4
-						else
-							Result.append_character ('\')
-							i := i + 1
-						end
-					else
-						Result.append_character ('\')
-						i := i + 1
-					end
-				else
-					Result.append_character (c.to_character_32)
-					i := i + 1
-				end
-			end
+			create Result.make (s.count)
+			unescape_to_string_32 (Result)
 		end
 
 	representation: STRING
-			-- String representation of `item' with escaped entities if any
+			-- String representation of `item' with escaped entities if any.
 		do
 			create Result.make (item.count + 2)
 			Result.append_character ('%"')
@@ -165,6 +142,160 @@ feature -- Access
 			Result.append_character ('%"')
 		end
 
+	unescape_to_string_8 (a_output: STRING_8)
+			-- Unescape string `item' into `a_output'.
+			--| note: valid only if `item' does not encode any unicode character.
+		local
+			s: like item
+			i, n: INTEGER
+			c: CHARACTER
+		do
+			s := item
+			n := s.count
+			from
+				i := 1
+			until
+				i > n
+			loop
+				c := s [i]
+				if c = '\' then
+					if i < n then
+						inspect s [i + 1]
+						when '%"' then
+							a_output.append_character ('%"')
+							i := i + 2
+						when '\' then
+							a_output.append_character ('\')
+							i := i + 2
+						when '/' then
+							a_output.append_character ('/')
+							i := i + 2
+						when 'b' then
+							a_output.append_character ('%B')
+							i := i + 2
+						when 'f' then
+							a_output.append_character ('%F')
+							i := i + 2
+						when 'n' then
+							a_output.append_character ('%N')
+							i := i + 2
+						when 'r' then
+							a_output.append_character ('%R')
+							i := i + 2
+						when 't' then
+							a_output.append_character ('%T')
+							i := i + 2
+						when 'u' then
+								--| Leave unicode \uXXXX unescaped
+							a_output.append_character (c) -- '\'
+							i := i + 1
+						else
+							a_output.append_character (c) -- '\'
+							i := i + 1
+						end
+					else
+						a_output.append_character (c) -- '\'
+						i := i + 1
+					end
+				else
+					a_output.append_character (c)
+					i := i + 1
+				end
+			end
+		end
+
+	unescape_to_string_32 (a_output: STRING_32)
+			-- Unescape string `item' into `a_output' string 32.
+			--| some encoders uses UTF-8 , and not the recommended pure json encoding
+			--| thus, let's support the UTF-8 encoding during decoding.	
+		local
+			s: READABLE_STRING_8
+			i, n: INTEGER
+			c: NATURAL_32
+			ch: CHARACTER_8
+			hex: READABLE_STRING_8
+		do
+			s := item
+			n := s.count
+			from
+				i := 1
+			until
+				i > n
+			loop
+				ch := s.item (i)
+				if ch = '\' then
+					if i < n then
+						inspect s [i + 1]
+						when '%"' then
+							a_output.append_character ('%"')
+							i := i + 2
+						when '\' then
+							a_output.append_character ('\')
+							i := i + 2
+						when '/' then
+							a_output.append_character ('/')
+							i := i + 2
+						when 'b' then
+							a_output.append_character ('%B')
+							i := i + 2
+						when 'f' then
+							a_output.append_character ('%F')
+							i := i + 2
+						when 'n' then
+							a_output.append_character ('%N')
+							i := i + 2
+						when 'r' then
+							a_output.append_character ('%R')
+							i := i + 2
+						when 't' then
+							a_output.append_character ('%T')
+							i := i + 2
+						when 'u' then
+							hex := s.substring (i + 2, i + 5) -- i+2 , i+2+4-1
+							if hex.count = 4 then
+								a_output.append_code (hexadecimal_to_natural_32 (hex))
+							end
+							i := i + 6 -- i+2+4
+						else
+							a_output.append_character (ch) -- '\'
+							i := i + 1
+						end
+					else
+						a_output.append_character (ch) -- '\'
+						i := i + 1
+					end
+				else
+					c := ch.natural_32_code
+					if c <= 0x7F then
+							-- 0xxxxxxx
+						check
+							ch = c.to_character_32
+						end
+						a_output.append_character (ch)
+					elseif c <= 0xDF then
+							-- 110xxxxx 10xxxxxx
+						i := i + 1
+						if i <= n then
+							a_output.append_code (((c & 0x1F) |<< 6) | (s.code (i) & 0x3F))
+						end
+					elseif c <= 0xEF then
+							-- 1110xxxx 10xxxxxx 10xxxxxx
+						i := i + 2
+						if i <= n then
+							a_output.append_code (((c & 0xF) |<< 12) | ((s.code (i - 1) & 0x3F) |<< 6) | (s.code (i) & 0x3F))
+						end
+					elseif c <= 0xF7 then
+							-- 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+						i := i + 3
+						if i <= n then
+							a_output.append_code (((c & 0x7) |<< 18) | ((s.code (i - 2) & 0x3F) |<< 12) | ((s.code (i - 1) & 0x3F) |<< 6) | (s.code (i) & 0x3F))
+						end
+					end
+					i := i + 1
+				end
+			end
+		end
+
 feature -- Visitor pattern
 
 	accept (a_visitor: JSON_VISITOR)
@@ -185,12 +316,48 @@ feature -- Comparison
 
 feature -- Change Element
 
-    append (a_string: STRING)
-            -- Add a_string
+	append (a_escaped_string: READABLE_STRING_8)
+			-- Add JSON escaped string `a_escaped_string'
 		require
-            a_string_not_void: a_string /= Void
+			a_escaped_string_not_void: a_escaped_string /= Void
 		do
-            item.append_string (a_string)
+			item.append_string (a_escaped_string)
+		end
+
+	append_json_string (a_json_string: JSON_STRING)
+			-- Add JSON string `a_json_string'
+		require
+			a_json_string_not_void: a_json_string /= Void
+		do
+			append (a_json_string.item)
+		end
+
+	append_string (s: READABLE_STRING_8)
+			-- Add ascii string `s'
+		require
+			s_not_void: s /= Void
+		do
+			append (escaped_json_string (s))
+		end
+
+	append_string_32 (s: READABLE_STRING_32)
+			-- Add unicode string `s'
+		require
+			s_not_void: s /= Void
+		do
+			append (escaped_json_string (s))
+		end
+
+	append_string_general (s: READABLE_STRING_GENERAL)
+			-- Add unicode string `s'
+		require
+			s_not_void: s /= Void
+		do
+			if attached {READABLE_STRING_8} s as s8 then
+				append_string (s.as_string_8)
+			else
+				append_string_32 (s.as_string_32)
+			end
 		end
 
 feature -- Status report
@@ -213,8 +380,18 @@ feature {NONE} -- Implementation
 
  	is_hexadecimal (s: READABLE_STRING_8): BOOLEAN
  			-- Is `s' an hexadecimal value?
+		local
+			i: INTEGER
  		do
-			Result := across s as scur all scur.item.is_hexa_digit end
+			from
+				Result := True
+				i := 1
+			until
+				i > s.count or not Result
+			loop
+				Result := s [i].is_hexa_digit
+				i := i + 1
+			end
  		end
 
 	hexadecimal_to_natural_32 (s: READABLE_STRING_8): NATURAL_32
@@ -227,13 +404,11 @@ feature {NONE} -- Implementation
 			char: CHARACTER
 		do
 			nb := s.count
-
 			if nb >= 2 and then s.item (2) = 'x' then
 				i := 3
 			else
 				i := 1
 			end
-
 			from
 			until
 				i > nb
@@ -249,31 +424,7 @@ feature {NONE} -- Implementation
 			end
 		end
 
-    escaped_json_string (s: READABLE_STRING_8): STRING_8
-            -- JSON string with '"' and '\' characters escaped
-        require
-            s_not_void: s /= Void
-		local
-			i, n: INTEGER
-			c: CHARACTER_8
-		do
-			n := s.count
-			create Result.make (n + n // 10)
-			from i := 1 until i > n loop
-				c := s.item (i)
-				inspect c
-				when '%"' then Result.append_string ("\%"")
-				when '\' then Result.append_string ("\\")
-				when '%R' then Result.append_string ("\r")
-				when '%N' then Result.append_string ("\n")
-				else
-					Result.extend (c)
-				end
-				i := i + 1
-			end
-		end
-
-    escaped_json_string_32 (s: READABLE_STRING_32): STRING_8
+	escaped_json_string (s: READABLE_STRING_GENERAL): STRING_8
 			-- JSON string with '"' and '\' characters and unicode escaped
 		require
 			s_not_void: s /= Void
@@ -285,15 +436,37 @@ feature {NONE} -- Implementation
 		do
 			n := s.count
 			create Result.make (n + n // 10)
-			from i := 1 until i > n loop
+			from
+				i := 1
+			until
+				i > n
+			loop
 				uc := s.item (i)
 				if uc.is_character_8 then
 					c := uc.to_character_8
 					inspect c
-					when '%"' then Result.append_string ("\%"")
-					when '\' then Result.append_string ("\\")
-					when '%R' then Result.append_string ("\r")
-					when '%N' then Result.append_string ("\n")
+					when '%"' then
+						Result.append_string ("\%"")
+					when '\' then
+						Result.append_string ("\\")
+					when '/' then
+							-- To avoid issue with Javascript  </script> ...
+							-- escape only  </  to <\/
+						if s.valid_index (i - 1) and then s.item (i - 1) = '<' then
+							Result.append_string ("\/")
+						else
+							Result.append_string ("/")
+						end
+					when '%B' then
+						Result.append_string ("\b")
+					when '%F' then
+						Result.append_string ("\f")
+					when '%N' then
+						Result.append_string ("\n")
+					when '%R' then
+						Result.append_string ("\r")
+					when '%T' then
+						Result.append_string ("\t")
 					else
 						Result.extend (c)
 					end
@@ -309,14 +482,15 @@ feature {NONE} -- Implementation
 						j := j + 1
 					end
 					h := h.substring (j, h.count)
-
 					from
 					until
 						h.count >= 4
 					loop
 						h.prepend_integer (0)
 					end
-					check h.count = 4 end
+					check
+						hexastring_has_4_chars: h.count = 4
+					end
 					Result.append (h)
 				end
 				i := i + 1
@@ -326,4 +500,7 @@ feature {NONE} -- Implementation
 invariant
 	item_not_void: item /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/json_value.e

@@ -14,11 +14,11 @@ note
 	revision: "Revision 0.1"
 	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
 
-
 deferred class
 	JSON_VALUE
 
 inherit
+
 	HASHABLE
 
 	DEBUG_OUTPUT
@@ -40,4 +40,7 @@ feature -- Visitor pattern
 		deferred
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/kernel/scanner/json_parser.e

@@ -1,513 +0,0 @@
-note
-
-	description: "Parse serialized JSON data"
-	author: "jvelilla"
-	date: "2008/08/24"
-	revision: "Revision 0.1"
-
-class
-	JSON_PARSER
-
-inherit
-	JSON_READER
-	JSON_TOKENS
-
-create
-	make_parser
-
-feature {NONE} -- Initialize
-
-	make_parser (a_json: STRING)
-			-- Initialize.
-		require
-			json_not_empty: a_json /= Void and then not a_json.is_empty
-		do
-			make (a_json)
-			is_parsed := True
-			create errors.make
-		end
-
-feature -- Status report
-
-	is_parsed: BOOLEAN
-			-- Is parsed?
-
-	errors: LINKED_LIST [STRING]
-			-- Current errors
-
-	current_errors: STRING
-			-- Current errors as string
-		do
-			create Result.make_empty
-			from
-				errors.start
-			until
-				errors.after
-			loop
-				Result.append_string (errors.item + "%N")
-				errors.forth
-			end
-		end
-
-feature -- Element change
-
-	report_error (e: STRING)
-			-- Report error `e'
-		require
-			e_not_void: e /= Void
-		do
-			errors.force (e)
-		end
-
-feature -- Commands
-
-	parse_json: detachable JSON_VALUE
-		    -- Parse JSON data `representation'
-		    -- start ::= object | array
-		do
-		   	if is_valid_start_symbol then
-		   	    Result := parse
-		        if extra_elements then
-		            is_parsed := False
-		        end
-		    else
-		        is_parsed := False
-		        report_error ("Syntax error unexpected token, expecting `{' or `['")
-		    end
-		end
-
-	parse: detachable JSON_VALUE
-			-- Parse JSON data `representation'
-		local
-			c: CHARACTER
-		do
-			if is_parsed then
-				skip_white_spaces
-				c := actual
-				inspect c
-				when j_OBJECT_OPEN then
-					Result := parse_object
-				when j_STRING then
-					Result := parse_string
-				when j_ARRAY_OPEN then
-					Result := parse_array
-				else
-					if c.is_digit or c = j_MINUS  then
-						Result := parse_number
-					elseif is_null then
-						Result := create {JSON_NULL}
-						next
-						next
-						next
-					elseif is_true then
-						Result := create {JSON_BOOLEAN}.make_boolean (True)
-						next
-						next
-						next
-					elseif is_false then
-						Result := create {JSON_BOOLEAN}.make_boolean (False)
-						next
-						next
-						next
-						next
-					else
-						is_parsed := False
-						report_error ("JSON is not well formed in parse")
-						Result := Void
-					end
-				end
-			end
-		ensure
-			is_parsed_implies_result_not_void: is_parsed implies Result /= Void
-		end
-
-	parse_object: JSON_OBJECT
-			-- object
-			-- {}
-			-- {"key" : "value" [,]}
-		local
-			has_more: BOOLEAN
-			l_json_string: detachable JSON_STRING
-			l_value: detachable JSON_VALUE
-		do
-			create Result.make
-			-- check if is an empty object {}
-			next
-			skip_white_spaces
-			if actual = j_OBJECT_CLOSE then
-				--is an empty object
-			else
-				-- a complex object {"key" : "value"}
-				previous
-				from has_more := True until not has_more loop
-					next
-					skip_white_spaces
-					l_json_string := parse_string
-					next
-					skip_white_spaces
-					if actual = ':' then
-						next
-						skip_white_spaces
-					else
-						is_parsed := False
-						report_error ("%N Input string is a not well formed JSON, expected: : found: " + actual.out)
-						has_more := False
-					end
-
-					l_value := parse
-					if is_parsed and then (l_value /= Void and l_json_string /= Void) then
-						Result.put (l_value, l_json_string)
-						next
-						skip_white_spaces
-						if actual = j_OBJECT_CLOSE then
-							has_more := False
-						elseif actual /= ',' then
-							has_more := False
-							is_parsed := False
-							report_error ("JSON Object syntactically malformed expected , found: [" + actual.out + "]")
-						end
-					else
-						has_more := False
-						-- explain the error
-					end
-				end
-			end
-		end
-
-	parse_string: detachable JSON_STRING
-			-- Parsed string
-		local
-			has_more: BOOLEAN
-			l_json_string: STRING
-			l_unicode: STRING
-			c: like actual
-		do
-			create l_json_string.make_empty
-			if actual = j_STRING then
-				from
-					has_more := True
-				until
-					not has_more
-				loop
-					next
-					c := actual
-					if c = j_STRING then
-						has_more := False
-					elseif c = '%H' then
-						next
-						c := actual
-						if c = 'u' then
-							create l_unicode.make_from_string ("\u")
-							l_unicode.append (read_unicode)
-							c := actual
-							if is_valid_unicode (l_unicode) then
-								l_json_string.append (l_unicode)
-							else
-								has_more := False
-								is_parsed := False
-								report_error ("Input String is not well formed JSON, expected a Unicode value, found [" + c.out + " ]")
-							end
-						elseif (not is_special_character (c) and not is_special_control (c)) or c = '%N' then
-							has_more := False
-							is_parsed := False
-							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
-						else
-							l_json_string.append_character ('\')
-							l_json_string.append_character (c)
-						end
-					else
-						if is_special_character (c) and c /= '/' then
-							has_more := False
-							is_parsed := False
-							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
-						else
-							l_json_string.append_character (c)
-						end
-					end
-				end
-				create Result.make_with_escaped_json (l_json_string)
-			else
-				Result := Void
-			end
-		end
-
-	parse_array: JSON_ARRAY
-			-- array
-			-- []
-			-- [elements [,]]
-		local
-			flag: BOOLEAN
-			l_value: detachable JSON_VALUE
-			c: like actual
-		do
-			create Result.make_array
-			--check if is an empty array []
-			next
-			skip_white_spaces
-			if actual = j_array_close then
-				--is an empty array
-			else
-				previous
-				from
-					flag := True
-				until
-					not flag
-				loop
-					next
-					skip_white_spaces
-					l_value := parse
-					if is_parsed and then l_value /= Void then
-						Result.add (l_value)
-						next
-						skip_white_spaces
-						c := actual
-						if c = j_ARRAY_CLOSE then
-							flag := False
- 						elseif c /= ',' then
-							flag := False
-							is_parsed := False
-							report_error ("Array is not well formed JSON,  found [" + c.out + " ]")
-						end
-					else
-						flag := False
-						report_error ("Array is not well formed JSON,  found [" + actual.out + " ]")
-					end
-				end
-			end
-		end
-
-	parse_number: detachable JSON_NUMBER
-			-- Parsed number
-		local
-			sb: STRING
-			flag: BOOLEAN
-			is_integer: BOOLEAN
-			c: like actual
-		do
-			create sb.make_empty
-			sb.append_character (actual)
-
-			from
-				flag := True
-			until
-				not flag
-			loop
-				next
-				c := actual
-				if not has_next or is_close_token (c)
-					or c = ',' or c = '%N' or c = '%R'
-				then
-					flag := False
-					previous
-				else
-					sb.append_character (c)
-				end
-			end
-
-			if is_valid_number (sb) then
-				if sb.is_integer then
-					create Result.make_integer (sb.to_integer)
-					is_integer := True
-				elseif sb.is_double and not is_integer then
-					create Result.make_real (sb.to_double)
-				end
-			else
-				is_parsed := False
-				report_error ("Expected a number, found: [ " + sb  + " ]")
-			end
-		end
-
-	is_null: BOOLEAN
-			-- Word at index represents null?
-		local
-			l_null: STRING
-			l_string: STRING
-		do
-			l_null := null_id
-			l_string := json_substring (index,index + l_null.count - 1)
-			if l_string.is_equal (l_null) then
-				Result := True
-			end
-		end
-
-	is_false: BOOLEAN
-			-- Word at index represents false?
-		local
-			l_false: STRING
-			l_string: STRING
-		do
-			l_false := false_id
-			l_string := json_substring (index, index + l_false.count - 1)
-			if l_string.is_equal (l_false) then
-				Result := True
-			end
-		end
-
-	is_true: BOOLEAN
-			-- Word at index represents true?
-		local
-			l_true: STRING
-			l_string: STRING
-		do
-			l_true := true_id
-			l_string := json_substring (index,index + l_true.count - 1)
-			if l_string.is_equal (l_true) then
-				Result := True
-			end
-		end
-
-	read_unicode: STRING
-			-- Read unicode and return value
-		local
-			i: INTEGER
-		do
-			create Result.make_empty
-			from
-				i := 1
-			until
-				i > 4 or not has_next
-			loop
-				next
-				Result.append_character (actual)
-				i := i + 1
-			end
-		end
-
-feature {NONE} -- Implementation
-
-	is_valid_number (a_number: STRING): BOOLEAN
-            -- is 'a_number' a valid number based on this regular expression
-            -- "-?(?: 0|[1-9]\d+)(?: \.\d+)?(?: [eE][+-]?\d+)?\b"?
-		local
-			s: detachable STRING
-			c: CHARACTER
-			i,n: INTEGER
-		do
-			create s.make_empty
-			n := a_number.count
-			if n = 0 then
-				Result := False
-			else
-				Result := True
-				i := 1
-				--| "-?"
-				c := a_number[i]
-				if c = '-' then
-					s.extend (c); i := i + 1; c := a_number[i]
-				end
-				--| "0|[1-9]\d*
-				if c.is_digit then
-					if c = '0' then
-						--| "0"
-						s.extend (c); i := i + 1; c := a_number[i]
-					else
-						--| "[1-9]"
-						s.extend (c); i := i + 1; c := a_number[i]
-						--| "\d*"
-						from until i > n or not c.is_digit loop
-							s.extend (c); i := i + 1; c := a_number[i]
-						end
-					end
-				end
-			end
-			if Result then
-					--| "(\.\d+)?"			
-				if c = '.' then
-					--| "\.\d+"  =  "\.\d\d*"
-					s.extend (c); i := i + 1; c := a_number[i]
-					if c.is_digit then
-						from until i > n or not c.is_digit loop
-							s.extend (c); i := i + 1; c := a_number[i]
-						end
-					else
-						Result := False --| expecting digit
-					end
-				end
-			end
-			if Result then --| "(?:[eE][+-]?\d+)?\b"
-				if c = 'e' or c = 'E' then
-					--| "[eE][+-]?\d+"
-					s.extend (c); i := i + 1; c := a_number[i]
-					if c = '+' or c = '-' then
- 							s.extend (c); i := i + 1; c := a_number[i]
-					end
-					if c.is_digit then
-						from until i > n or not c.is_digit loop
-							s.extend (c); i := i + 1; c := a_number[i]
-						end
-					else
-						Result := False --| expecting digit							
-					end
-				end
-			end
-			if Result then --| "\b"
-				from until i > n or not c.is_space loop
-					s.extend (c); i := i + 1; c := a_number[i]
-				end
-				Result := i > n and then s.same_string (a_number)
-			end
-		end
-
-	is_valid_unicode (a_unicode: STRING): BOOLEAN
-			-- is 'a_unicode' a valid unicode based on this regular expression
-			-- "\\u[0-9a-fA-F]{4}"
-		local
-			i: INTEGER
-		do
-			if
-				a_unicode.count = 6 and then
-				a_unicode[1] = '\' and then
-				a_unicode[2] = 'u'
-			then
-				from
-					Result := True
-					i := 3
-				until
-					i > 6 or Result = False
-				loop
-					inspect a_unicode[i]
-					when '0'..'9', 'a'..'f', 'A'..'F'  then
-					else
-						Result := False
-					end
-					i := i + 1
-				end
-			end
-		end
-
-	extra_elements: BOOLEAN
-			-- has more elements?
-		local
-			c: like actual
-		do
-			if has_next then
-				next
-			end
-			from
-				c := actual
-			until
-				c /= ' ' or c /= '%R' or c /= '%U' or c /= '%T' or c /= '%N' or not has_next
-			loop
-				next
-			end
-			Result := has_next
-		end
-
-	is_valid_start_symbol : BOOLEAN
-			-- expecting `{' or `[' as start symbol
-		do
-			if attached representation as s and then s.count > 0 then
-				Result := s[1] = '{' or s[1] = '['
-			end
-		end
-
-feature {NONE} -- Constants
-
-	false_id: STRING = "false"
-
-	true_id: STRING = "true"
-
-	null_id: STRING = "null"
-
-
-end

contrib/library/text/parser/json/library/kernel/scanner/json_tokens.e

@@ -1,77 +0,0 @@
-note
-	description: ""
-	author: "jvelilla"
-	date: "2008/08/24"
-	revision: "0.1"
-
-class
-	JSON_TOKENS
-
-feature -- Access
-
-	j_OBJECT_OPEN: CHARACTER = '{'
-	j_ARRAY_OPEN: CHARACTER = '['
-	j_OBJECT_CLOSE: CHARACTER = '}'
-	j_ARRAY_CLOSE: CHARACTER = ']'
-
-	j_STRING: CHARACTER = '"'
-	j_PLUS: CHARACTER = '+'
-	j_MINUS: CHARACTER = '-'
-	j_DOT: CHARACTER = '.'
-
-feature -- Status report
-
-	is_open_token (c: CHARACTER): BOOLEAN
-			-- Characters which open a type	
-		do
-			inspect c
-			when j_OBJECT_OPEN, j_ARRAY_OPEN, j_STRING, j_PLUS, j_MINUS, j_DOT then
-				Result := True
-			else
-
-			end
-		end
-
-	is_close_token (c: CHARACTER): BOOLEAN
-			-- Characters which close a type	
-		do
-			inspect c
-			when j_OBJECT_CLOSE, j_ARRAY_CLOSE, j_STRING then
-				Result := True
-			else
-
-			end
-		end
-
-	is_special_character (c: CHARACTER): BOOLEAN
-			-- Control Characters
-			-- 	%F  	Form feed
-			-- 	%H  	backslasH
-			--  %N  	Newline
-			--  %R  	carriage Return
-			--  %T  	horizontal Tab
-			--  %B  	Backspace
-		    --  /       Solidus
-		    --  "       Quotation	
-		do
-			inspect c
-			when '%F', '%H', '%N', '%R', '%T', '%B', '/', '"' then
-				Result := True
-			else
-
-			end
-		end
-
-   is_special_control (c: CHARACTER): BOOLEAN
-           --Control Characters
-           -- \b\f\n\r\t
-		do
-			inspect c
-			when 'b', 'f', 'n', 'r', 't' then
-				Result := True
-			else
-
-			end
-		end
-
-end

contrib/library/text/parser/json/library/kernel/shared_ejson.e

@@ -1,38 +0,0 @@
-note
-    description: "[
-				Shared factory class for creating JSON objects. Maps JSON
-				objects to ELKS HASH_TABLEs and JSON arrays to ELKS
-				LINKED_LISTs. Use non-conforming inheritance from this 
-				class to ensure that your classes share the same 
-				JSON_FACTORY instance.
-		  ]"
-    author: "Paul Cohen"
-    date: "$Date$"
-    revision: "$Revision: 89185 $"
-    file: "$HeadURL: $"
-
-class SHARED_EJSON
-
-feature
-
-    json: EJSON
-            -- A shared EJSON instance with default converters for
-            --LINKED_LIST [ANY] and HASH_TABLE [ANY, HASHABLE]
-        local
-			jalc: JSON_ARRAYED_LIST_CONVERTER
-            jllc: JSON_LINKED_LIST_CONVERTER
-            jhtc: JSON_HASH_TABLE_CONVERTER
-        once
-            create Result
-
-            create jalc.make
-            Result.add_converter (jalc)
-
-            create jllc.make
-            Result.add_converter (jllc)
-
-            create jhtc.make
-            Result.add_converter (jhtc)
-        end
-        
-end -- class SHARED_EJSON

contrib/library/text/parser/json/library/license.lic

@@ -0,0 +1,4 @@
+${NOTE_KEYWORD}
+	copyright: "2010-${YEAR}, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+

contrib/library/text/parser/json/library/parser/json_parser.e

@@ -0,0 +1,679 @@
+note
+	description: "Parse serialized JSON data"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	JSON_PARSER
+
+inherit
+	JSON_READER
+		rename
+			make as make_reader,
+			reset as reset_reader
+		end
+
+	JSON_TOKENS
+
+create
+	make_with_string,
+	make_parser
+
+feature {NONE} -- Initialize
+
+	make_with_string (a_content: STRING)
+			-- Initialize parser with JSON content `a_content'.
+		require
+			a_content_not_empty: a_content /= Void and then not a_content.is_empty
+		do
+			create errors.make
+			make_reader (a_content)
+			reset
+		end
+
+	make_parser (a_json: STRING)
+			-- Initialize.
+		obsolete
+			"Use `make_with_string' [sept/2014]."
+		do
+			make_with_string (a_json)
+		end
+
+feature -- Status report
+
+	is_parsed: BOOLEAN
+			-- Is parsed ?
+
+	is_valid: BOOLEAN
+			-- Is valid?
+		do
+			Result := not has_error
+		end
+
+	has_error: BOOLEAN
+			-- Has error?
+
+	errors: LINKED_LIST [STRING]
+			-- Current errors
+
+	errors_as_string: STRING
+			-- String representation of `errors'.
+		do
+			create Result.make_empty
+			across
+				errors as ic
+			loop
+				Result.append_string (ic.item)
+				Result.append_character ('%N')
+			end
+		end
+
+	current_errors: STRING
+			-- Current errors as string
+		obsolete
+			"USe errors_as_string [sept/2014]"
+		do
+			Result := errors_as_string
+		end
+
+feature -- Access
+
+	parsed_json_value: detachable JSON_VALUE
+			-- Parsed json value if any.
+		require
+			is_parsed: is_parsed
+		attribute
+		ensure
+			attached_result_if_valid: is_valid implies Result /= Void
+		end
+
+	parsed_json_object: detachable JSON_OBJECT
+			-- parsed json value as a JSON_OBJECT if it is an object.
+		require
+			is_parsed: is_parsed
+		do
+			if attached {JSON_OBJECT} parsed_json_value as j_object then
+				Result := j_object
+			end
+		end
+
+	parsed_json_array: detachable JSON_ARRAY
+			-- parsed json value as a JSON_OBJECT if it is an array.
+		require
+			is_parsed: is_parsed
+		do
+			if attached {JSON_ARRAY} parsed_json_value as j_array then
+				Result := j_array
+			end
+		end
+
+feature -- Commands
+
+	reset
+			-- Reset parsing values.
+		do
+			parsed_json_value := Void
+			errors.wipe_out
+			has_error := False
+			is_parsed := False
+		end
+
+	parse_content
+			-- Parse JSON content `representation'.
+			-- start ::= object | array
+		do
+			reset
+			reset_reader
+
+			if is_valid_start_symbol then
+				parsed_json_value := next_json_value
+				if extra_elements then
+					report_error ("Remaining element outside the main json value!")
+				end
+			else
+				report_error ("Syntax error unexpected token, expecting `{' or `['")
+			end
+			is_parsed := is_valid
+		end
+
+
+feature -- Element change
+
+	report_error (e: STRING)
+			-- Report error `e'
+		require
+			e_not_void: e /= Void
+		do
+			has_error := True
+			errors.force (e)
+		ensure
+			has_error: has_error
+			is_not_valid: not is_valid
+		end
+
+feature -- Obsolete commands		
+
+	parse_json: detachable JSON_VALUE
+			-- Parse JSON data `representation'
+			-- start ::= object | array
+		obsolete
+			"Use `parse_content' and `parsed_json_value'  [sept/2014]."
+		do
+			parse_content
+			if is_parsed then
+				Result := parsed_json_value
+			end
+		end
+
+	parse_object: detachable JSON_OBJECT
+			-- Parse JSON data `representation'
+			-- start ::= object | array
+		obsolete
+			"Use `parse_content' and `parsed_json_value'  [nov/2014]."
+		do
+			parse_content
+			if is_parsed and then attached {JSON_OBJECT} parsed_json_value as jo then
+				Result := jo
+			end
+		end
+
+	parse: detachable JSON_VALUE
+			-- Next JSON value from current position on `representation'.
+		obsolete
+			"Use restricted `next_parsed_json_value' [sept/2014]."
+		do
+			Result := next_parsed_json_value
+			is_parsed := is_valid
+		end
+
+feature {JSON_PARSER_ACCESS} -- Obsolete commands: restricted area		
+
+	next_parsed_json_value: detachable JSON_VALUE
+			-- Return next json value from current position.
+			--| this does not call `reset_reader'.
+		do
+			reset
+			Result := next_json_value
+		end
+
+feature {NONE} -- Implementation: parsing
+
+	next_json_value: detachable JSON_VALUE
+			-- Next JSON value from current position on `representation'.
+		local
+			c: CHARACTER
+		do
+			if not has_error then
+				skip_white_spaces
+				c := actual
+				inspect c
+				when token_object_open then
+					Result := next_json_object
+				when token_double_quote then
+					Result := parse_string
+				when token_array_open then
+					Result := parse_array
+				else
+					if c.is_digit or c = token_minus then
+						Result := parse_number
+					elseif is_null then
+						Result := create {JSON_NULL}
+						next
+						next
+						next
+					elseif is_true then
+						Result := create {JSON_BOOLEAN}.make_true
+						next
+						next
+						next
+					elseif is_false then
+						Result := create {JSON_BOOLEAN}.make_false
+						next
+						next
+						next
+						next
+					else
+						report_error ("JSON is not well formed in parse")
+						Result := Void
+					end
+				end
+			end
+		ensure
+			is_parsed_implies_result_not_void: not has_error implies Result /= Void
+		end
+
+	next_json_object: JSON_OBJECT
+			-- object
+			-- {}
+			-- {"key" : "value" [,]}
+		local
+			has_more: BOOLEAN
+			l_json_string: detachable JSON_STRING
+			l_value: detachable JSON_VALUE
+		do
+			create Result.make
+				--| check if is an empty object {}
+			next
+			skip_white_spaces
+			if actual = token_object_close then
+					--| is an empty object
+			else
+					--| a complex object {"key" : "value"}
+				previous
+				from
+					has_more := True
+				until
+					not has_more
+				loop
+					next
+					skip_white_spaces
+					l_json_string := parse_string
+					next
+					skip_white_spaces
+					if actual = token_colon then --| token_colon = ':'
+						next
+						skip_white_spaces
+					else
+						report_error ("%N Input string is a not well formed JSON, expected: : found: " + actual.out)
+						has_more := False
+					end
+					l_value := next_json_value
+					if not has_error and then (l_value /= Void and l_json_string /= Void) then
+						Result.put (l_value, l_json_string)
+						next
+						skip_white_spaces
+						if actual = token_object_close then
+							has_more := False
+						elseif actual /= token_comma then
+							has_more := False
+							report_error ("JSON Object syntactically malformed expected , found: [" + actual.out + "]")
+						end
+					else
+						has_more := False
+							-- explain the error
+					end
+				end
+			end
+		end
+
+	parse_string: detachable JSON_STRING
+			-- Parsed string
+		local
+			has_more: BOOLEAN
+			l_json_string: STRING
+			l_unicode: STRING
+			c: like actual
+		do
+			create l_json_string.make_empty
+			if actual = token_double_quote then
+				from
+					has_more := True
+				until
+					not has_more
+				loop
+					next
+					c := actual
+					if c = token_double_quote then
+						has_more := False
+					elseif c = '%H' then -- '%H' = '\' = reverse solidus
+						next
+						c := actual
+						if c = 'u' then
+							create l_unicode.make_from_string ("\u")
+							l_unicode.append (read_unicode)
+							c := actual
+							if is_valid_unicode (l_unicode) then
+								l_json_string.append (l_unicode)
+							else
+								has_more := False
+								report_error ("Input String is not well formed JSON, expected a Unicode value, found [" + c.out + " ]")
+							end
+						elseif (not is_special_character (c) and not is_special_control (c)) or c = '%N' then
+							has_more := False
+							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
+						else
+							l_json_string.append_character ('\')
+							l_json_string.append_character (c)
+						end
+					else
+						if is_special_character (c) and c /= '/' then
+							has_more := False
+							report_error ("Input String is not well formed JSON, found [" + c.out + " ]")
+						else
+							l_json_string.append_character (c)
+						end
+					end
+				end
+				create Result.make_from_escaped_json_string (l_json_string)
+			else
+				Result := Void
+			end
+		end
+
+	parse_array: JSON_ARRAY
+			-- array
+			-- []
+			-- [elements [,]]
+		local
+			flag: BOOLEAN
+			l_value: detachable JSON_VALUE
+			c: like actual
+		do
+			create Result.make_empty
+				-- check if is an empty array []
+			next
+			skip_white_spaces
+			if actual = token_array_close then
+					-- is an empty array
+			else
+				previous
+				from
+					flag := True
+				until
+					not flag
+				loop
+					next
+					skip_white_spaces
+					l_value := next_json_value
+					if not has_error and then l_value /= Void then
+						Result.add (l_value)
+						next
+						skip_white_spaces
+						c := actual
+						if c = token_array_close then
+							flag := False
+						elseif c /= token_comma then
+							flag := False
+							report_error ("Array is not well formed JSON,  found [" + c.out + " ]")
+						end
+					else
+						flag := False
+						report_error ("Array is not well formed JSON,  found [" + actual.out + " ]")
+					end
+				end
+			end
+		end
+
+	parse_number: detachable JSON_NUMBER
+			-- Parsed number
+		local
+			sb: STRING
+			flag: BOOLEAN
+			is_integer: BOOLEAN
+			c: like actual
+		do
+			create sb.make_empty
+			sb.append_character (actual)
+			from
+				flag := True
+			until
+				not flag
+			loop
+				next
+				c := actual
+				if not has_next or is_close_token (c) or c = token_comma or c = '%N' or c = '%R' then
+					flag := False
+					previous
+				else
+					sb.append_character (c)
+				end
+			end
+			if is_valid_number (sb) then
+				if sb.is_integer then
+					create Result.make_integer (sb.to_integer)
+					is_integer := True
+				elseif sb.is_double and not is_integer then
+					create Result.make_real (sb.to_double)
+				end
+			else
+				report_error ("Expected a number, found: [ " + sb + " ]")
+			end
+		end
+
+	is_null: BOOLEAN
+			-- Word at index represents null?
+		local
+			l_null: STRING
+			l_string: STRING
+		do
+			l_null := null_id
+			l_string := json_substring (index, index + l_null.count - 1)
+			if l_string.is_equal (l_null) then
+				Result := True
+			end
+		end
+
+	is_false: BOOLEAN
+			-- Word at index represents false?
+		local
+			l_false: STRING
+			l_string: STRING
+		do
+			l_false := false_id
+			l_string := json_substring (index, index + l_false.count - 1)
+			if l_string.is_equal (l_false) then
+				Result := True
+			end
+		end
+
+	is_true: BOOLEAN
+			-- Word at index represents true?
+		local
+			l_true: STRING
+			l_string: STRING
+		do
+			l_true := true_id
+			l_string := json_substring (index, index + l_true.count - 1)
+			if l_string.is_equal (l_true) then
+				Result := True
+			end
+		end
+
+	read_unicode: STRING
+			-- Read unicode and return value.
+		local
+			i: INTEGER
+		do
+			create Result.make_empty
+			from
+				i := 1
+			until
+				i > 4 or not has_next
+			loop
+				next
+				Result.append_character (actual)
+				i := i + 1
+			end
+		end
+
+feature {NONE} -- Implementation
+
+	is_valid_number (a_number: STRING): BOOLEAN
+			-- is 'a_number' a valid number based on this regular expression
+			-- "-?(?: 0|[1-9]\d+)(?: \.\d+)?(?: [eE][+-]?\d+)?\b"?
+		local
+			s: detachable STRING
+			c: CHARACTER
+			i, n: INTEGER
+		do
+			create s.make_empty
+			n := a_number.count
+			if n = 0 then
+				Result := False
+			else
+				Result := True
+				i := 1
+					--| "-?"
+				c := a_number [i]
+				if c = token_minus then
+					s.extend (c)
+					i := i + 1
+					if i > n then
+						Result := False
+					else
+						c := a_number [i]
+					end
+				end
+					--| "0|[1-9]\d*
+				if Result and c.is_digit then
+					if c = '0' then
+							--| "0"
+						s.extend (c)
+						i := i + 1
+						if i <= n then
+							c := a_number [i]
+						end
+					else
+							--| "[1-9]"
+						s.extend (c)
+
+							--| "\d*"
+						i := i + 1
+						if i <= n then
+							c := a_number [i]
+							from
+							until
+								i > n or not c.is_digit
+							loop
+								s.extend (c)
+								i := i + 1
+								if i <= n then
+									c := a_number [i]
+								end
+							end
+						end
+					end
+				end
+			end
+			if i > n then
+					-- Exit
+			else
+				if Result then
+						--| "(\.\d+)?"
+					if c = token_dot then
+							--| "\.\d+"  =  "\.\d\d*"
+						s.extend (c)
+						i := i + 1
+						c := a_number [i]
+						if c.is_digit then
+							from
+							until
+								i > n or not c.is_digit
+							loop
+								s.extend (c)
+								i := i + 1
+								if i <= n then
+									c := a_number [i]
+								end
+							end
+						else
+							Result := False --| expecting digit
+						end
+					end
+				end
+				if Result then --| "(?:[eE][+-]?\d+)?\b"
+					if is_exp_token (c) then
+							--| "[eE][+-]?\d+"
+						s.extend (c)
+						i := i + 1
+						c := a_number [i]
+						if c = token_plus or c = token_minus then
+							s.extend (c)
+							i := i + 1
+							if i <= n then
+								c := a_number [i]
+							end
+						end
+						if c.is_digit then
+							from
+							until
+								i > n or not c.is_digit
+							loop
+								s.extend (c)
+								i := i + 1
+								if i <= n then
+									c := a_number [i]
+								end
+							end
+						else
+							Result := False --| expecting digit
+						end
+					end
+				end
+				if Result then --| "\b"
+					from
+					until
+						i > n or not c.is_space
+					loop
+						s.extend (c)
+						i := i + 1
+						if i <= n then
+							c := a_number [i]
+						end
+					end
+					Result := i > n and then s.same_string (a_number)
+				end
+			end
+		end
+
+	is_valid_unicode (a_unicode: STRING): BOOLEAN
+			-- is 'a_unicode' a valid unicode based on the regular expression "\\u[0-9a-fA-F]{4}" .
+		local
+			i: INTEGER
+		do
+			if a_unicode.count = 6 and then a_unicode [1] = '\' and then a_unicode [2] = 'u' then
+				from
+					Result := True
+					i := 3
+				until
+					i > 6 or Result = False
+				loop
+					inspect a_unicode [i]
+					when '0'..'9', 'a'..'f', 'A'..'F' then
+					else
+						Result := False
+					end
+					i := i + 1
+				end
+			end
+		end
+
+	extra_elements: BOOLEAN
+			-- has more elements?
+		local
+			c: like actual
+		do
+			if has_next then
+				next
+			end
+			from
+				c := actual
+			until
+				c /= ' ' or c /= '%R' or c /= '%U' or c /= '%T' or c /= '%N' or not has_next
+			loop
+				next
+			end
+			Result := has_next
+		end
+
+	is_valid_start_symbol: BOOLEAN
+			-- expecting `{' or `[' as start symbol
+		do
+			if attached representation as s and then s.count > 0 then
+				Result := s [1] = token_object_open or s [1] = token_array_open
+			end
+		end
+
+feature {NONE} -- Constants
+
+	false_id: STRING = "false"
+
+	true_id: STRING = "true"
+
+	null_id: STRING = "null"
+
+note
+	copyright: "2010-2015, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/parser/json_parser_access.e

@@ -0,0 +1,12 @@
+note
+	description: "Inherit to access restricted feature from {JSON_PARSER}."
+	date: "$Date$"
+	revision: "$Revision$"
+
+deferred class
+	JSON_PARSER_ACCESS
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/parser/json_reader.e

@@ -20,13 +20,19 @@ feature {NONE} -- Initialization
 
 feature -- Commands
 
+	reset
+			-- Reset reader
+		do
+			index := 1
+		end
+
 	set_representation (a_json: STRING)
 			-- Set `representation'.
 		do
 			a_json.left_adjust
 			a_json.right_adjust
 			representation := a_json
-            index := 1
+			reset
 		end
 
 	read: CHARACTER
@@ -115,4 +121,7 @@ feature {NONE} -- Implementation
 invariant
 	representation_not_void: representation /= Void
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/parser/json_tokens.e

@@ -0,0 +1,90 @@
+note
+	description: "Token used by the JSON_PARSER"
+	author: "$Author$"
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	JSON_TOKENS
+
+feature -- Access
+
+	token_object_open: CHARACTER = '{'
+	token_object_close: CHARACTER = '}'
+
+	token_array_open: CHARACTER = '['
+	token_array_close: CHARACTER = ']'
+
+	token_double_quote: CHARACTER = '"'
+	token_plus: CHARACTER = '+'
+	token_minus: CHARACTER = '-'
+	token_dot: CHARACTER = '.'
+	token_exp: CHARACTER = 'e'
+	token_comma: CHARACTER = ','
+	token_colon: CHARACTER = ':'
+
+feature -- Status report
+
+	is_open_token (c: CHARACTER): BOOLEAN
+			-- Characters which open a type	
+		do
+			inspect c
+			when token_object_open, token_array_open, token_double_quote, token_plus, token_minus, token_dot then
+				Result := True
+			else
+
+			end
+		end
+
+	is_close_token (c: CHARACTER): BOOLEAN
+			-- Characters which close a type	
+		do
+			inspect c
+			when token_object_close, token_array_close, token_double_quote then
+				Result := True
+			else
+
+			end
+		end
+
+	is_special_character (c: CHARACTER): BOOLEAN
+			-- Control Characters
+			-- 	%F  	Form feed
+			-- 	%H  	backslasH
+			--  %N  	Newline
+			--  %R  	carriage Return
+			--  %T  	horizontal Tab
+			--  %B  	Backspace
+		    --  /       Solidus
+		    --  "       Quotation	
+		do
+			inspect c
+			when '"', '%H' , '/', '%B', '%F', '%N', '%R', '%T' then -- '%H' = '\' =  reverse solidus
+				Result := True
+			else
+
+			end
+		end
+
+   is_special_control (c: CHARACTER): BOOLEAN
+           -- Control Characters
+           -- \b\f\n\r\t
+		do
+			inspect c
+			when 'b', 'f', 'n', 'r', 't' then
+				Result := True
+			else
+
+			end
+		end
+
+	is_exp_token (c: CHARACTER): BOOLEAN
+			-- Is number exposant token?
+		do
+			Result := c = token_exp or else c.as_lower = token_exp
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/utility/file/json_file_reader.e

@@ -0,0 +1,49 @@
+note
+	description: "Objects that ..."
+	author: ""
+	date: "$Date$"
+	revision: "$Revision$"
+
+class
+	JSON_FILE_READER
+
+feature -- Access
+
+	read_json_from (a_path: READABLE_STRING_GENERAL): detachable STRING
+		local
+			l_file: PLAIN_TEXT_FILE
+			l_last_string: detachable STRING
+			l_file_count: INTEGER
+			l_fetch_done: BOOLEAN
+		do
+			create l_file.make_with_name (a_path)
+				-- We perform several checks until we make a real attempt to open the file.
+			if not l_file.exists then
+				print ("error: '" + a_path.out + "' does not exist%N") -- FIXME: unicode may be truncated
+			else
+				if not l_file.is_readable then
+					print ("error: '" + a_path.out + "' is not readable.%N") -- FIXME: unicode may be truncated
+				else
+					l_file_count := l_file.count
+					l_file.open_read
+					from
+						create Result.make (l_file_count)
+					until
+						l_fetch_done
+					loop
+						l_file.read_stream (1_024)
+						l_last_string := l_file.last_string
+						l_fetch_done := l_file.exhausted or l_file.end_of_file or l_last_string.count < 1_024
+						if not l_last_string.is_empty then
+							Result.append (l_last_string)
+						end
+					end
+					l_file.close
+				end
+			end
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/utility/visitor/json_iterator.e

@@ -0,0 +1,61 @@
+note
+	description: "JSON Iterator"
+	pattern: "Iterator visitor"
+	author: "Jocelyn Fiat"
+	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
+	date: "2013/08/01"
+	revision: "Revision 0.1"
+
+deferred class
+	JSON_ITERATOR
+
+inherit
+
+	JSON_VISITOR
+
+feature -- Visitor Pattern
+
+	visit_json_array (a_json_array: JSON_ARRAY)
+			-- Visit `a_json_array'.
+		do
+			across
+				a_json_array as c
+			loop
+				c.item.accept (Current)
+			end
+		end
+
+	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
+			-- Visit `a_json_boolean'.
+		do
+		end
+
+	visit_json_null (a_json_null: JSON_NULL)
+			-- Visit `a_json_null'.
+		do
+		end
+
+	visit_json_number (a_json_number: JSON_NUMBER)
+			-- Visit `a_json_number'.
+		do
+		end
+
+	visit_json_object (a_json_object: JSON_OBJECT)
+			-- Visit `a_json_object'.
+		do
+			across
+				a_json_object as c
+			loop
+				c.item.accept (Current)
+			end
+		end
+
+	visit_json_string (a_json_string: JSON_STRING)
+			-- Visit `a_json_string'.
+		do
+		end
+
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
+end

contrib/library/text/parser/json/library/utility/visitor/json_pretty_string_visitor.e

@@ -6,6 +6,7 @@ class
 	JSON_PRETTY_STRING_VISITOR
 
 inherit
+
 	JSON_VISITOR
 
 create
@@ -26,21 +27,58 @@ feature -- Initialization
 			output := a_output
 			create indentation.make_empty
 			indentation_step := "%T"
-
 			object_count_inlining := a_object_count_inlining
 			array_count_inlining := a_array_count_inlining
 		end
 
 feature -- Access
 
-	output: STRING_32
+	output: STRING_GENERAL
 			-- JSON representation
 
-	indentation: like output
+feature -- Settings
 
-	indentation_step: like indentation
+	indentation_step: STRING
+			-- Text used for indentation.
+			--| by default a tabulation "%T"
 
-	line_number: INTEGER
+	object_count_inlining: INTEGER
+			-- Inline where object item count is under `object_count_inlining'.
+			--| ex 3:
+			--| { "a", "b", "c" }
+			--| ex 2:
+			--| {
+			--|		"a",
+			--|		"b",
+			--|		"c"
+			--|	}
+
+	array_count_inlining: INTEGER
+			-- Inline where array item count is under `object_count_inlining'.
+
+feature -- Element change
+
+	set_indentation_step (a_step: STRING)
+			-- Set `indentation_step' to `a_step'.
+		do
+			indentation_step := a_step
+		end
+
+	set_object_count_inlining (a_nb: INTEGER)
+			-- Set `object_count_inlining' to `a_nb'.
+		do
+			object_count_inlining := a_nb
+		end
+
+	set_array_count_inlining (a_nb: INTEGER)
+			-- Set `array_count_inlining' to `a_nb'.
+		do
+			array_count_inlining := a_nb
+		end
+
+feature {NONE} -- Implementation			
+
+	indentation: STRING
 
 	indent
 		do
@@ -59,8 +97,7 @@ feature -- Access
 			line_number := line_number + 1
 		end
 
-	object_count_inlining: INTEGER
-	array_count_inlining: INTEGER
+	line_number: INTEGER
 
 feature -- Visitor Pattern
 
@@ -71,10 +108,14 @@ feature -- Visitor Pattern
 			l_json_array: ARRAYED_LIST [JSON_VALUE]
 			l_line: like line_number
 			l_multiple_lines: BOOLEAN
+			l_output: like output
 		do
+			l_output := output
 			l_json_array := a_json_array.array_representation
-			l_multiple_lines := l_json_array.count >= array_count_inlining or across l_json_array as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
-			output.append ("[")
+			l_multiple_lines := l_json_array.count >= array_count_inlining
+									or across l_json_array as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
+			l_output.append_code (91) -- '[' : 91
+
 			l_line := line_number
 			indent
 			from
@@ -82,27 +123,21 @@ feature -- Visitor Pattern
 			until
 				l_json_array.off
 			loop
-				if
-					line_number > l_line or
-					l_multiple_lines
-				then
+				if line_number > l_line or l_multiple_lines then
 					new_line
 				end
 				value := l_json_array.item
 				value.accept (Current)
 				l_json_array.forth
 				if not l_json_array.after then
-					output.append (", ")
+					l_output.append (", ")
 				end
 			end
 			exdent
-			if 
-				line_number > l_line or
-				l_json_array.count >= array_count_inlining 
-			then
+			if line_number > l_line or l_json_array.count >= array_count_inlining then
 				new_line
 			end
-			output.append ("]")
+			l_output.append_code (93) -- ']' : 93
 		end
 
 	visit_json_boolean (a_json_boolean: JSON_BOOLEAN)
@@ -129,10 +164,12 @@ feature -- Visitor Pattern
 			l_pairs: HASH_TABLE [JSON_VALUE, JSON_STRING]
 			l_line: like line_number
 			l_multiple_lines: BOOLEAN
+			l_output: like output
 		do
+			l_output := output
 			l_pairs := a_json_object.map_representation
 			l_multiple_lines := l_pairs.count >= object_count_inlining or across l_pairs as p some attached {JSON_OBJECT} p.item or attached {JSON_ARRAY} p.item end
-			output.append ("{")
+			l_output.append_code (123) -- '{' : 123
 			l_line := line_number
 			indent
 			from
@@ -140,36 +177,36 @@ feature -- Visitor Pattern
 			until
 				l_pairs.off
 			loop
-				if 
-					line_number > l_line or
-					l_multiple_lines
-				then
+				if line_number > l_line or l_multiple_lines then
 					new_line
 				end
 				l_pairs.key_for_iteration.accept (Current)
-				output.append (": ")
+				l_output.append (": ")
 				l_pairs.item_for_iteration.accept (Current)
 				l_pairs.forth
 				if not l_pairs.after then
-					output.append (", ")
+					l_output.append (", ")
 				end
 			end
 			exdent
-			if 
-				line_number > l_line or
-				l_pairs.count >= object_count_inlining 
-			then
+			if line_number > l_line or l_pairs.count >= object_count_inlining then
 				new_line
 			end
-			output.append ("}")
+			l_output.append_code (125) -- '}' : 125
 		end
 
 	visit_json_string (a_json_string: JSON_STRING)
 			-- Visit `a_json_string'.
+		local
+			l_output: like output
 		do
-			output.append ("%"")
-			output.append (a_json_string.item)
-			output.append ("%"")
+			l_output := output
+			l_output.append_code (34) -- '%"' : 34
+			l_output.append (a_json_string.item)
+			l_output.append_code (34) -- '%"' : 34
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/utility/visitor/json_visitor.e

@@ -1,8 +1,5 @@
 note
-	description:
-
-		"JSON Visitor"
-
+	description: "JSON Visitor"
 	pattern: "Visitor"
 	author: "Javier Velilla"
 	license: "MIT (see http://www.opensource.org/licenses/mit-license.php)"
@@ -56,4 +53,7 @@ feature -- Visitor Pattern
 		deferred
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/library/utility/visitor/print_json_visitor.e

@@ -8,9 +8,11 @@ class
 	PRINT_JSON_VISITOR
 
 inherit
+
 	JSON_VISITOR
 
-create make
+create
+	make
 
 feature -- Initialization
 
@@ -99,4 +101,7 @@ feature -- Visitor Pattern
 			to_json.append ("%"")
 		end
 
+note
+	copyright: "2010-2014, Javier Velilla and others https://github.com/eiffelhub/json."
+	license: "https://github.com/eiffelhub/json/blob/master/License.txt"
 end

contrib/library/text/parser/json/package.iron

@@ -0,0 +1,16 @@
+package json
+
+project
+	json_safe = "library/json-safe.ecf"
+	json = "library/json.ecf"
+	json_gobo_extension = "library/json_gobo_extension.ecf"
+
+note
+	title: Eiffel JSON
+	description: Eiffel JSON parser and visitors
+	tags: json,parser,text
+	license: MIT
+	copyright: Copyright (c)  2010-2014 Javier Velilla, Jocelyn Fiat and others,
+	link[github]: "project" https://github.com/eiffelhub/json
+
+end

contrib/library/text/parser/json/test/autotest/test_suite/application.e

@@ -7,6 +7,7 @@ class
 	APPLICATION
 
 inherit
+
 	ARGUMENTS
 
 create

contrib/library/text/parser/json/test/autotest/test_suite/author.e

@@ -1,4 +1,5 @@
-class AUTHOR
+class
+	AUTHOR
 
 create
 	make
@@ -6,19 +7,26 @@ create
 feature {NONE} -- Initialization
 
 	make (a_name: STRING_32)
+			-- Create an author with `a_name' as `name'.
 		do
 			set_name (a_name)
+		ensure
+			name_set: name = a_name
 		end
 
 feature -- Access
 
 	name: STRING_32
+			-- Author name
 
-feature -- Status setting
+feature -- Change
 
 	set_name (a_name: STRING_32)
+			-- Set `name' with `a_name'.
 		do
 			name := a_name
+		ensure
+			name_set: name = a_name
 		end
 
 end -- class AUTHOR

contrib/library/text/parser/json/test/autotest/test_suite/book.e

@@ -1,40 +1,59 @@
-class BOOK
+class
+	BOOK
 
 create
 	make
 
 feature {NONE} -- Initialization
 
-    make (a_title: STRING_32; an_author: AUTHOR; an_isbn: STRING_32)
+	make (a_title: STRING_32; a_author: AUTHOR; a_isbn: STRING_32)
+			-- Create a book with `a_title' as `title',
+			-- `a_author' as `author', and `a_isbn' as `isbn'.
 		do
 			set_title (a_title)
-            set_author (an_author)
-            set_isbn (an_isbn)
+			set_author (a_author)
+			set_isbn (a_isbn)
+		ensure
+			title_set: title = a_title
+			author_set: author = a_author
+			isbn_set: isbn = a_isbn
 		end
 
 feature -- Access
 
 	title: STRING_32
+			-- Main title.
 
 	isbn: STRING_32
+			-- ISBN.
 
 	author: AUTHOR
+			-- Author.
 
-feature -- Status setting
+feature -- Change
 
 	set_title (a_title: STRING_32)
+			-- Set `title' with `a_title'.
 		do
 			title := a_title
+		ensure
+			title_set: title = a_title
 		end
 
-    set_author (an_author: AUTHOR)
+	set_author (a_author: AUTHOR)
+			-- Set `author' with `a_author'.
 		do
-            author := an_author
+			author := a_author
+		ensure
+			author_set: author = a_author
 		end
 
-    set_isbn (an_isbn: STRING_32)
+	set_isbn (a_isbn: STRING_32)
+			-- Set `isbn' with `a_isbn'.
 		do
-            isbn := an_isbn
+			isbn := a_isbn
+		ensure
+			isbn_set: isbn = a_isbn
 		end
 
 end -- class BOOK

contrib/library/text/parser/json/test/autotest/test_suite/book_collection.e

@@ -1,4 +1,5 @@
-class BOOK_COLLECTION
+class
+	BOOK_COLLECTION
 
 create
 	make
@@ -6,75 +7,76 @@ create
 feature {NONE} -- Initialization
 
 	make (a_name: STRING_32)
+			-- Create a book collection with `a_name' as `name'.
 		do
 			set_name (a_name)
 			create book_index.make (10)
+		ensure
+			name_set: name = a_name
 		end
 
 feature -- Access
 
 	name: STRING_32
+			-- Name.
 
 	books: LIST [BOOK]
+			-- collection of book.
 		do
-            from
 			create {LINKED_LIST [BOOK]} Result.make
-				book_index.start
-            until
-                book_index.after
+			across
+				book_index as it
 			loop
-                Result.append (book_index.item_for_iteration)
-                book_index.forth
+				Result.append (it.item)
 			end
 		end
 
-    books_by_author (an_author: STRING_32): detachable LIST [BOOK]
+	books_by_author (a_author: STRING_32): LIST [BOOK]
+			-- Books wrote by `a_author' in this collection.
 		do
-            if book_index.has (an_author) then
-                Result := book_index @ an_author
+			if attached book_index [a_author] as l_result then
+				Result := l_result
 			else
 				create {LINKED_LIST [BOOK]} Result.make
 			end
 		end
 
-feature -- Status setting
+feature -- Change
 
 	set_name (a_name: STRING_32)
+			-- Set `name' with `a_name'.
 		do
 			name := a_name
+		ensure
+			name_set: name = a_name
 		end
 
 	add_book (a_book: BOOK)
+			-- Extend collection with `a_book'.
 		local
 			l: detachable LIST [BOOK]
 		do
-            if book_index.has (a_book.author.name) then
 			l := book_index.at (a_book.author.name)
-            else
+			if l = Void then
 				create {LINKED_LIST [BOOK]} l.make
 				book_index.put (l, a_book.author.name)
 			end
-            if attached l as la then
-           	 	la.force (a_book)
-            end
-
+			l.force (a_book)
 		end
 
 	add_books (book_list: like books)
-
+			-- Append collection with `book_list'.
 		do
-            from
-                book_list.start
-            until
-                book_list.after
+			across
+				book_list as it
 			loop
-                add_book (book_list.item)
-                book_list.forth
+				add_book (it.item)
 			end
 		end
 
 feature {NONE} -- Implementation
 
 	book_index: HASH_TABLE [LIST [BOOK], STRING_32]
+			-- Association of author name and its books.
 
 end -- class BOOK_COLLECTION

contrib/library/text/parser/json/test/autotest/test_suite/json_author_converter.e

@@ -4,9 +4,11 @@ note
 	date: "$Date$"
 	revision: "$Revision$"
 
-class JSON_AUTHOR_CONVERTER
+class
+	JSON_AUTHOR_CONVERTER
 
 inherit
+
 	JSON_CONVERTER
 
 create
@@ -29,12 +31,10 @@ feature -- Access
 feature -- Conversion
 
 	from_json (j: like to_json): detachable like object
-        local
-            ucs: detachable STRING_32
 		do
-            ucs ?= json.object (j.item (name_key), Void)
-            check ucs /= Void end
-            create Result.make (ucs)
+			if attached {STRING_32} json.object (j.item (name_key), Void) as l_name then
+				create Result.make (l_name)
+			end
 		end
 
 	to_json (o: like object): JSON_OBJECT
@@ -46,8 +46,9 @@ feature -- Conversion
 feature {NONE} -- Implementation
 
 	name_key: JSON_STRING
+			-- Author's name label.
 		once
-            create Result.make_json ("name")
+			create Result.make_from_string ("name")
 		end
 
 end -- class JSON_AUTHOR_CONVERTER

contrib/library/text/parser/json/test/autotest/test_suite/json_book_collection_converter.e

@@ -4,9 +4,11 @@ note
 	date: "$Date$"
 	revision: "$Revision$"
 
-class JSON_BOOK_COLLECTION_CONVERTER
+class
+	JSON_BOOK_COLLECTION_CONVERTER
 
 inherit
+
 	JSON_CONVERTER
 
 create
@@ -30,35 +32,35 @@ feature -- Conversion
 
 	from_json (j: like to_json): detachable like object
 		local
-            ucs: detachable STRING_32
-            ll: LINKED_LIST [BOOK]
-            b: detachable BOOK
-            ja: detachable JSON_ARRAY
-            i: INTEGER
+			l_books: LINKED_LIST [BOOK]
 		do
-            ucs ?= json.object (j.item (name_key), Void)
-            check ucs /= Void end
-            create Result.make (ucs)
-            ja ?= j.item (books_key)
-            check ja /= Void end
-            from
-                i := 1
-                create ll.make
+			if
+				attached {STRING_32} json.object (j.item (name_key), Void) as l_name and
+				attached {JSON_ARRAY} j.item (books_key) as l_json_array
+			then
+				create Result.make (l_name)
+				create l_books.make
+				across
+					l_json_array as it
 				until
-                i > ja.count
+					Result = Void
 				loop
-                b ?= json.object (ja [i], "BOOK")
-                check b /= Void end
-                ll.force (b)
-                i := i + 1
+					if attached {BOOK} json.object (it.item, "BOOK") as l_book then
+						l_books.extend (l_book)
+					else
+						Result := Void
+							-- Failed
+					end
+				end
+				if Result /= Void then
+					Result.add_books (l_books)
+				end
 			end
-            check ll /= Void end
-            Result.add_books (ll)
 		end
 
 	to_json (o: like object): JSON_OBJECT
 		do
-            create Result.make
+			create Result.make_with_capacity (2)
 			Result.put (json.value (o.name), name_key)
 			Result.put (json.value (o.books), books_key)
 		end
@@ -66,13 +68,15 @@ feature -- Conversion
 feature {NONE} -- Implementation
 
 	name_key: JSON_STRING
+			-- Collection's name label.
 		once
-            create Result.make_json ("name")
+			create Result.make_from_string ("name")
 		end
 
 	books_key: JSON_STRING
+			-- Book list label.
 		once
-            create Result.make_json ("books")
+			create Result.make_from_string ("books")
 		end
 
 end -- class JSON_BOOK_COLLECTION_CONVERTER