Merge code to access property information from Python.

Author: kpeeters

core/CMakeLists.txt

@@ -179,6 +179,7 @@ set(MODULE_SRC_FILES
 	pythoncdb/py_progress.cc
 	pythoncdb/py_properties.cc
 	pythoncdb/py_stopwatch.cc
+	pythoncdb/py_tableau.cc
 )
 
 set(LOCAL_SRC_FILES

core/Parser.cc

@@ -22,8 +22,7 @@ You should have received a copy of the GNU General Public License
 #include "PreProcessor.hh"
 
 #include <sstream>
-#include <locale>
-#include <codecvt>
+#include <internal/uniconv.h>
 #include <iostream>
 #include <typeinfo>
 
@@ -173,8 +172,8 @@ bool Parser::string2tree(const std::string& inp)
 	ss2 << pp;
 	std::string str8="  "+ss2.str()+"  "; // for lookahead
 
-	std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
-	str=conv.from_bytes(str8);
+	utf_converter conv;
+	str=conv.to_utf32(str8);
 
 	//	std::cout << str << std::endl;
 

core/PreProcessor.cc

@@ -33,8 +33,7 @@ Remember: we want brackets around infix operators to be around every child,
 #include <ctype.h>
 #include <stdexcept>
 #include <sstream>
-#include <locale>
-#include <codecvt>
+#include <internal/uniconv.h>
 #include "PreProcessor.hh"
 
 const char32_t preprocessor::orders[]     = { '!', tok_pow, '/', '*', tok_wedge,
@@ -56,9 +55,10 @@ const char32_t preprocessor::close_brackets[]   = { '}', ')', ']' };
 std::istream& operator>>(std::istream& s, preprocessor& p)
 	{
 	std::string inp;
-	std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
+
+	utf_converter conv;
 	while(std::getline(s,inp)) {
-		std::u32string inp32=conv.from_bytes(inp);
+		std::u32string inp32=conv.to_utf32(inp);
 		p.parse_(inp32);
 		}
 	return s;
@@ -70,8 +70,8 @@ std::ostream& operator<<(std::ostream& s, const preprocessor& p)
 		p.unwind_(sizeof(preprocessor::orders)/sizeof(char32_t));
 	p.unwind_(sizeof(preprocessor::orders)/sizeof(char32_t));
 	p.strip_outer_brackets();
-	std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
-	auto ac8 = conv.to_bytes(p.cur.accu);
+	utf_converter conv;
+	auto ac8 = conv.to_utf8(p.cur.accu);
 	s << ac8;
 	return s;
 	}
@@ -203,7 +203,7 @@ char32_t preprocessor::get_token_(char32_t prev_token)
 		//			}
 		}
 	if(is_opening_bracket_(prev_token)) {
-		while(isblank(cur_str[cur_pos])) {
+		while (std::isblank(cur_str[cur_pos], std::locale{})) {
 			++cur_pos;
 			}
 		}
@@ -260,7 +260,7 @@ char32_t preprocessor::get_token_(char32_t prev_token)
 
 		//	HERE: how do we force get_token to return a '*' for the space separating .... and b ?
 
-		if(isblank(c)) {
+		if (std::isblank(c, std::locale{})) {
 			//			std::cout << "blank " << (int)(c) << "\n";
 			if(candidate==0) candidate=' ';
 			++cur_pos;
@@ -526,8 +526,8 @@ void preprocessor::parse_(const std::u32string& str)
 void preprocessor::show_and_throw_(const std::string& str) const
 	{
 	std::stringstream ss;
-	std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
-	ss << std::endl << conv.to_bytes(cur_str) << std::endl;
+	utf_converter conv;
+	ss << std::endl << conv.to_utf8(cur_str) << std::endl;
 	for(unsigned int i=0; i<cur_pos; ++i)
 		ss << " ";
 	ss << "^" << std::endl

core/Storage.cc

@@ -23,8 +23,7 @@ You should have received a copy of the GNU General Public License
 #include "Exceptions.hh"
 #include <iomanip>
 #include <sstream>
-#include <locale>
-#include <codecvt>
+#include <internal/uniconv.h>
 #include <pcrecpp.h>
 
 //#define DEBUG 1
@@ -714,8 +713,8 @@ namespace cadabra {
 
 	str_node::str_node(const std::u32string& nm, bracket_t br, parent_rel_t pr)
 		{
-		std::wstring_convert<std::codecvt_utf8<char32_t>, char32_t> conv;
-		std::string nm8=conv.to_bytes(nm);
+		utf_converter conv;
+		std::string nm8=conv.to_utf8(nm);
 #ifdef DEBUG
 		std::cerr << "str_node: " << nm8 << std::endl;
 #endif
@@ -773,7 +772,7 @@ namespace cadabra {
 		{
 		if((*name).size()==0) return false;
 		for(unsigned int i=0; i<(*name).size(); ++i) {
-			if(!isdigit((*name)[i]) && (*name)[i]!='/' && (*name)[i]!='-')
+			if (!std::isdigit((*name)[i], std::locale{}) && (*name)[i] != '/' && (*name)[i] != '-')
 				return false;
 			}
 		return true;
@@ -783,7 +782,7 @@ namespace cadabra {
 		{
 		if((*name).size()==0) return false;
 		for(unsigned int i=0; i<(*name).size(); ++i) {
-			if(!isdigit((*name)[i]) && (*name)[i]!='-')
+			if (!std::isdigit((*name)[i], std::locale{}) && (*name)[i] != '-')
 				return false;
 			}
 		return true;
@@ -897,7 +896,7 @@ namespace cadabra {
 		{
 		int len=(*name).size();
 		if(len>1)
-			if(isdigit((*name)[len-1]))
+			if (std::isdigit((*name)[len - 1], std::locale{}))
 				return true;
 		return false;
 		}