X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprimitivetype.cpp;h=98053660e595cb4189e6b15fe016e6f31cbfd425;hb=f1b12c992db974c679d85ae6ec22cd318199d0d5;hp=717d98358e993a356bffe1a7cdccdc409f3db829;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/primitivetype.cpp b/source/primitivetype.cpp
index 717d9835..98053660 100644
--- a/source/primitivetype.cpp
+++ b/source/primitivetype.cpp
@@ -1,37 +1,31 @@
+#include <msp/strings/format.h>
 #include "primitivetype.h"
 
 namespace Msp {
 namespace GL {
 
-std::istream &operator>>(std::istream &in, PrimitiveType &pt)
+void operator>>(const LexicalConverter &conv, PrimitiveType &pt)
 {
-	std::string str;
-	in>>str;
-
-	if(str=="POINTS")
+	if(conv.get()=="POINTS")
 		pt = POINTS;
-	else if(str=="LINES")
+	else if(conv.get()=="LINES")
 		pt = LINES;
-	else if(str=="LINE_LOOP")
+	else if(conv.get()=="LINE_LOOP")
 		pt = LINE_LOOP;
-	else if(str=="LINE_STRIP")
+	else if(conv.get()=="LINE_STRIP")
 		pt = LINE_STRIP;
-	else if(str=="TRIANGLES")
+	else if(conv.get()=="TRIANGLES")
 		pt = TRIANGLES;
-	else if(str=="TRIANGLE_STRIP")
+	else if(conv.get()=="TRIANGLE_STRIP")
 		pt = TRIANGLE_STRIP;
-	else if(str=="TRIANGLE_FAN")
+	else if(conv.get()=="TRIANGLE_FAN")
 		pt = TRIANGLE_FAN;
-	else if(str=="QUADS")
+	else if(conv.get()=="QUADS")
 		pt = QUADS;
-	else if(str=="QUAD_STRIP")
+	else if(conv.get()=="QUAD_STRIP")
 		pt = QUAD_STRIP;
-	else if(str=="POLYGON")
-		pt = POLYGON;
 	else
-		in.setstate(std::ios_base::failbit);
-
-	return in;
+		throw lexical_error(format("conversion of '%s' to PrimitiveType", conv.get()));
 }
 
 } // namespace GL