Commit 44673761 authored by Ronan's avatar Ronan

fix compilation build (belr refactoring)

parent a39ef028
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
#include <sstream>
......@@ -39,37 +39,37 @@ namespace belcard {
std::string _postal_code;
std::string _country;
std::shared_ptr<BelCardLabelParam> _label_param;
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardAddress> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardAddress();
BELCARD_PUBLIC void setPostOfficeBox(const std::string &value);
BELCARD_PUBLIC const std::string &getPostOfficeBox() const;
BELCARD_PUBLIC void setExtendedAddress(const std::string &value);
BELCARD_PUBLIC const std::string &getExtendedAddress() const;
BELCARD_PUBLIC void setStreet(const std::string &value);
BELCARD_PUBLIC const std::string &getStreet() const;
BELCARD_PUBLIC void setLocality(const std::string &value);
BELCARD_PUBLIC const std::string &getLocality() const;
BELCARD_PUBLIC void setRegion(const std::string &value);
BELCARD_PUBLIC const std::string &getRegion() const;
BELCARD_PUBLIC void setPostalCode(const std::string &value);
BELCARD_PUBLIC const std::string &getPostalCode() const;
BELCARD_PUBLIC void setCountry(const std::string &value);
BELCARD_PUBLIC const std::string &getCountry() const;
BELCARD_PUBLIC void setLabelParam(const std::shared_ptr<BelCardLabelParam> &param);
BELCARD_PUBLIC const std::shared_ptr<BelCardLabelParam> &getLabelParam() const;
BELCARD_PUBLIC virtual void serialize(std::ostream &output) const;
};
}
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......@@ -32,23 +32,23 @@ namespace belcard {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardFBURL> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardFBURL();
};
class BelCardCALADRURI : public BelCardProperty {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardCALADRURI> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardCALADRURI();
};
class BelCardCALURI : public BelCardProperty {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardCALURI> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardCALURI();
};
}
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
#include <sstream>
......@@ -33,18 +33,18 @@ namespace belcard {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardPhoneNumber> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardPhoneNumber();
};
class BelCardEmail : public BelCardProperty {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardEmail> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardEmail();
};
class BelCardImpp : public BelCardProperty {
private:
std::string _escaped_value;
......@@ -54,15 +54,15 @@ namespace belcard {
BELCARD_PUBLIC virtual void setValue(const std::string &value);
BELCARD_PUBLIC virtual void serialize(std::ostream &output) const;
BELCARD_PUBLIC BelCardImpp();
};
class BelCardLang : public BelCardProperty {
public:
BELCARD_PUBLIC static std::shared_ptr<BelCardLang> parse(const std::string& input);
BELCARD_PUBLIC static void setHandlerAndCollectors(belr::Parser<std::shared_ptr<BelCardGeneric>> *parser);
BELCARD_PUBLIC BelCardLang();
};
}
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
#include <list>
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......
......@@ -19,8 +19,8 @@
#ifndef belcard_params_hpp
#define belcard_params_hpp
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include "belcard_utils.hpp"
#include "belcard_generic.hpp"
......
......@@ -19,8 +19,8 @@
#ifndef belcard_parser_hpp
#define belcard_parser_hpp
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include "belcard_utils.hpp"
......
......@@ -19,8 +19,8 @@
#ifndef belcard_property_hpp
#define belcard_property_hpp
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include "belcard_utils.hpp"
#include "belcard/belcard_generic.hpp"
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
#include <sstream>
......
......@@ -21,8 +21,8 @@
#include "belcard_utils.hpp"
#include "belcard_property.hpp"
#include <belr/grammarbuilder.hh>
#include <belr/abnf.hh>
#include <belr/grammarbuilder.h>
#include <belr/abnf.h>
#include <string>
......
......@@ -18,7 +18,7 @@
#include "belcard/belcard.hpp"
#include "belcard/belcard_utils.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -18,7 +18,7 @@
#include <bctoolbox/parser.h>
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard_params.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -19,7 +19,7 @@
#include "belcard/belcard_parser.hpp"
#include "belcard/belcard.hpp"
#include "belcard/belcard_utils.hpp"
#include <belr/parser-impl.cc>
#include <iostream>
#include <fstream>
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard_property.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -17,7 +17,7 @@
*/
#include "belcard/belcard.hpp"
#include <belr/parser-impl.cc>
using namespace::std;
using namespace::belr;
......
......@@ -187,7 +187,7 @@ REV-param = VALUE-param / any-param
REV-value = timestamp
SOUND = [group "."] "SOUND" *(";" SOUND-param) ":" SOUND-value
SOUND-param = VALUE-param / LANGUAGE-param / PID-param / PREF-param
SOUND-param = VALUE-param / LANGUAGE-param / PID-param / PREF-param
/ TYPE-param / MEDIATYPE-param / ALTID-param / any-param
SOUND-value = URI
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment