Changeset 3293

Timestamp:

Jun 10, 2013, 2:57:35 PM (6 years ago)

Author:

shiyangy

Message:

test case added, gid code generater modified

Location:

proto/xmlschema/test

Files:

• Makefile (modified) (2 diffs)
• XForms-Schema.xsd (added)
• eg-01_1.xml (added)
• element_ID (modified) (1 diff)
• gid_ge.py (modified) (3 diffs)

proto/xmlschema/test/Makefile

@@ -3 +3 @@
 CC_Output=ccoutput
 CC_Output_Lex = lex
+
+Gid_Ge = gid_ge.py
 
 PABLO_SRC_CC=../parabix2_validation_cc.py
@@ -11 +13 @@
 
 cc:
+        python $(Gid_Ge)
         python $(CC_Compiler) $(CC_Input) > $(CC_Output)
         sed -e '/@cc_code/{r $(CC_Output)' -e 'd}' $(PABLO_SRC_CC) > $(PABLO_SRC_LEX)

proto/xmlschema/test/element_ID

@@ -1 @@
-xforms:xform 1
-xforms:model 2
-xforms:instance 3
-xforms:privacy 4
-xforms:bindings 5
-xforms:submitInfo 6
-xforms:bind 7
-xforms:caption 8
-xforms:hint 9
-xforms:help 10
-xforms:alert 11
-xforms:action 12
-xforms:extension 13
-xforms:choices 14
-xforms:item 15
-xforms:itemref 16
+xforms:model 1
+xforms:instance 2
+xforms:submission 3
+xforms:bind 4
+xforms:label 5
+xforms:hint 6
+xforms:help 7
+xforms:alert 8
+xforms:extension 9
+xforms:choices 10
+xforms:value 11
+xforms:item 12
+xforms:itemset 13
+xforms:copy 14
+xforms:filename 15
+xforms:mediatype 16
 xforms:input 17
 xforms:textarea 18
 xforms:secret 19
 xforms:upload 20
-xforms:selectOne 21
-xforms:selectMany 22
-xforms:selectBoolean 23
-xforms:range 24
-xforms:button 25
-xforms:output 26
-xforms:submit 27
+xforms:select1 21
+xforms:select 22
+xforms:range 23
+xforms:trigger 24
+xforms:output 25
+xforms:submit 26
+xforms:action 27
 xforms:dispatch 28
-xforms:refresh 29
-xforms:recalculate 30
-xforms:revalidate 31
-xforms:setFocus 32
-xforms:setValue 33
-xforms:submitInstance 34
-xforms:resetInstance 35
-xforms:insert 36
-xforms:delete 37
-xforms:scroll 38
-xforms:setRepeatCursor 39
-xforms:toggle 40
-xforms:script 41
-xforms:group 42
-xforms:switch 43
-xforms:case 44
-xforms:repeat 45
-xforms:defComponent 46
-xforms:param 47
-xforms:valueOf 48
-xforms:component 49
+xforms:rebuild 29
+xforms:revalidate 30
+xforms:recalculate 31
+xforms:refresh 32
+xforms:setfocus 33
+xforms:load 34
+xforms:setvalue 35
+xforms:send 36
+xforms:reset 37
+xforms:insert 38
+xforms:delete 39
+xforms:setindex 40
+xforms:toggle 41
+xforms:message 42
+xforms:repeat 43
+xforms:group 44
+xforms:switch 45
+xforms:case 46

proto/xmlschema/test/gid_ge.py

@@ -3 +3 @@
 for i in string.letters:
         map_lst.append(i)
-map_lst = map_lst + range(0,9)
+map_lst = range(0,9) + map_lst
 
 def gid_ge(fname,xforms):
@@ -27 +27 @@
                                 ls.append(s)
                                 fout.write(namespace+s+' '+str(n)+'\n')
-                                fout_1.write(s+' '+str(n)+' '+map_lst[n-1]+'\n')
+                                fout_1.write(s+' '+str(n)+' '+str(map_lst[n])+'\n')
                                 if n<10:
-                                        fout_cc.write('lex.cc'+str(n-1)+' = '+'[\\x0'+str(n)+']'+'\n')
+                                        fout_cc.write('lex.cc'+str(n)+' = '+'[\\x0'+str(n)+']'+'\n')
                                 else:
-                                        fout_cc.write('lex.cc'+str(n-1)+' = '+'[\\x'+str(n)+']'+'\n')
-                        fout_2.write('\tcc'+str(n-1)+' = 0'+'\n')
+                                        fout_cc.write('lex.cc'+str(n)+' = '+'[\\x'+str(n)+']'+'\n')
+                        fout_2.write('\tcc'+str(n)+' = 0'+'\n')
                         n = n + 1
-        fout_cc.write('lex.LF = [\\x0A]')
+        fout_cc.write('lex.tag_closing = [\\x00]')
+#       fout_cc.write('lex.LF = [\\x0A]')
         f.close()
         fout.close()
@@ -40 +41 @@
         fout_cc.close()
         
-fname = 'xForm.xsd'
+fname = 'XForms-Schema.xsd'
 namespace = 'xforms:'
 fout_name = 'element_ID'