|
From: <asf...@us...> - 2013-03-07 15:29:47
|
Revision: 57747
http://sourceforge.net/p/firebird/code/57747
Author: asfernandes
Date: 2013-03-07 15:29:44 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
Make line numbers of processed y-file matches parser.y lines.
Modified Paths:
--------------
firebird/trunk/builds/posix/make.shared.targets
firebird/trunk/builds/win32/parse.bat
firebird/trunk/src/dsql/parse.y
Modified: firebird/trunk/builds/posix/make.shared.targets
===================================================================
--- firebird/trunk/builds/posix/make.shared.targets 2013-03-07 15:29:22 UTC (rev 57746)
+++ firebird/trunk/builds/posix/make.shared.targets 2013-03-07 15:29:44 UTC (rev 57747)
@@ -42,9 +42,8 @@
# This rule creates parse.cpp from parse.y
$(OBJ)/dsql/parse.cpp $(SRC_ROOT)/include/gen/parse.h: $(SRC_ROOT)/dsql/parse.y $(SRC_ROOT)/dsql/btyacc_fb.ske
- sed -n '/%type .*/p' < $< > $(GEN_ROOT)/y.types
+ sed -n '/%type .*/p' < $< > $(GEN_ROOT)/types.y
sed 's/%type .*//' < $< > $(GEN_ROOT)/y.y
- sed $(INLINE_EDIT_SED) '/\/*\*\* TYPES \*\*\*\//r $(GEN_ROOT)/y.types' $(GEN_ROOT)/y.y
$(BTYACC) -l -d -S $(SRC_ROOT)/dsql/btyacc_fb.ske $(GEN_ROOT)/y.y
$(MV) $(GEN_ROOT)/y_tab.c $(OBJ)/dsql/parse.cpp
$(MV) $(GEN_ROOT)/y_tab.h $(SRC_ROOT)/include/gen/parse.h
Modified: firebird/trunk/builds/win32/parse.bat
===================================================================
--- firebird/trunk/builds/win32/parse.bat 2013-03-07 15:29:22 UTC (rev 57746)
+++ firebird/trunk/builds/win32/parse.bat 2013-03-07 15:29:44 UTC (rev 57747)
@@ -9,16 +9,15 @@
@echo Generating parse.cpp and dsql.tab.h
-@sed -n "/%%type .*/p" < %FB_ROOT_PATH%\src\dsql\parse.y > y.types
+@sed -n "/%%type .*/p" < %FB_ROOT_PATH%\src\dsql\parse.y > types.y
@sed "s/%%type .*//" < %FB_ROOT_PATH%\src\dsql\parse.y > y.y
-@sed -i "/\/*\*\* TYPES \*\*\*\//r y.types" y.y
%FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\btyacc\btyacc -l -d -S %FB_ROOT_PATH%\src\dsql\btyacc_fb.ske y.y
@if errorlevel 1 (exit /B 1)
@copy y_tab.h %FB_ROOT_PATH%\src\include\gen\parse.h > nul
@copy y_tab.c %FB_ROOT_PATH%\src\dsql\parse.cpp > nul
@del y.y
-@del y.types
+@del types.y
@del y_tab.h
@del y_tab.c
@del sed*
Modified: firebird/trunk/src/dsql/parse.y
===================================================================
--- firebird/trunk/src/dsql/parse.y 2013-03-07 15:29:22 UTC (rev 57746)
+++ firebird/trunk/src/dsql/parse.y 2013-03-07 15:29:44 UTC (rev 57747)
@@ -683,7 +683,7 @@
Jrd::dsql_req* dsqlReq;
}
-/*** TYPES ***/
+%include types.y
%%
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|