فهرست منبع

fixed hlc compilation

ncannasse 6 سال پیش
والد
کامیت
4e9ebf66d7
3فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 1 1
      src/hl.h
  2. 2 2
      src/std/buffer.c
  3. 2 2
      src/std/obj.c

+ 1 - 1
src/hl.h

@@ -580,7 +580,7 @@ HL_API hl_obj_field *hl_obj_field_fetch( hl_type *t, int fid );
 HL_API int hl_hash( vbyte *name );
 HL_API int hl_hash( vbyte *name );
 HL_API int hl_hash_utf8( const char *str ); // no cache
 HL_API int hl_hash_utf8( const char *str ); // no cache
 HL_API int hl_hash_gen( const uchar *name, bool cache_name );
 HL_API int hl_hash_gen( const uchar *name, bool cache_name );
-HL_API const uchar *hl_field_name( int hash );
+HL_API vbyte *hl_field_name( int hash );
 
 
 #define hl_error(msg, ...) hl_throw(hl_alloc_strbytes(USTR(msg), ## __VA_ARGS__))
 #define hl_error(msg, ...) hl_throw(hl_alloc_strbytes(USTR(msg), ## __VA_ARGS__))
 
 

+ 2 - 2
src/std/buffer.c

@@ -293,7 +293,7 @@ static void hl_buffer_rec( hl_buffer *b, vdynamic *v, vlist *stack ) {
 			for(i=0;i<vv->t->virt->nfields;i++) {
 			for(i=0;i<vv->t->virt->nfields;i++) {
 				hl_field_lookup *f = vv->t->virt->lookup + i;
 				hl_field_lookup *f = vv->t->virt->lookup + i;
 				if( i ) hl_buffer_str_sub(b,USTR(", "),2);
 				if( i ) hl_buffer_str_sub(b,USTR(", "),2);
-				hl_buffer_str(b,hl_field_name(f->hashed_name));
+				hl_buffer_str(b,(uchar*)hl_field_name(f->hashed_name));
 				hl_buffer_str_sub(b,USTR(" : "),3);
 				hl_buffer_str_sub(b,USTR(" : "),3);
 				hl_buffer_addr(b, (char*)v + vv->t->virt->indexes[f->field_index], f->t, &l);
 				hl_buffer_addr(b, (char*)v + vv->t->virt->indexes[f->field_index], f->t, &l);
 			}
 			}
@@ -328,7 +328,7 @@ static void hl_buffer_rec( hl_buffer *b, vdynamic *v, vlist *stack ) {
 			for(i=0;i<o->nfields;i++) {
 			for(i=0;i<o->nfields;i++) {
 				hl_field_lookup *f = o->lookup + i;
 				hl_field_lookup *f = o->lookup + i;
 				if( i ) hl_buffer_str_sub(b,USTR(", "),2);
 				if( i ) hl_buffer_str_sub(b,USTR(", "),2);
-				hl_buffer_str(b,hl_field_name(f->hashed_name));
+				hl_buffer_str(b,(uchar*)hl_field_name(f->hashed_name));
 				hl_buffer_str_sub(b,USTR(" : "),3);
 				hl_buffer_str_sub(b,USTR(" : "),3);
 				hl_buffer_addr(b, hl_is_ptr(f->t) ? (void*)(o->values + f->field_index) : (void*)(o->raw_data + f->field_index), f->t, &l);
 				hl_buffer_addr(b, hl_is_ptr(f->t) ? (void*)(o->values + f->field_index) : (void*)(o->raw_data + f->field_index), f->t, &l);
 			}
 			}

+ 2 - 2
src/std/obj.c

@@ -130,9 +130,9 @@ HL_PRIM int hl_hash_gen( const uchar *name, bool cache_name ) {
 	return h;
 	return h;
 }
 }
 
 
-HL_PRIM const uchar *hl_field_name( int hash ) {
+HL_PRIM vbyte *hl_field_name( int hash ) {
 	hl_field_lookup *l = hl_lookup_find(hl_cache, hl_cache_count, hash);
 	hl_field_lookup *l = hl_lookup_find(hl_cache, hl_cache_count, hash);
-	return l ? (uchar*)l->t : USTR("???");
+	return l ? (vbyte*)l->t : (vbyte*)USTR("???");
 }
 }
 
 
 HL_PRIM void hl_cache_free() {
 HL_PRIM void hl_cache_free() {