From 62a81506f802e4824b718cc30321ee3a0057cdf7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 2 Oct 2012 02:10:29 +0800 Subject: Update CEDET from upstream. --- lisp/cedet/srecode/compile.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lisp/cedet/srecode/compile.el') diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index d5389a97f03..8a1291f8d72 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -210,6 +210,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." (buffer-file-name)))) (mode nil) (application nil) + (framework nil) (priority nil) (project nil) (vars nil) @@ -253,6 +254,8 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." ) ((string= name "application") (setq application (read firstvalue))) + ((string= name "framework") + (setq framework (read firstvalue))) ((string= name "priority") (setq priority (read firstvalue))) ((string= name "project") @@ -319,7 +322,7 @@ Arguments ESCAPE-START and ESCAPE-END are the current escape sequences in use." priority)) ;; Save it up! - (srecode-compile-template-table table mode priority application project vars) + (srecode-compile-template-table table mode priority application framework project vars) ) ) @@ -376,8 +379,8 @@ It is hard if the previous inserter is a newline object." (while (and comp (stringp (car comp))) (setq comp (cdr comp))) (or (not comp) - (require 'srecode/insert) - (srecode-template-inserter-newline-child-p (car comp)))) + (progn (require 'srecode/insert) + (srecode-template-inserter-newline-child-p (car comp))))) (defun srecode-compile-split-code (tag str STATE &optional end-name) @@ -522,12 +525,13 @@ to the inserter constructor." (if (not new) (error "SRECODE: Unknown macro code %S" key)) new))) -(defun srecode-compile-template-table (templates mode priority application project vars) +(defun srecode-compile-template-table (templates mode priority application framework project vars) "Compile a list of TEMPLATES into an semantic recode table. The table being compiled is for MODE, or the string \"default\". PRIORITY is a numerical value that indicates this tables location in an ordered search. APPLICATION is the name of the application these templates belong to. +FRAMEWORK is the name of the framework these templates belong to. PROJECT is a directory name which these templates scope to. A list of defined variables VARS provides a variable table." (let ((namehash (make-hash-table :test 'equal @@ -569,6 +573,7 @@ A list of defined variables VARS provides a variable table." :major-mode mode :priority priority :application application + :framework framework :project project)) (tmpl (oref table templates))) ;; Loop over all the templates, and xref. -- cgit v1.2.3