OSDN Git Service

cleanings~
[proj16/16.git] / src / lib / mapread.c
index 853b809..e3f40b4 100644 (file)
@@ -1,16 +1,17 @@
 #include "src/lib/mapread.h"
 
-int jsoneq(const char huge *json, jsmntok_t huge *tok, const char huge *s) {
-       if (tok->type == JSMN_STRING && (int)_fstrlen(s) == tok->end - tok->start &&
-                       _fstrncmp((char const *)json + tok->start, s, tok->end - tok->start) == 0) {
+int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
+       if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
+                       strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
                return 0;
        }
        return -1;
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
-       int i, j, k;
+word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q) {
+       dword i;
+       word j;//, k;
        bitmap_t bp;
        #ifdef DEBUG_JS
        if(indent==0)
@@ -20,6 +21,8 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
        }
        #endif
        #ifdef DEBUG_DUMPVARS
+       fprintf(stdout, "t->size=[%d]   ", t->size);
+       fprintf(stdout, "q=[%d] ", q);
        fprintf(stdout, "indent= [%d]   ", indent);
        fprintf(stdout, "js_sv= [%s]\n", js_sv);
        #endif
@@ -27,8 +30,9 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
                return 0;
        }
        /* We may want to do strtol() here to get numeric value */
+//0000fprintf(stderr, "t->type=%d\n", t->type);
        if (t->type == JSMN_PRIMITIVE) {
-               if(_fstrstr(js_sv, "data"))
+               if(strstr(js_sv, "data"))
                {
                        /*
                                here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
@@ -37,25 +41,22 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 
                                FUCK well i am stuck.... wwww
                        */
-//----                 map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
-                       map->data[q] = (byte)atoi((const char *)js+t->start);
+                       map->data[q] = (byte)atoi(js+t->start);
                        #ifdef DEBUG_MAPDATA
                                fprintf(stdout, "%d[%d]", q, map->data[q]);
                        #endif
                }
                else
-               if(_fstrstr(js_sv, "height"))
+               if(strstr(js_sv, "height"))
                {
-//----                 map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-                       map->height = atoi((const char *)js+t->start);
+                       map->height = atoi(js+t->start);
                        #ifdef DEBUG_MAPVAR
                        fprintf(stdout, "indent= [%d]   ", indent);
                        fprintf(stdout, "h:[%d]\n", map->height);
                        #endif
-               }else if(_fstrstr(js_sv, "width"))
+               }else if(strstr(js_sv, "width"))
                {
-//----                 map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-                       map->width = atoi((const char *)js+t->start);
+                       map->width = atoi(js+t->start);
                        #ifdef DEBUG_MAPVAR
                        fprintf(stdout, "indent= [%d]   ", indent);
                        fprintf(stdout, "w:[%d]\n", map->width);
@@ -68,11 +69,10 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
                {
 //                     fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
 //                     fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
-                       map->data = halloc(sizeof(byte) * (t+1)->size, sizeof(byte));
-                       //map->data = malloc(sizeof(byte) * (t+1)->size);
-                       map->tiles = /*_f*/malloc(sizeof(tiles_t));
+                       map->data = malloc(sizeof(byte) * (t+1)->size);
+                       map->tiles = malloc(sizeof(tiles_t));
                        //map->tiles->data = malloc(sizeof(bitmap_t));
-                       //fix this
+                       //fix this to be far~
                        bp = bitmapLoadPcx("data/ed.pcx");
                        map->tiles->data = &bp;
                        //map->tiles->data->data = malloc((16/**2*/)*16);
@@ -82,19 +82,17 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
                        map->tiles->tileWidth = 16;\r
                        map->tiles->rows = 1;\r
                        map->tiles->cols = 1;
-                       _fstrcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
+                       strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);
                }
                else
                if (jsoneq(js, t, "height") == 0 && indent<=1)
                {
-                       fprintf(stdout, "height\n");
-                       _fstrcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
+                       strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);
                }else
                if(jsoneq(js, t, "width") == 0 && indent<=1)
                {
-                       fprintf(stdout, "width\n");
-                       _fstrcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
-               }else _fstrcpy(js_sv, "\0");
+                       strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);
+               }else strcpy(js_sv, "\0");
                return 1;
        } else if (t->type == JSMN_OBJECT) {
                //fprintf(stdout, "\n");
@@ -124,17 +122,16 @@ int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char
 int loadmap(char *mn, map_t *map)
 {
        int r;
-       static int incr=0;
+       static word incr=0;
        int eof_expected = 0;
-       //char *jz = NULL;
-       char huge *js = NULL;
+       char *js = NULL;
        size_t jslen = 0;
        char buf[BUFSIZ];
-       char huge *buff = &buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//
+//---- char *buff = &buf;
        static char js_ss[16];
 
        jsmn_parser p;
-       jsmntok_t huge *tok;
+       jsmntok_t *tok;
        size_t tokcount = 2;
 
        FILE *fh = fopen(mn, "r");
@@ -143,7 +140,8 @@ int loadmap(char *mn, map_t *map)
        jsmn_init(&p);
 
        /* Allocate some tokens as a start */
-       tok = _fmalloc(sizeof(*tok) * tokcount);
+//0000fprintf(stderr, "tok malloc\n");
+       tok = malloc(sizeof(*tok) * tokcount);
        if (tok == NULL) {
                fprintf(stderr, "malloc(): errno=%d\n", errno);
                return 3;
@@ -151,6 +149,7 @@ int loadmap(char *mn, map_t *map)
 
        for (;;) {
                /* Read another chunk */
+//0000fprintf(stderr, "read\n");
                r = fread(buf, 1, sizeof(buf), fh);
                if (r < 0) {
                        fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);
@@ -164,31 +163,30 @@ int loadmap(char *mn, map_t *map)
                                return 2;
                        }
                }
-               //buf[BUFSIZ]='\0';
-               js = _frealloc(js, jslen + r + 1);
+//0000fprintf(stdout, "r=      [%d]    BUFSIZ=%d\n", r, BUFSIZ);
+//0000fprintf(stderr, "js alloc~\n");
+               js = realloc(js, jslen + r + 1);
                if (js == NULL) {
                        fprintf(stderr, "*js=%Fp\n", *js);
                        fprintf(stderr, "realloc(): errno = %d\n", errno);
                        return 3;
                }
-               //printf("strncpy~\n");
-               //strncpy(jz + jslen, buf, r);
-               //if(
-               //_fstrncpy(js + jslen, &(*buff), r);
-               _fstrncpy(js + jslen, &(*buff), r);
-               //strncpy((char *)js + jslen, buf, r);
-               // == NULL)
-//                     fprintf(stderr, "_fstrncpy(): errno = %d\n", errno);
-               //printf("strncpy okies~~\n");
+               strncpy(js + jslen, buf, r);
                jslen = jslen + r;
 
 again:
-               //printf("(*js)=%Fp\n", (*js));
+//0000fprintf(stdout, "        parse~ tok=%zu  jslen=%zu       r=%d    _memavl()=%u    BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);
+//0000fprintf(stdout, "p=[%u]  [%u]    [%d]\n", p.pos, p.toknext, p.toksuper);
+/*
+               I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww
+*/
                r = jsmn_parse(&p, js, jslen, tok, tokcount);
+//0000fprintf(stdout, "r=      [%d]\n", r);
                if (r < 0) {
                        if (r == JSMN_ERROR_NOMEM) {
                                tokcount = tokcount * 2;
-                               tok = _frealloc(tok, sizeof(*tok) * tokcount);
+//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount);
+                               tok = realloc(tok, sizeof(*tok) * tokcount);
                                if (tok == NULL) {
                                        fprintf(stderr, "realloc(): errno=%d\n", errno);
                                        return 3;
@@ -196,25 +194,27 @@ again:
                                goto again;
                        }
                } else {
-                       printf("js=%Fp\n", (js));
-                       printf("*js=%Fp\n", (*(js)));
+                       //printf("js=%Fp\n", (js));
+                       //printf("*js=%Fp\n", (*(js)));
                        //printf("&*js=%s\n", &(*(js)));
                        //printf("&buf=[%Fp]\n", &buf);
                        //printf("&buf_seg=[%x]\n", FP_SEG(&buf));
                        //printf("&buf_off=[%x]\n", FP_OFF(&buf));
                        //printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
                        //printf("buf=[\n%s\n]\n", buf);
-                       printf("buff=[%Fp]\n", buff);
-                       printf("(*buff)=[%Fp]\n", (*buff));
+                       //printf("buff=[%Fp]\n", buff);
+                       //printf("(*buff)=[%Fp]\n", (*buff));
                        //printf("&(*buff)=[\n%s\n]\n", &(*buff));
+                       #ifdef DEBUG_DUMPVARS
+                       fprintf(stdout, "running dump~\n");
+                       #endif
                        dump(js, tok, p.toknext, incr, &js_ss, map, 0);
                        eof_expected = 1;
                }
        }
 
-       _ffree(js);
-       _ffree(buff);
-       _ffree(tok);
+       free(js);
+       free(tok);
        fclose(fh);
 
        return 0;