Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
Engrave.h engrave.l engrave.y engrave_load.c engrave_out.c
Log Message:
- make an engrave_test program. will take either a .eet or a .edc file as
input and output a test.eet and test.out file
- make engrave_file_output return an int
- make everything linkable. will probably want to change the way the _lnum,
_col, _cur_file and _filename stuff is working as it isn't pretty, but it
works for now.
- add function prototypes to Engrave.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Engrave.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- Engrave.h 23 Sep 2004 22:20:20 -0000 1.1.1.1
+++ Engrave.h 24 Sep 2004 04:01:46 -0000 1.2
@@ -263,10 +263,13 @@
double x, y;
} align;
} text;
-
-
};
+Engrave_File *engrave_load_edc(char *file, char *imdir, char *fontdir);
+Engrave_File * engrave_load_eet(char *filename);
+int engrave_eet_output(Engrave_File *engrave_file, char *path);
+int engrave_file_output(Engrave_File *engrave_file, char *path);
#endif
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave.l,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- engrave.l 23 Sep 2004 22:20:20 -0000 1.1.1.1
+++ engrave.l 24 Sep 2004 04:01:46 -0000 1.2
@@ -5,10 +5,10 @@
#include "libengrave_la-engrave.h"
int yylex(void);
- int lnum = 1;
- int col = 0;
- char *cur_file = NULL;
- extern char *filename;
+ int engrave_lnum = 1;
+ int engrave_col = 0;
+ char *engrave_cur_file = NULL;
+ extern char *engrave_filename;
static int comment = 0, cpp_comment = 0;
static int script_level = 0;
@@ -42,7 +42,7 @@
script = t; \
}
- #define SCRIPT_NEW_LINE() lnum ++; SCRIPT_PIECE();
+ #define SCRIPT_NEW_LINE() engrave_lnum ++; SCRIPT_PIECE();
#define SCRIPT_OPEN_BRACE() script_level++; \
if (script_level > 1) SCRIPT_PIECE();
@@ -51,19 +51,19 @@
if (script_level > 0) { SCRIPT_PIECE();}\
else {script_level = 0; SCRIPT_END();}\
- #define WHITE_SPACE() col += yyleng;
+ #define WHITE_SPACE() engrave_col += yyleng;
- #define NEW_LINE() lnum ++; \
+ #define NEW_LINE() engrave_lnum ++; \
if (cpp_comment) { \
cpp_comment = 0; \
comment = 0; \
} \
- col = 0;
+ engrave_col = 0;
- #define KEYWORD_RETURN(x) col += yyleng; \
+ #define KEYWORD_RETURN(x) engrave_col += yyleng; \
if (!comment) return (x);
- #define VAL_RETURN(x) col += yyleng; \
+ #define VAL_RETURN(x) engrave_col += yyleng; \
if (!comment) return (x);
#define STRING_RETURN() VAL_RETURN(STRING);
@@ -244,7 +244,7 @@
/* subtract 1 becase gcc returns the no of the *next* line
* and we will add one when we hit the \n anyway */
- lnum = atoi(tmp) - 1;
+ engrave_lnum = atoi(tmp) - 1;
free(tmp);
while(c == ' ' || c == '\"')
@@ -258,15 +258,15 @@
}
count --;
- if (cur_file)
- free(cur_file);
+ if (engrave_cur_file)
+ free(engrave_cur_file);
- cur_file = (char *)calloc(count + 1, sizeof(char));
- strncpy(cur_file, lpos, count);
+ engrave_cur_file = (char *)calloc(count + 1, sizeof(char));
+ strncpy(engrave_cur_file, lpos, count);
- if (!strcmp(cur_file, "<stdin>")) {
- free(cur_file);
- cur_file = strdup(filename);
+ if (!strcmp(engrave_cur_file, "<stdin>")) {
+ free(engrave_cur_file);
+ engrave_cur_file = strdup(engrave_filename);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave.y,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- engrave.y 23 Sep 2004 22:20:20 -0000 1.1.1.1
+++ engrave.y 24 Sep 2004 04:01:46 -0000 1.2
@@ -9,11 +9,11 @@
void yyerror(const char *s);
void parse_error(void);
- extern char *cur_file;
- extern int lnum;
- extern int col;
+ extern char *engrave_cur_file;
+ extern int engrave_lnum;
+ extern int engrave_col;
- int section;
+ static int section;
%}
@@ -600,7 +600,8 @@
engrave_parse_state_rel2_to($3);
break;
default:
- fprintf(stderr, "Error: \"to\" not allowed here %d, %d", lnum,
col);
+ fprintf(stderr, "Error: \"to\" not allowed here %d, %d",
+ engrave_lnum, engrave_col);
}
}
;
@@ -789,7 +790,7 @@
parse_error(void)
{
fprintf(stderr, "file: %s, line: %d, column: %d\n\n",
- cur_file, lnum, col);
+ engrave_cur_file, engrave_lnum, engrave_col);
exit(-1);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_load.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- engrave_load.c 23 Sep 2004 22:20:20 -0000 1.1.1.1
+++ engrave_load.c 24 Sep 2004 04:01:46 -0000 1.2
@@ -3,6 +3,7 @@
#define MAIN_EDC_NAME "main_edje_source.edc"
+char *engrave_filename = NULL;
Engrave_File *
engrave_load_edc(char *file, char *imdir, char *fontdir)
@@ -29,7 +30,9 @@
close(fd);
}
+ engrave_filename = strdup(file);
enf = engrave_parse(file);
+ free(engrave_filename);
unlink(tmpf);
return(enf);
@@ -124,3 +127,4 @@
return enf;
}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- engrave_out.c 23 Sep 2004 22:20:21 -0000 1.1.1.1
+++ engrave_out.c 24 Sep 2004 04:01:46 -0000 1.2
@@ -3,8 +3,6 @@
#include <stdarg.h>
#include "Engrave.h"
-void engrave_file_output(Engrave_File *engrave_file, char *path);
-
static void _engrave_output_group(Engrave_Group *group, FILE *out);
static void _engrave_output_part(Engrave_Part *part, FILE *out);
static void _engrave_output_program(Engrave_Program *program, FILE *out);
@@ -141,20 +139,20 @@
return 1;
}
-void
+int
engrave_file_output(Engrave_File *engrave_file, char *path)
{
FILE *out = NULL;
Evas_List *l;
- if (!engrave_file) return;
+ if (!engrave_file) return 0;
out = fopen(path, "w");
if (!out)
{
printf("can't open %s for writing\n", path);
- return;
+ return 0;
}
/* fonts */
@@ -213,6 +211,7 @@
fclose(out);
+ return 1;
}
void
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
