[Emacs-diffs] scratch/merge-cedet-tests 2f8e8c8 272/316: Remove eieio bits and only use eieio bits for make types

[Edward John Steere]

branch: scratch/merge-cedet-tests
commit 2f8e8c8182ae136488cf54602cb300efe3e4ff5b
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>

    Remove eieio bits and only use eieio bits for make types
    
    * test/manual/cedet/cit-el.el (cit-el-tags): Removed eieio
     bits. (cit-el-tags-eieio): New, from above. (cit-srecode-fill-el):
     Only use eieio bits for Make types.
---
 test/manual/cedet/cit-el.el |   56 ++++++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 24 deletions(-)

diff --git a/test/manual/cedet/cit-el.el b/test/manual/cedet/cit-el.el
index 1099cc5..f426188 100644
--- a/test/manual/cedet/cit-el.el
+++ b/test/manual/cedet/cit-el.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008, 2009 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <address@hidden>
-;; X-RCS: $Id: cit-el.el,v 1.2 2009-08-08 21:52:08 zappo Exp $
+;; X-RCS: $Id: cit-el.el,v 1.3 2009-10-15 03:42:55 zappo Exp $
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
@@ -28,23 +28,11 @@
 
 (defconst cit-el-tags
   (list
-   (semantic-tag-new-include "eieio" nil)
-
    (semantic-tag-new-variable "cit-spiffy-var" nil
                              t)
    (semantic-tag-new-variable "cit-spiffy-var-const" nil
                              "'(1 2 3)" :constant-flag t)
 
-   (semantic-tag-new-type
-    "elfoo" "class"
-    (list
-     (semantic-tag-new-variable "Field1" nil "t" :documentation "First Field")
-     (semantic-tag-new-variable "Field2" nil "nil" :documentation "Second 
Field")
-     (semantic-tag-new-variable "Field3" nil "1" :documentation "Third Field")
-     (semantic-tag-new-variable "Field4" nil "\"Hi\"" :documentation "Fourth 
Field")
-     )
-    nil)
-
    (semantic-tag-new-function
     "doSomething" nil
     (list "arg1" "arg2")
@@ -57,15 +45,6 @@
     :parent "elfoo"
     :documentation "Nice method on elfoo")
 
-   (semantic-tag-new-type
-    "elbar" "class"
-    (list
-     (semantic-tag-new-variable "Slot1" nil "nil" :documentation "First Slot")
-     (semantic-tag-new-variable "Slot2" nil "\"What\"" :documentation "First 
Slot")
-     (semantic-tag-new-variable "Slot3" nil "'(1 2 3)" :documentation "First 
Slot")
-     )
-    (list "elfoo"))
-
    (semantic-tag-new-function
     "niceMethod" nil
     (list "arg1")
@@ -78,7 +57,32 @@
     :documentation "Some boring old function.")
 
    )
-  "Tags to be inserted into a header file.")
+  "Tags to be inserted into an Emacs Lisp file.")
+
+(defconst cit-el-tags-eieio
+  (list
+   (semantic-tag-new-include "eieio" nil)
+
+   (semantic-tag-new-type
+    "elfoo" "class"
+    (list
+     (semantic-tag-new-variable "Field1" nil "t" :documentation "First Field")
+     (semantic-tag-new-variable "Field2" nil "nil" :documentation "Second 
Field")
+     (semantic-tag-new-variable "Field3" nil "1" :documentation "Third Field")
+     (semantic-tag-new-variable "Field4" nil "\"Hi\"" :documentation "Fourth 
Field")
+     )
+    nil)
+
+   (semantic-tag-new-type
+    "elbar" "class"
+    (list
+     (semantic-tag-new-variable "Slot1" nil "nil" :documentation "First Slot")
+     (semantic-tag-new-variable "Slot2" nil "\"What\"" :documentation "First 
Slot")
+     (semantic-tag-new-variable "Slot3" nil "'(1 2 3)" :documentation "First 
Slot")
+     )
+    (list "elfoo"))
+   )
+  "Tags to be inserted into an Emacs Lisp file that supports EIEIO.")
 
 (defun cit-srecode-fill-el (make-type)
   "Fill up a base set of files with some base tags.
@@ -87,7 +91,11 @@ MAKE-TYPE indicates the makefile type being used."
 
   ;; 2 b) Test various templates.
 
-  (cit-srecode-fill-with-stuff "src/elfoo.el" cit-el-tags)
+  (if (string= make-type "Automake")
+      (cit-srecode-fill-with-stuff "src/elfoo.el" cit-el-tags)
+    (cit-srecode-fill-with-stuff "src/elfoo.el" (append
+                                                cit-el-tags
+                                                cit-el-tags-eieio)))
   ;; 1 e) Tell EDE where the srcs are
 
   ;; Making the autoloads first should PREPEND, but Lisp should append.