--- parser3/src/classes/image.C	2001/10/23 14:43:44	1.59
+++ parser3/src/classes/image.C	2002/04/18 10:50:59	1.71
@@ -1,10 +1,10 @@
 /** @file
 	Parser: @b image parser class.
 
-	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
-	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
+	Copyright(c) 2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: image.C,v 1.59 2001/10/23 14:43:44 parser Exp $
+	$Id: image.C,v 1.71 2002/04/18 10:50:59 paf Exp $
 */
 
 /*
@@ -25,10 +25,6 @@
 #include "pa_vfile.h"
 #include "pa_vimage.h"
 
-// defines
-
-#define IMAGE_CLASS_NAME "image"
-
 // class
 
 class MImage : public Methoded {
@@ -128,13 +124,13 @@ void measure_gif(Pool& pool, const Strin
 	void *buf;
 	const int head_size=sizeof(GIF_Header);
 	if(reader.read(buf, head_size)<head_size)
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not GIF file - too small");
 	GIF_Header *head=(GIF_Header *)buf;
 
 	if(strncmp(head->type, "GIF", 3)!=0)
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not GIF file - wrong signature");	
 
@@ -153,13 +149,13 @@ void measure_jpeg(Pool& pool, const Stri
 	void *buf;
 	const size_t prefix_size=2;
 	if(reader.read(buf, prefix_size)<prefix_size)
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not JPEG file - too small");
 	unsigned char *signature=(unsigned char *)buf;
 	
 	if(!(signature[0]==0xFF && signature[1]==0xD8)) 
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"not JPEG file - wrong signature");
 
@@ -194,7 +190,7 @@ void measure_jpeg(Pool& pool, const Stri
 	}
 
 	if(!found)
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			origin_string, 
 			"broken JPEG file - size frame not found");
 }
@@ -203,18 +199,18 @@ void measure_jpeg(Pool& pool, const Stri
 
 void measure(Pool& pool, const String& file_name, 
 			 Measure_reader& reader, int& width, int& height) {
-	if(const char *cext=strrchr(file_name.cstr(), '.')) {
+	if(const char *cext=strrchr(file_name.cstr(String::UL_FILE_SPEC), '.')) {
 		cext++;
 		if(strcasecmp(cext, "GIF")==0)
 			measure_gif(pool, &file_name, reader, width, height);
 		else if(strcasecmp(cext, "JPG")==0 || strcasecmp(cext, "JPEG")==0) 
 			measure_jpeg(pool, &file_name, reader, width, height);
 		else
-			throw Exception(0, 0, 
+			throw Exception("image.format", 
 				&file_name, 
 				"unhandled image file name extension '%s'", cext);
 	} else
-		throw Exception(0, 0, 
+		throw Exception("image.format", 
 			&file_name, 
 			"can not determine image type - no file name extension");
 }
@@ -314,15 +310,16 @@ static void _html(Request& r, const Stri
 	Hash *attribs=0;
 
 	if(params->size()) {
-		Value &vattribs=r.process(params->get(0),
-			0/*no name*/,
+		// for backward compatibility: someday was ^html{}
+		Value &vattribs=r.process_to_value(params->get(0),
+			/*0/*no name* /,*/
 			false/*don't intercept string*/);
 		if(vattribs.is_defined()) // allow 'void'
 			if(attribs=vattribs.get_hash(&method_name)) {
 				Attrib_info attrib_info={&tag, 0};
 				attribs->for_each(append_attrib_pair, &attrib_info);
 			} else
-				throw Exception(0, 0, 
+				throw Exception("parser.runtime", 
 					&method_name, 
 					"attributes must be hash");
 	}
@@ -333,6 +330,7 @@ static void _html(Request& r, const Stri
 	r.write_pass_lang(tag);
 }
 
+/// @test wrap FILE to auto-object
 static gdImage *load(Request& r, const String& method_name, 
 					 const String& file_name){
 	Pool& pool=r.pool();
@@ -343,12 +341,12 @@ static gdImage *load(Request& r, const S
 		bool ok=image.CreateFromGif(f);
 		fclose(f);
 		if(!ok)
-			throw Exception(0, 0, 
+			throw Exception("image.format", 
 				&file_name,
 				"is not in GIF format");
 		return &image;
 	} else {
-		throw Exception(0, 0, 
+		throw Exception("file.missing", 
 			&method_name, 
 			"can not open '%s'", file_name_cstr);
 		return 0;
@@ -386,7 +384,7 @@ static void _gif(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -397,7 +395,7 @@ static void _gif(Request& r, const Strin
 	VFile& vfile=*new(pool) VFile(pool);
 	Value *content_type=new(pool) VString(*new(pool) String(pool, "image/gif"));
 	vfile.set(false/*not tainted*/, 
-		out.cstr(String::UL_AS_IS), out.size(), 0, content_type);
+		out.cstr(), out.size(), 0, content_type);
 
 	r.write_no_lang(vfile);
 }
@@ -407,7 +405,7 @@ static void _line(Request& r, const Stri
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -424,7 +422,7 @@ static void _fill(Request& r, const Stri
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -439,7 +437,7 @@ static void _rectangle(Request& r, const
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -456,7 +454,7 @@ static void _bar(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -483,13 +481,13 @@ static void _replace(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(2, "coordinates must not be code").get_table();
 	if(!table) 
-		throw Exception(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -506,13 +504,13 @@ static void _polyline(Request& r, const
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		throw Exception(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -529,13 +527,13 @@ static void _polygon(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		throw Exception(0, 0,
+		throw Exception(0,
 			&method_name,
 			"coordinates must be table");
 
@@ -551,13 +549,13 @@ static void _polybar(Request& r, const S
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
 	Table *table=params->as_no_junction(1, "coordinates must not be code").get_table();
 	if(!table) 
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"coordinates must be table");
 
@@ -618,7 +616,7 @@ public:
 	/* ******************************** string ********************************** */
 	
 	int string_width(const String& s){
-		const char *cstr=s.cstr(String::UL_AS_IS);
+		const char *cstr=s.cstr();
 		int result=0;
 		for(; *cstr; cstr++)
 			result+=index_width(index_of(*cstr));
@@ -626,7 +624,7 @@ public:
 	}
 	
 	void string_display(gdImage& image, int x, int y, const String& s){
-		const char *cstr=s.cstr(String::UL_AS_IS);
+		const char *cstr=s.cstr();
 		if(cstr) for(; *cstr; cstr++) {
 			int index=index_of(*cstr);
 			index_display(image, x, y, index);
@@ -652,7 +650,7 @@ static void _font(Request& r, const Stri
 		monospace_width=0;
 
 	if(!alphabet.size())
-		throw Exception(0, 0,
+		throw Exception("parser.runtime",
 			&method_name,
 			"alphabet must not be empty");
 	
@@ -674,11 +672,11 @@ static void _text(Request& r, const Stri
 		if(vimage.font)
 			vimage.font->string_display(*vimage.image, x, y, s);
 		else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"set the font first");
 	else
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 }
@@ -691,15 +689,13 @@ static void _length(Request& r, const St
 	VImage& vimage=*static_cast<VImage *>(r.self);
 	if(vimage.image)
 		if(vimage.font) {
-			VInt& result=*new(pool) VInt(pool, vimage.font->string_width(s));
-			result.set_name(method_name);
-			r.write_assign_lang(result);
+			r.write_no_lang(*new(pool) VInt(pool, vimage.font->string_width(s)));
 		} else
-			throw Exception(0, 0,
+			throw Exception("parser.runtime",
 				&method_name,
 				"set the font first");
 	else
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 }
@@ -709,7 +705,7 @@ static void _arc(Request& r, const Strin
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -728,7 +724,7 @@ static void _sector(Request& r, const St
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -747,7 +743,7 @@ static void _circle(Request& r, const St
 
 	gdImage *image=static_cast<VImage *>(r.self)->image;
 	if(!image)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"does not contain an image");
 
@@ -767,13 +763,13 @@ gdImage& as_image(Pool& pool, const Stri
 	Value& value=params->as_no_junction(index, msg);
 
 	if(strcmp(value.type(), VIMAGE_TYPE)!=0)
-		throw Exception(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			msg);
 
 	gdImage *src=static_cast<VImage *>(&value)->image;
 	if(!src)
-		throw Exception(0, 0, 
+		throw Exception("parser.runtime", 
 			&method_name, 
 			msg);
 
@@ -785,7 +781,7 @@ static void _copy(Request& r, const Stri
 
 	gdImage *dest=static_cast<VImage *>(r.self)->image;
 	if(!dest)
-		throw Exception(0, 0, 
+		throw Exception(0, 
 			&method_name, 
 			"self does not contain an image");
 
@@ -812,10 +808,7 @@ static void _copy(Request& r, const Stri
 
 // constructor
 
-MImage::MImage(Pool& apool) : Methoded(apool) {
-	set_name(*NEW String(pool(), IMAGE_CLASS_NAME));
-
-
+MImage::MImage(Pool& apool) : Methoded(apool, "image") {
 	// ^image:measure[DATA]
 	add_native_method("measure", Method::CT_DYNAMIC, _measure, 1, 1);