X-Git-Url: http://nitlanguage.org

diff --git a/contrib/pep8analysis/src/pep8analysis_web.nit b/contrib/pep8analysis/src/pep8analysis_web.nit
index def8e3c..e9a81d8 100644
--- a/contrib/pep8analysis/src/pep8analysis_web.nit
+++ b/contrib/pep8analysis/src/pep8analysis_web.nit
@@ -1,4 +1,28 @@
-module pep8analysis_web
+# This file is part of the pep8analysis project (http://xymus.net/pep8/)
+#
+# Copyright 2013-2014 Alexis Laferrière <alexis.laf@xymus.net>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Web version of the pep8analysis tool
+#
+# Takes the entire Pep/8 source code as argument and prints out the
+# analysis results. The result graph will be sent to the JavaScript function
+# `show_graph` with the source of the graph in Graphviz's dot.
+module pep8analysis_web is
+	cppflags "--std=c++11 --bind"
+	ldflags "--bind"
+end
 
 import emscripten
 
@@ -7,14 +31,30 @@ import ast
 import model
 import cfg
 import flow_analysis
+intrude import core::stream
+import cpp
+
+in "C++" `{
+	#include <bind.h>
+
+	using namespace emscripten;
+
+	EMSCRIPTEN_BINDINGS(my_module) {
+		function("run_analysis", &CString_run_analysis, allow_raw_pointers());
+	}
+`}
 
 redef class AnalysisManager
 
-	fun run(src: String)
+	fun run_web(src: String)
 	do
-		var stream = new StringIStream(src)
+		sys.suggest_garbage_collection
+
+		var stream = new StringReader(src)
 		var ast = build_ast("web", stream)
-		assert ast != null
+		if ast == null then return
+
+		sys.suggest_garbage_collection
 
 		if failed then exit 1
 
@@ -24,29 +64,39 @@ redef class AnalysisManager
 
 		if model.lines.is_empty then
 			fatal_error( ast, "This programs appears empty" )
-			exit 1
+			return
 		end
 
+		sys.suggest_garbage_collection
+
 		# Create CFG
 		var cfg = build_cfg(model)
 		if failed then exit 1
 
 		# Run analyses
 
+		sys.suggest_garbage_collection
+
 		## Reaching defs
 		do_reaching_defs_analysis(cfg)
 
+		sys.suggest_garbage_collection
+
 		## Range
 		do_range_analysis(ast, cfg)
 
+		sys.suggest_garbage_collection
+
 		## Types
 		do_types_analysis(ast, cfg)
 
+		sys.suggest_garbage_collection
+
 		print_notes
 		if notes.is_empty then print "Success: Nothing wrong detected"
 
-		var of = new StringOStream
-		cfg.print_dot(of, true)
+		var of = new StringWriter
+		cfg.print_dot(of, false)
 		of.close
 		show_graph(of.to_s)
 
@@ -58,17 +108,11 @@ redef class AnalysisManager
 	fun show_graph(content: String) do "show_graph('{content.escape_to_c}');".run_js
 end
 
-class StringIStream
-	super BufferedIStream
-
-	init(str: String) do _buffer = new FlatBuffer.from(str)
-
-	redef fun fill_buffer do end_reached = true
-	redef var end_reached: Bool = false
+redef class CString
+	fun run_analysis do manager.run_web to_s
 end
 
-redef class Object
-	redef fun manager do return once new AnalysisManager
-end
+fun dummy_set_callbacks import CString.run_analysis in "C++" `{
+`}
 
-manager.run args.first
+dummy_set_callbacks